diff --git a/tests/test_pagure_flask_api_fork.py b/tests/test_pagure_flask_api_fork.py
index b793a61..65f1b82 100644
--- a/tests/test_pagure_flask_api_fork.py
+++ b/tests/test_pagure_flask_api_fork.py
@@ -795,7 +795,7 @@ class PagureFlaskApiForktests(tests.Modeltests):
         self.assertEqual(req.title, 'test pull-request')
 
         # Check comments before
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.comments), 0)
@@ -819,7 +819,7 @@ class PagureFlaskApiForktests(tests.Modeltests):
         )
 
         # No change
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.comments), 0)
@@ -839,7 +839,7 @@ class PagureFlaskApiForktests(tests.Modeltests):
         )
 
         # One comment added
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.comments), 1)
@@ -912,7 +912,7 @@ class PagureFlaskApiForktests(tests.Modeltests):
         self.assertEqual(req.title, 'test pull-request')
 
         # Check comments before
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.comments), 0)
@@ -936,7 +936,7 @@ class PagureFlaskApiForktests(tests.Modeltests):
         )
 
         # No change
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.comments), 0)
@@ -956,7 +956,7 @@ class PagureFlaskApiForktests(tests.Modeltests):
         )
 
         # One comment added
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.comments), 1)
diff --git a/tests/test_pagure_flask_api_issue.py b/tests/test_pagure_flask_api_issue.py
index b192a97..f5a8f97 100644
--- a/tests/test_pagure_flask_api_issue.py
+++ b/tests/test_pagure_flask_api_issue.py
@@ -2504,7 +2504,7 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest):
         )
 
         # One comment added
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         repo = pagure.lib.get_authorized_project(self.session, 'test')
         issue = pagure.lib.search_issues(self.session, repo, issueid=1)
         self.assertEqual(issue.assignee.user, 'pingou')
@@ -3016,7 +3016,7 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest):
             }
         )
 
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         repo = pagure.lib.get_authorized_project(self.session, 'test')
         issue = pagure.lib.search_issues(self.session, repo, issueid=1)
         self.assertEqual(len(issue.other_fields), 1)
@@ -3039,7 +3039,7 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest):
             }
         )
 
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         repo = pagure.lib.get_authorized_project(self.session, 'test')
         issue = pagure.lib.search_issues(self.session, repo, issueid=1)
         self.assertEqual(len(issue.other_fields), 0)
diff --git a/tests/test_pagure_flask_api_issue_custom_fields.py b/tests/test_pagure_flask_api_issue_custom_fields.py
index 8b13fea..d15ccc5 100644
--- a/tests/test_pagure_flask_api_issue_custom_fields.py
+++ b/tests/test_pagure_flask_api_issue_custom_fields.py
@@ -122,7 +122,7 @@ class PagureFlaskApiCustomFieldIssuetests(tests.Modeltests):
             }
         )
 
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         repo = pagure.lib.get_authorized_project(self.session, 'test')
         issue = pagure.lib.search_issues(self.session, repo, issueid=1)
         self.assertEqual(len(issue.other_fields), 1)
@@ -149,7 +149,7 @@ class PagureFlaskApiCustomFieldIssuetests(tests.Modeltests):
             }
         )
 
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         repo = pagure.lib.get_authorized_project(self.session, 'test')
         issue = pagure.lib.search_issues(self.session, repo, issueid=1)
         self.assertEqual(len(issue.other_fields), 3)
diff --git a/tests/test_pagure_flask_api_pr_flag.py b/tests/test_pagure_flask_api_pr_flag.py
index 9f1b47e..3f044b4 100644
--- a/tests/test_pagure_flask_api_pr_flag.py
+++ b/tests/test_pagure_flask_api_pr_flag.py
@@ -58,7 +58,7 @@ class PagureFlaskApiPRFlagtests(tests.Modeltests):
         self.assertEqual(req.title, 'test pull-request')
 
         # Check flags before
