diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py
index f5c02fc..f60e430 100644
--- a/tests/test_pagure_flask_ui_issues.py
+++ b/tests/test_pagure_flask_ui_issues.py
@@ -269,7 +269,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
             title='Test invalid issue',
             content='This really is not related',
             user='pingou',
-            status='Invalid',
+            status='Closed',
+            close_status='Invalid',
             ticketfolder=None
         )
         self.session.commit()
diff --git a/tests/test_pagure_flask_ui_roadmap.py b/tests/test_pagure_flask_ui_roadmap.py
index 06bdd16..c01da82 100644
--- a/tests/test_pagure_flask_ui_roadmap.py
+++ b/tests/test_pagure_flask_ui_roadmap.py
@@ -474,7 +474,8 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
                 repo,
                 issueid=iid
             )
-            ticket.status = 'Fixed'
+            ticket.status = 'Closed'
+            ticket.close_status = 'Fixed'
             self.session.add(ticket)
             self.session.commit()
 
diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py
index 6e62327..27f5496 100644
--- a/tests/test_pagure_lib.py
+++ b/tests/test_pagure_lib.py
@@ -259,7 +259,8 @@ class PagureLibtests(tests.Modeltests):
             ticketfolder=None,
             title='Foo issue #2',
             content='We should work on this period',
-            status='Invalid',
+            status='Closed',
+            close_status='Invalid',
             private=True,
         )
         self.session.commit()
@@ -490,16 +491,18 @@ class PagureLibtests(tests.Modeltests):
         self.assertEqual(issues[1].tags, [])
         self.assertEqual(issues[0].id, 2)
         self.assertEqual(issues[0].project_id, 1)
-        self.assertEqual(issues[0].status, 'Invalid')
+        self.assertEqual(issues[0].status, 'Closed')
+        self.assertEqual(issues[0].close_status, 'Invalid')
         self.assertEqual(issues[0].tags, [])
 
         # Issues by status
         issues = pagure.lib.search_issues(
-            self.session, repo, status='Invalid')
+            self.session, repo, status='Closed')
         self.assertEqual(len(issues), 1)
         self.assertEqual(issues[0].id, 2)
         self.assertEqual(issues[0].project_id, 1)
-        self.assertEqual(issues[0].status, 'Invalid')
+        self.assertEqual(issues[0].status, 'Closed')
+        self.assertEqual(issues[0].close_status, 'Invalid')
         self.assertEqual(issues[0].tags, [])
 
         # Issues closed
@@ -508,7 +511,8 @@ class PagureLibtests(tests.Modeltests):
         self.assertEqual(len(issues), 1)
         self.assertEqual(issues[0].id, 2)
         self.assertEqual(issues[0].project_id, 1)
-        self.assertEqual(issues[0].status, 'Invalid')
+        self.assertEqual(issues[0].status, 'Closed')
+        self.assertEqual(issues[0].close_status, 'Invalid')
         self.assertEqual(issues[0].tags, [])
 
         # Issues by tag
@@ -528,7 +532,8 @@ class PagureLibtests(tests.Modeltests):
         self.assertEqual(len(issues), 1)
         self.assertEqual(issues[0].id, 2)
         self.assertEqual(issues[0].project_id, 1)
-        self.assertEqual(issues[0].status, 'Invalid')
+        self.assertEqual(issues[0].status, 'Closed')
+        self.assertEqual(issues[0].close_status, 'Invalid')
         self.assertEqual(issues[0].tags, [])
 
         # Issues by assignee