-        # self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.flags), 0)
@@ -159,7 +159,7 @@ class PagureFlaskApiPRFlagtests(tests.Modeltests):
         )
 
         # No change
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.flags), 0)
@@ -215,7 +215,7 @@ class PagureFlaskApiPRFlagtests(tests.Modeltests):
         )
 
         # One flag added
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.flags), 1)
@@ -276,7 +276,7 @@ class PagureFlaskApiPRFlagtests(tests.Modeltests):
         )
 
         # One flag added
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.flags), 1)
@@ -321,7 +321,7 @@ class PagureFlaskApiPRFlagtests(tests.Modeltests):
         )
 
         # One flag added
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.flags), 1)
@@ -371,7 +371,7 @@ class PagureFlaskApiPRFlagtests(tests.Modeltests):
         )
 
         # One flag added
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.flags), 1)
@@ -417,7 +417,7 @@ class PagureFlaskApiPRFlagtests(tests.Modeltests):
         )
 
         # Two flag added
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.flags), 2)
@@ -533,7 +533,7 @@ class PagureFlaskApiPRFlagUserTokentests(tests.Modeltests):
         self.assertEqual(req.title, 'test pull-request')
 
         # Check flags before
-        # self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.flags), 0)
@@ -620,7 +620,7 @@ class PagureFlaskApiPRFlagUserTokentests(tests.Modeltests):
         )
 
         # No change
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.flags), 0)
@@ -653,7 +653,7 @@ class PagureFlaskApiPRFlagUserTokentests(tests.Modeltests):
         )
 
         # No change
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.flags), 0)
@@ -704,7 +704,7 @@ class PagureFlaskApiPRFlagUserTokentests(tests.Modeltests):
         )
 
         # One flag added
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.flags), 1)
@@ -757,7 +757,7 @@ class PagureFlaskApiPRFlagUserTokentests(tests.Modeltests):
         )
 
         # One flag added
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.flags), 1)
@@ -803,7 +803,7 @@ class PagureFlaskApiPRFlagUserTokentests(tests.Modeltests):
         )
 
         # Still only one flag
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.flags), 1)
diff --git a/tests/test_pagure_flask_api_ui_private_repo.py b/tests/test_pagure_flask_api_ui_private_repo.py
index 1530504..2d4f200 100644
--- a/tests/test_pagure_flask_api_ui_private_repo.py
+++ b/tests/test_pagure_flask_api_ui_private_repo.py
@@ -619,7 +619,7 @@ class PagurePrivateRepotest(tests.Modeltests):
                 '<input type="checkbox" value="private" name="private" checked="" />',
                 output.get_data(as_text=True))
 
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib._get_project(self.session, 'test4')
             self.assertTrue(repo.private)
 
@@ -640,7 +640,7 @@ class PagurePrivateRepotest(tests.Modeltests):
                 '<input type="checkbox" value="private" name="private" checked="" />',
                 output.get_data(as_text=True))
 
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib._get_project(self.session, 'test4')
             self.assertFalse(repo.private)
 
@@ -675,7 +675,7 @@ class PagurePrivateRepotest(tests.Modeltests):
                 '<input type="checkbox" value="private" name="private" checked=""/>',
                 output.get_data(as_text=True))
 
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib._get_project(self.session, 'test4')
             self.assertFalse(repo.private)
 
@@ -697,7 +697,7 @@ class PagurePrivateRepotest(tests.Modeltests):
                 output.get_data(as_text=True))
 
             # No change since we can't do public -> private
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib._get_project(self.session, 'test4')
             self.assertFalse(repo.private)
 
@@ -1530,7 +1530,7 @@ class PagurePrivateRepotest(tests.Modeltests):
         self.assertEqual(req.title, 'test pull-request')
 
         # Check comments before
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.comments), 0)
@@ -1554,7 +1554,7 @@ class PagurePrivateRepotest(tests.Modeltests):
         )
 
         # No change
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.comments), 0)
@@ -1574,7 +1574,7 @@ class PagurePrivateRepotest(tests.Modeltests):
         )
 
         # One comment added
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.comments), 1)
@@ -1667,7 +1667,7 @@ class PagurePrivateRepotest(tests.Modeltests):
         self.assertEqual(req.title, 'test pull-request')
 
         # Check comments before
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.flags), 0)
@@ -1694,7 +1694,7 @@ class PagurePrivateRepotest(tests.Modeltests):
         )
 
         # No change
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.flags), 0)
@@ -1736,7 +1736,7 @@ class PagurePrivateRepotest(tests.Modeltests):
         )
 
         # One flag added
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.flags), 1)
@@ -1780,7 +1780,7 @@ class PagurePrivateRepotest(tests.Modeltests):
         )
 
         # One flag added
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.flags), 1)
@@ -2893,7 +2893,7 @@ class PagurePrivateRepotest(tests.Modeltests):
         self.assertEqual(msg.title, 'Test issue #1')
 
         # Check comments before
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         repo = pagure.lib._get_project(self.session, 'test4')
         issue = pagure.lib.search_issues(self.session, repo, issueid=1)
         self.assertEqual(len(issue.comments), 0)
@@ -2917,7 +2917,7 @@ class PagurePrivateRepotest(tests.Modeltests):
         )
 
         # No change
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         repo = pagure.lib._get_project(self.session, 'test4')
         issue = pagure.lib.search_issues(self.session, repo, issueid=1)
         self.assertEqual(issue.status, 'Open')
@@ -2937,7 +2937,7 @@ class PagurePrivateRepotest(tests.Modeltests):
         )
 
         # One comment added
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         repo = pagure.lib._get_project(self.session, 'test4')
         issue = pagure.lib.search_issues(self.session, repo, issueid=1)
         self.assertEqual(len(issue.comments), 1)
diff --git a/tests/test_pagure_flask_api_user.py b/tests/test_pagure_flask_api_user.py
index 3208523..d7b99fd 100644
--- a/tests/test_pagure_flask_api_user.py
+++ b/tests/test_pagure_flask_api_user.py
@@ -288,7 +288,7 @@ class PagureFlaskApiUSertests(tests.Modeltests):
         self.assertEqual(req.title, 'test pull-request')
 
         # Check comments before
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.comments), 0)
@@ -308,7 +308,7 @@ class PagureFlaskApiUSertests(tests.Modeltests):
         )
 
         # One comment added
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(len(request.comments), 1)
@@ -324,7 +324,7 @@ class PagureFlaskApiUSertests(tests.Modeltests):
         )
 
         # PR closed
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         request = pagure.lib.search_pull_requests(
             self.session, project_id=1, requestid=1)
         self.assertEqual(request.status, 'Closed')
diff --git a/tests/test_pagure_flask_internal.py b/tests/test_pagure_flask_internal.py
index b13b250..c654989 100644
--- a/tests/test_pagure_flask_internal.py
+++ b/tests/test_pagure_flask_internal.py
@@ -116,7 +116,7 @@ class PagureFlaskInternaltests(tests.Modeltests):
         js_data = json.loads(output.data)
         self.assertDictEqual(js_data, {'message': 'Comment added'})
 
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         repo = pagure.lib.get_authorized_project(self.session, 'test')
         request = repo.requests[0]
         self.assertEqual(len(request.comments), 1)
@@ -196,7 +196,7 @@ class PagureFlaskInternaltests(tests.Modeltests):
         js_data = json.loads(output.data)
         self.assertDictEqual(js_data, {'message': 'Comment added'})
 
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         repo = pagure.lib.get_authorized_project(self.session, 'test')
         issue = repo.issues[0]
         self.assertEqual(len(issue.comments), 1)
@@ -286,7 +286,7 @@ class PagureFlaskInternaltests(tests.Modeltests):
         js_data = json.loads(output.data)
         self.assertDictEqual(js_data, {'message': 'Comment added'})
 
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         repo = pagure.lib.get_authorized_project(self.session, 'test')
         issue = repo.issues[0]
         self.assertEqual(len(issue.comments), 1)
diff --git a/tests/test_pagure_flask_ui_app_give_project.py b/tests/test_pagure_flask_ui_app_give_project.py
index 0fbe8dd..3e71b22 100644
--- a/tests/test_pagure_flask_ui_app_give_project.py
+++ b/tests/test_pagure_flask_ui_app_give_project.py
@@ -43,7 +43,7 @@ class PagureFlaskGiveRepotests(tests.SimplePagureTest):
         tests.create_projects_git(os.path.join(self.path, 'repos'), bare=True)
 
     def _check_user(self, user='pingou'):
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         project = pagure.lib.get_authorized_project(
             self.session, project_name='test')
         self.assertEqual(project.user.user, user)
diff --git a/tests/test_pagure_flask_ui_fork.py b/tests/test_pagure_flask_ui_fork.py
index 40665b3..5a02e97 100644
--- a/tests/test_pagure_flask_ui_fork.py
+++ b/tests/test_pagure_flask_ui_fork.py
@@ -337,7 +337,7 @@ class PagureFlaskForktests(tests.Modeltests):
             self.assertEqual(output.status_code, 404)
 
             # Project w/o pull-request
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             settings = repo.settings
             settings['pull_requests'] = False
@@ -351,7 +351,7 @@ class PagureFlaskForktests(tests.Modeltests):
             self.assertEqual(output.status_code, 404)
 
             # Project w pull-request but only assignee can merge
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             settings['pull_requests'] = True
             settings['Only_assignee_can_merge_pull-request'] = True
@@ -374,7 +374,7 @@ class PagureFlaskForktests(tests.Modeltests):
                 'assigned to be merged', output.data)
 
             # PR assigned but not to this user
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             req = repo.requests[0]
             req.assignee_id = 2
@@ -393,7 +393,7 @@ class PagureFlaskForktests(tests.Modeltests):
                 'merge this review', output.data)
 
             # Project w/ minimal PR score
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             settings['Only_assignee_can_merge_pull-request'] = False
             settings['Minimum_score_to_merge_pull-request'] = 2
@@ -414,7 +414,7 @@ class PagureFlaskForktests(tests.Modeltests):
                 output.data)
 
             # Merge
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             settings['Minimum_score_to_merge_pull-request'] = -1
             repo.settings = settings
@@ -675,7 +675,7 @@ class PagureFlaskForktests(tests.Modeltests):
             '  PR from the feature branch\n</h3>', output.data)
         self.assertTrue(
             output.data.count('<span class="commitdate" title='), 1)
-        update_pull_ref.assert_called()
+        self.assertTrue(update_pull_ref.called)
 
         shutil.rmtree(newpath)
 
diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py
index dd846e7..1dd2be4 100644
--- a/tests/test_pagure_flask_ui_issues.py
+++ b/tests/test_pagure_flask_ui_issues.py
@@ -1980,7 +1980,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '/test/issue/1/update', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 404)
 
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         repo = pagure.lib.get_authorized_project(self.session, 'test')
         issue = pagure.lib.search_issues(self.session, repo, issueid=1)
         self.assertEqual(len(issue.comments), 0)
@@ -2205,7 +2205,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 'Successfully edited issue #1',
                 output.data)
 
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         repo = pagure.lib.get_authorized_project(self.session, 'test')
         issue = pagure.lib.search_issues(self.session, repo, issueid=1)
         self.assertEqual(issue.depending_text, [])
@@ -2764,7 +2764,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 output.data)
 
         # After edit, list tags
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         tags = pagure.lib.get_tags_of_project(self.session, repo)
         self.assertEqual([tag.tag for tag in tags], ['tag2'])
 
@@ -3035,7 +3035,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '</button>\n                      Comment updated',
                 output.data)
 
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         repo = pagure.lib.get_authorized_project(self.session, 'test')
         issue = pagure.lib.search_issues(self.session, repo, issueid=1)
         self.assertEqual(len(issue.comments), 1)
@@ -3073,7 +3073,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '</button>\n                      Comment updated',
                 output.data)
 
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         repo = pagure.lib.get_authorized_project(self.session, 'test')
         issue = pagure.lib.search_issues(self.session, repo, issueid=1)
         self.assertEqual(len(issue.comments), 1)
@@ -3158,7 +3158,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
             )
 
         # Ticket #1 has one more comment and is still open
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         issue = pagure.lib.search_issues(self.session, repo, issueid=1)
         self.assertEqual(len(issue.comments), 2)
         self.assertEqual(issue.status, 'Open')
diff --git a/tests/test_pagure_flask_ui_login.py b/tests/test_pagure_flask_ui_login.py
index f43d01d..50bfe55 100644
--- a/tests/test_pagure_flask_ui_login.py
+++ b/tests/test_pagure_flask_ui_login.py
@@ -200,7 +200,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest):
             'provided by email?', output.data)
 
         # Confirm the user so that we can log in
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         item = pagure.lib.search_user(self.session, username='foouser')
         self.assertEqual(item.user, 'foouser')
         self.assertNotEqual(item.token, None)
@@ -228,7 +228,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest):
         # partly fail
         if hasattr(flask, '__version__'):
             flask_v = tuple(int(el) for el in flask.__version__.split('.'))
-            if flask_v <= (0, 12, 0):
+            if flask_v < (0, 12, 0):
                 self.assertIn(
                     '<a class="nav-link btn btn-primary" '
                     'href="/login/?next=http://localhost/">', output.data)
@@ -241,7 +241,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest):
                     'href="/logout/?next=http://localhost/">', output.data)
 
         # Make the password invalid
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         item = pagure.lib.search_user(self.session, username='foouser')
         self.assertEqual(item.user, 'foouser')
         self.assertTrue(item.password.startswith('$2$'))
@@ -252,7 +252,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest):
         self.session.commit()
 
         # Check the password
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         item = pagure.lib.search_user(self.session, username='foouser')
         self.assertEqual(item.user, 'foouser')
         self.assertFalse(item.password.startswith('$2$'))
@@ -268,7 +268,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest):
         self.assertIn('Username or password of invalid format.', output.data)
 
         # Check the password is still not of a known version
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         item = pagure.lib.search_user(self.session, username='foouser')
         self.assertEqual(item.user, 'foouser')
         self.assertFalse(item.password.startswith('$1$'))
@@ -283,7 +283,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest):
         self.session.commit()
 
         # Check the password
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         item = pagure.lib.search_user(self.session, username='foouser')
         self.assertEqual(item.user, 'foouser')
         self.assertTrue(item.password.startswith('$1$'))
@@ -297,7 +297,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest):
         self.assertIn('Activity', output.data)
 
         # Check the password got upgraded to version 2
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         item = pagure.lib.search_user(self.session, username='foouser')
         self.assertEqual(item.user, 'foouser')
         self.assertTrue(item.password.startswith('$2$'))
diff --git a/tests/test_pagure_flask_ui_priorities.py b/tests/test_pagure_flask_ui_priorities.py
index d8caff0..8483ec5 100644
--- a/tests/test_pagure_flask_ui_priorities.py
+++ b/tests/test_pagure_flask_ui_priorities.py
@@ -181,7 +181,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
                 '<title>Settings - test - Pagure</title>', output.data)
             self.assertIn('<h3>Settings for test</h3>', output.data)
             # Check the result of the action -- Priority recorded
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(repo.priorities, {u'': u'', u'1': u'High'})
 
@@ -203,7 +203,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             self.assertTrue(
                 output.data.find('Normal') < output.data.find('Low'))
             # Check the result of the action -- Priority recorded
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(
                 repo.priorities,
@@ -228,7 +228,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
                 '                      Priorities weights and titles are '
                 'not of the same length', output.data)
             # Check the result of the action -- Priorities un-changed
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(
                 repo.priorities,
@@ -253,7 +253,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
                 '                      Priorities weights must be numbers',
                 output.data)
             # Check the result of the action -- Priorities un-changed
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(
                 repo.priorities,
@@ -278,7 +278,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
                 '                      Priority weight 2 is present 2 times',
                 output.data)
             # Check the result of the action -- Priorities un-changed
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(
                 repo.priorities,
@@ -303,7 +303,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
                 '                      Priority Normal is present 2 times',
                 output.data)
             # Check the result of the action -- Priorities un-changed
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(
                 repo.priorities,
@@ -381,7 +381,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             self.assertIn('<h3>Settings for test</h3>', output.data)
 
             # Check the result of the action -- Priority recorded
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib._get_project(self.session, 'test')
             self.assertEqual(
                 repo.priorities,
@@ -436,7 +436,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             self.assertNotIn('<option value="1">High</option>', output.data)
 
             # Check the result of the action -- Priority reset
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib._get_project(self.session, 'test')
             self.assertEqual(repo.priorities, {})
 
@@ -482,7 +482,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             self.assertIn('<h3>Settings for test</h3>', output.data)
 
             # Check the result of the action -- Priority recorded
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib._get_project(self.session, 'test')
             self.assertEqual(
                 repo.priorities,
@@ -538,7 +538,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             self.assertNotIn('<option value="1">High</option>', output.data)
 
             # Check the result of the action -- Priority recorded
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib._get_project(self.session, 'test')
             self.assertEqual(repo.priorities, {})
 
@@ -583,7 +583,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             self.assertIn('<h3>Settings for test</h3>', output.data)
 
             # Check the result of the action -- Priority recorded
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib._get_project(self.session, 'test')
             self.assertEqual(
                 repo.priorities,
@@ -707,7 +707,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             self.assertIn('<h3>Settings for test</h3>', output.data)
 
             # Check the result of the action -- Priority recorded
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib._get_project(self.session, 'test')
             self.assertEqual(
                 repo.priorities,
@@ -810,7 +810,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             self.assertIn('<h3>Settings for test</h3>', output.data)
 
             # Check the result of the action -- Priority recorded
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib._get_project(self.session, 'test')
             self.assertEqual(
                 repo.priorities,
@@ -908,7 +908,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             self.assertTrue(
                 output.data.find('Normal') < output.data.find('Low'))
             # Check the result of the action -- Priority recorded
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(
                 repo.priorities,
@@ -926,7 +926,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
                 '<title>Settings - test - Pagure</title>', output.data)
             self.assertIn('<h3>Settings for test</h3>', output.data)
             # Check the result of the action -- default_priority no change
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(repo.default_priority, None)
 
@@ -944,7 +944,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
                 '</button>\n                      Default priority set '
                 'to High', output.data)
             # Check the result of the action -- default_priority no change
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(repo.default_priority, 'High')
 
@@ -959,7 +959,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
                 '<title>Settings - test - Pagure</title>', output.data)
             self.assertIn('<h3>Settings for test</h3>', output.data)
             # Check the result of the action -- default_priority no change
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(repo.default_priority, 'High')
 
@@ -977,7 +977,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
                 '</button>\n                      Default priority reset',
                 output.data)
             # Check the result of the action -- default_priority no change
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(repo.default_priority, None)
 
@@ -1049,7 +1049,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             self.assertTrue(
                 output.data.find('Normal') < output.data.find('Low'))
             # Check the result of the action -- Priority recorded
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(
                 repo.priorities,
@@ -1070,7 +1070,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
                 '</button>\n                      Default priority set '
                 'to High', output.data)
             # Check the result of the action -- default_priority no change
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(repo.default_priority, 'High')
 
@@ -1098,7 +1098,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
             self.assertTrue(
                 output.data.find('Normal') < output.data.find('Low'))
             # Check the result of the action -- Priority recorded
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(
                 repo.priorities,
diff --git a/tests/test_pagure_flask_ui_quick_reply.py b/tests/test_pagure_flask_ui_quick_reply.py
index 8260fd3..7cc1e1a 100644
--- a/tests/test_pagure_flask_ui_quick_reply.py
+++ b/tests/test_pagure_flask_ui_quick_reply.py
@@ -77,7 +77,7 @@ class PagureFlaskQuickReplytest(tests.Modeltests):
             self.assertIn(notice, output.data)
 
     def assertQuickReplies(self, quick_replies, project='test'):
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         repo = pagure.lib._get_project(self.session, project)
         self.assertEqual(repo.quick_replies, quick_replies)
 
diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py
index 0cf7737..efaac6d 100644
--- a/tests/test_pagure_flask_ui_repo.py
+++ b/tests/test_pagure_flask_ui_repo.py
@@ -716,7 +716,7 @@ class PagureFlaskRepotests(tests.Modeltests):
                 '</button>\n                      User removed', output.data)
             self.assertNotIn('action="/test/dropuser/2">', output.data)
 
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(len(repo.users), 0)
 
@@ -761,7 +761,7 @@ class PagureFlaskRepotests(tests.Modeltests):
             self.assertIn(
                 u'</button>\n                      User removed', output.data)
 
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         repo = pagure.lib.get_authorized_project(self.session, 'test')
         self.assertEqual(len(repo.users), 0)
 
@@ -937,7 +937,7 @@ class PagureFlaskRepotests(tests.Modeltests):
                 output.data)
             self.assertNotIn('action="/test/dropgroup/1">', output.data)
 
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(len(repo.groups), 0)
 
@@ -3720,7 +3720,7 @@ index 0000000..fb7093d
                 output.data)
             pagure.config.config['WEBHOOK'] = False
 
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         repo = pagure.lib.get_authorized_project(self.session, 'test')
         self.assertNotEqual(repo.hook_token, 'aaabbbccc')
 
@@ -4423,7 +4423,7 @@ index 0000000..fb7093d
                 output.data)
 
             # Existing token has been expired
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(
                 repo.tokens[0].expiration.date(),
@@ -4824,7 +4824,7 @@ index 0000000..fb7093d
             self.assertIn(
                 '</button>\n                      List of reports updated',
                 output.data)
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             project = pagure.lib.get_authorized_project(self.session, project_name='test')
             self.assertEqual(project.reports, {})
 
@@ -4884,7 +4884,7 @@ index 0000000..fb7093d
                 output.data)
 
             # Create a report
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             project = pagure.lib.get_authorized_project(
                 self.session, project_name='test', namespace='foo')
             self.assertEqual(project.reports, {})
@@ -4935,7 +4935,7 @@ index 0000000..fb7093d
                 '</button>\n                      List of reports updated',
                 output.data)
 
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             project = pagure.lib.get_authorized_project(
                 self.session, project_name='test', namespace='foo')
             self.assertEqual(project.reports, {})
diff --git a/tests/test_pagure_flask_ui_roadmap.py b/tests/test_pagure_flask_ui_roadmap.py
index d7e9cb1..798503b 100644
--- a/tests/test_pagure_flask_ui_roadmap.py
+++ b/tests/test_pagure_flask_ui_roadmap.py
@@ -194,7 +194,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
             self.assertIn(u'<h3>Settings for test</h3>', output.data)
             self.assertIn(u'Milestones updated', output.data)
             # Check the result of the action -- Milestones recorded
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(repo.milestones, {u'1': {u'active': False, u'date': None}})
 
@@ -213,7 +213,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
             self.assertIn(u'<h3>Settings for test</h3>', output.data)
             self.assertIn(u'Milestones updated', output.data)
             # Check the result of the action -- Milestones recorded
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(
                 repo.milestones,
@@ -239,7 +239,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
                 u'<title>Settings - test - Pagure</title>', output.data)
             self.assertIn(u'<h3>Settings for test</h3>', output.data)
             # Check the result of the action -- Milestones un-changed
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(
                 repo.milestones,
@@ -269,7 +269,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
                 '                      Milestone v2.0 is present 2 times',
                 output.data)
             # Check the result of the action -- Milestones un-changed
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(
                 repo.milestones,
@@ -299,7 +299,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
                 '                      Milestones updated',
                 output.data)
             # Check the result of the action -- Milestones updated
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(
                 repo.milestones,
@@ -368,7 +368,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
             self.assertIn(u'<h3>Settings for test</h3>', output.data)
             self.assertIn(u'Milestones updated', output.data)
             # Check the result of the action -- Milestones recorded
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib.get_authorized_project(self.session, 'test')
             self.assertEqual(
                 repo.milestones,
@@ -421,7 +421,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
             self.assertIn(u'<h3>Settings for test</h3>', output.data)
             self.assertIn(u'Milestones updated', output.data)
             # Check the result of the action -- Milestones recorded
-            self.session = pagure.lib.create_session(self.dbpath)
+            self.session.commit()
             repo = pagure.lib._get_project(self.session, 'test')
             self.assertEqual(
                 repo.milestones,
diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py
index 6f5e53b..a396c06 100644
--- a/tests/test_pagure_lib.py
+++ b/tests/test_pagure_lib.py
@@ -1638,7 +1638,7 @@ class PagureLibtests(tests.Modeltests):
         )
 
         # Now test that creation fails if ignore_existing_repo is False
-        self.session = pagure.lib.create_session(self.dbpath)
+        self.session.commit()
         repo = pagure.lib.get_authorized_project(self.session, 'testproject')
         self.assertEqual(repo.path, 'testproject.git')
 
@@ -1697,7 +1697,6 @@ class PagureLibtests(tests.Modeltests):
         repo = pagure.lib._get_project(self.session, 'testproject')
         self.session.delete(repo)
         self.session.commit()
-        self.session = pagure.lib.create_session(self.dbpath)
 
         task = pagure.lib.new_project(
             session=self.session,