diff --git a/tests/test_pagure_flask_dump_load_ticket.py b/tests/test_pagure_flask_dump_load_ticket.py
index f2da049..48ff558 100644
--- a/tests/test_pagure_flask_dump_load_ticket.py
+++ b/tests/test_pagure_flask_dump_load_ticket.py
@@ -55,9 +55,8 @@ class PagureFlaskDumpLoadTicketTests(tests.Modeltests):
             self.path, 'requests')
         self.app = pagure.APP.test_client()
 
-    @patch('pagure.ensure_lock')
     @patch('pagure.lib.notify.send_email')
-    def test_dumping_reloading_ticket(self, elock, send_email):
+    def test_dumping_reloading_ticket(self, send_email):
         """ Test dumping a ticket into a JSON blob. """
         send_email.return_value = True
 
diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py
index 5511c1e..34d14ee 100644
--- a/tests/test_pagure_flask_ui_repo.py
+++ b/tests/test_pagure_flask_ui_repo.py
@@ -2598,88 +2598,87 @@ index 0000000..fb7093d
                 'Forks <span class="label label-default">0</span>',
                 output.data)
 
-            with patch('pagure.ensure_lock'):
-                # add issues
-                repo = pagure.get_authorized_project(self.session, 'test')
-                msg = pagure.lib.new_issue(
-                    session=self.session,
-                    repo=repo,
-                    title='Test issue',
-                    content='We should work on this',
-                    user='pingou',
-                    ticketfolder=os.path.join(self.path, 'tickets')
-                )
-                self.session.commit()
-                self.assertEqual(msg.title, 'Test issue')
-
-                msg = pagure.lib.new_issue(
-                    session=self.session,
-                    repo=repo,
-                    title='Test issue #2',
-                    content='We should work on this, really',
-                    user='pingou',
-                    ticketfolder=os.path.join(self.path, 'tickets')
-                )
-                self.session.commit()
-                self.assertEqual(msg.title, 'Test issue #2')
-
-                # Add a comment to an issue
-                issue = pagure.lib.search_issues(self.session, repo, issueid=1)
-                msg = pagure.lib.add_issue_comment(
-                    session=self.session,
-                    issue=issue,
-                    comment='Hey look a comment!',
-                    user='foo',
-                    ticketfolder=None
-                )
-                self.session.commit()
-                self.assertEqual(msg, 'Comment added')
-
-                # add pull-requests
-                req = pagure.lib.new_pull_request(
-                    session=self.session,
-                    repo_from=repo,
-                    branch_from='feature',
-                    repo_to=repo,
-                    branch_to='master',
-                    title='test pull-request',
-                    user='pingou',
-                    requestfolder=os.path.join(self.path, 'requests'),
-                )
-                self.session.commit()
-                self.assertEqual(req.id, 3)
-                self.assertEqual(req.title, 'test pull-request')
-
-                req = pagure.lib.new_pull_request(
-                    session=self.session,
-                    repo_from=repo,
-                    branch_from='feature2',
-                    repo_to=repo,
-                    branch_to='master',
-                    title='test pull-request',
-                    user='pingou',
-                    requestfolder=os.path.join(self.path, 'requests'),
-                )
-                self.session.commit()
-                self.assertEqual(req.id, 4)
-                self.assertEqual(req.title, 'test pull-request')
-
-                # Add comment on a pull-request
-                request = pagure.lib.search_pull_requests(
-                    self.session, requestid=3)
-
-                msg = pagure.lib.add_pull_request_comment(
-                    session=self.session,
-                    request=request,
-                    commit='commithash',
-                    tree_id=None,
-                    filename='file',
-                    row=None,
-                    comment='This is awesome, I got to remember it!',
-                    user='foo',
-                    requestfolder=None,
-                )
-                self.assertEqual(msg, 'Comment added')
+            # add issues
+            repo = pagure.get_authorized_project(self.session, 'test')
+            msg = pagure.lib.new_issue(
+                session=self.session,
+                repo=repo,
+                title='Test issue',
+                content='We should work on this',
+                user='pingou',
+                ticketfolder=os.path.join(self.path, 'tickets')
+            )
+            self.session.commit()
+            self.assertEqual(msg.title, 'Test issue')
+
+            msg = pagure.lib.new_issue(
+                session=self.session,
+                repo=repo,
+                title='Test issue #2',
+                content='We should work on this, really',
+                user='pingou',
+                ticketfolder=os.path.join(self.path, 'tickets')
+            )
+            self.session.commit()
+            self.assertEqual(msg.title, 'Test issue #2')
+
+            # Add a comment to an issue
+            issue = pagure.lib.search_issues(self.session, repo, issueid=1)
+            msg = pagure.lib.add_issue_comment(
+                session=self.session,
+                issue=issue,
+                comment='Hey look a comment!',
+                user='foo',
+                ticketfolder=None
+            )
+            self.session.commit()
+            self.assertEqual(msg, 'Comment added')
+
+            # add pull-requests
+            req = pagure.lib.new_pull_request(
+                session=self.session,
+                repo_from=repo,
+                branch_from='feature',
+                repo_to=repo,
+                branch_to='master',
+                title='test pull-request',
+                user='pingou',
+                requestfolder=os.path.join(self.path, 'requests'),
+            )
+            self.session.commit()
+            self.assertEqual(req.id, 3)
+            self.assertEqual(req.title, 'test pull-request')
+
+            req = pagure.lib.new_pull_request(
+                session=self.session,
+                repo_from=repo,
+                branch_from='feature2',
+                repo_to=repo,
+                branch_to='master',
+                title='test pull-request',
+                user='pingou',
+                requestfolder=os.path.join(self.path, 'requests'),
+            )
+            self.session.commit()
+            self.assertEqual(req.id, 4)
+            self.assertEqual(req.title, 'test pull-request')
+
+            # Add comment on a pull-request
+            request = pagure.lib.search_pull_requests(
+                self.session, requestid=3)
+
+            msg = pagure.lib.add_pull_request_comment(
+                session=self.session,
+                request=request,
+                commit='commithash',
+                tree_id=None,
+                filename='file',
+                row=None,
+                comment='This is awesome, I got to remember it!',
+                user='foo',
+                requestfolder=None,
+            )
+            self.assertEqual(msg, 'Comment added')
 
             # Check before deleting the project
             output = self.app.get('/')
@@ -2850,89 +2849,87 @@ index 0000000..fb7093d
                 'Forks <span class="label label-default">0</span>',
                 output.data)
 
-            # This part of the code calls lib stuff directly
-            with patch('pagure.ensure_lock'):
-                # add issues
-                repo = pagure.get_authorized_project(self.session, 'test')
-                msg = pagure.lib.new_issue(
-                    session=self.session,
-                    repo=repo,
-                    title='Test issue',
-                    content='We should work on this',
-                    user='pingou',
-                    ticketfolder=os.path.join(self.path, 'tickets')
-                )
-                self.session.commit()
-                self.assertEqual(msg.title, 'Test issue')
-
-                msg = pagure.lib.new_issue(
-                    session=self.session,
-                    repo=repo,
-                    title='Test issue #2',
-                    content='We should work on this, really',
-                    user='pingou',
-                    ticketfolder=os.path.join(self.path, 'tickets')
-                )
-                self.session.commit()
-                self.assertEqual(msg.title, 'Test issue #2')
-
-                # Add a comment to an issue
-                issue = pagure.lib.search_issues(self.session, repo, issueid=1)
-                msg = pagure.lib.add_issue_comment(
-                    session=self.session,
-                    issue=issue,
-                    comment='Hey look a comment!',
-                    user='foo',
-                    ticketfolder=None
-                )
-                self.session.commit()
-                self.assertEqual(msg, 'Comment added')
-
-                # add pull-requests
-                req = pagure.lib.new_pull_request(
-                    session=self.session,
-                    repo_from=repo,
-                    branch_from='feature',
-                    repo_to=repo,
-                    branch_to='master',
-                    title='test pull-request',
-                    user='pingou',
-                    requestfolder=os.path.join(self.path, 'requests'),
-                )
-                self.session.commit()
-                self.assertEqual(req.id, 3)
-                self.assertEqual(req.title, 'test pull-request')
-
-                req = pagure.lib.new_pull_request(
-                    session=self.session,
-                    repo_from=repo,
-                    branch_from='feature2',
-                    repo_to=repo,
-                    branch_to='master',
-                    title='test pull-request',
-                    user='pingou',
-                    requestfolder=os.path.join(self.path, 'requests'),
-                )
-                self.session.commit()
-                self.assertEqual(req.id, 4)
-                self.assertEqual(req.title, 'test pull-request')
-
-                # Add comment on a pull-request
-                request = pagure.lib.search_pull_requests(
-                    self.session, requestid=3)
-
-                msg = pagure.lib.add_pull_request_comment(
-                    session=self.session,
-                    request=request,
-                    commit='commithash',
-                    tree_id=None,
-                    filename='file',
-                    row=None,
-                    comment='This is awesome, I got to remember it!',
-                    user='foo',
-                    requestfolder=None,
-                )
-                self.assertEqual(msg, 'Comment added')
+            # add issues
+            repo = pagure.get_authorized_project(self.session, 'test')
+            msg = pagure.lib.new_issue(
+                session=self.session,
+                repo=repo,
+                title='Test issue',
+                content='We should work on this',
+                user='pingou',
+                ticketfolder=os.path.join(self.path, 'tickets')
+            )
+            self.session.commit()
+            self.assertEqual(msg.title, 'Test issue')
+
+            msg = pagure.lib.new_issue(
+                session=self.session,
+                repo=repo,
+                title='Test issue #2',
+                content='We should work on this, really',
+                user='pingou',
+                ticketfolder=os.path.join(self.path, 'tickets')
+            )
+            self.session.commit()
+            self.assertEqual(msg.title, 'Test issue #2')
+
+            # Add a comment to an issue
+            issue = pagure.lib.search_issues(self.session, repo, issueid=1)
+            msg = pagure.lib.add_issue_comment(
+                session=self.session,
+                issue=issue,
+                comment='Hey look a comment!',
+                user='foo',
+                ticketfolder=None
+            )
+            self.session.commit()
+            self.assertEqual(msg, 'Comment added')
+
+            # add pull-requests
+            req = pagure.lib.new_pull_request(
+                session=self.session,
+                repo_from=repo,
+                branch_from='feature',
+                repo_to=repo,
+                branch_to='master',
+                title='test pull-request',
+                user='pingou',
+                requestfolder=os.path.join(self.path, 'requests'),
+            )
+            self.session.commit()
+            self.assertEqual(req.id, 3)
+            self.assertEqual(req.title, 'test pull-request')
+
+            req = pagure.lib.new_pull_request(
+                session=self.session,
+                repo_from=repo,
+                branch_from='feature2',
+                repo_to=repo,
+                branch_to='master',
+                title='test pull-request',
+                user='pingou',
+                requestfolder=os.path.join(self.path, 'requests'),
+            )
+            self.session.commit()
+            self.assertEqual(req.id, 4)
+            self.assertEqual(req.title, 'test pull-request')
+
+            # Add comment on a pull-request
+            request = pagure.lib.search_pull_requests(
+                self.session, requestid=3)
+
+            msg = pagure.lib.add_pull_request_comment(
+                session=self.session,
+                request=request,
+                commit='commithash',
+                tree_id=None,
+                filename='file',
+                row=None,
+                comment='This is awesome, I got to remember it!',
+                user='foo',
+                requestfolder=None,
+            )
+            self.assertEqual(msg, 'Comment added')
 
             # Check before deleting the project
             output = self.app.get('/')
@@ -3035,17 +3032,16 @@ index 0000000..fb7093d
                 'Forks <span class="label label-default">0</span>',
                 output.data)
 
-            with patch('pagure.ensure_lock'):
-                # add user
-                repo = pagure.get_authorized_project(self.session, 'test')
-                msg = pagure.lib.add_user_to_project(
-                    session=self.session,
-                    project=repo,
-                    new_user='foo',
-                    user='pingou',
-                )
-                self.session.commit()
-                self.assertEqual(msg, 'User added')
+            # add user
+            repo = pagure.get_authorized_project(self.session, 'test')
+            msg = pagure.lib.add_user_to_project(
+                session=self.session,
+                project=repo,
+                new_user='foo',
+                user='pingou',
+            )
+            self.session.commit()
+            self.assertEqual(msg, 'User added')
 
             # Check before deleting the project
             output = self.app.get('/')
@@ -3116,35 +3112,34 @@ index 0000000..fb7093d
                 'Forks <span class="label label-default">0</span>',
                 output.data)
 
-            with patch('pagure.ensure_lock'):
-                # Create group
-                msg = pagure.lib.add_group(
-                    self.session,
-                    group_name='foo',
-                    display_name='foo group',
-                    description=None,
-                    group_type='bar',
-                    user='pingou',
-                    is_admin=False,
-                    blacklist=[],
-                )
-                self.session.commit()
-                self.assertEqual(msg, 'User `pingou` added to the group `foo`.')
-
-                # Add group to the project
-                repo = pagure.get_authorized_project(self.session, 'test')
-                msg = pagure.lib.add_group_to_project(
-                    session=self.session,
-                    project=repo,
-                    new_group='foo',
-                    user='pingou',
-                )
-                self.session.commit()
-                self.assertEqual(msg, 'Group added')
-
-                # check if group where we expect it
-                repo = pagure.get_authorized_project(self.session, 'test')
-                self.assertEqual(len(repo.projects_groups), 1)
+            # Create group
+            msg = pagure.lib.add_group(
+                self.session,
+                group_name='foo',
+                display_name='foo group',
+                description=None,
+                group_type='bar',
+                user='pingou',
+                is_admin=False,
+                blacklist=[],
+            )
+            self.session.commit()
+            self.assertEqual(msg, 'User `pingou` added to the group `foo`.')
+
+            # Add group to the project
+            repo = pagure.get_authorized_project(self.session, 'test')
+            msg = pagure.lib.add_group_to_project(
+                session=self.session,
+                project=repo,
+                new_group='foo',
+                user='pingou',
+            )
+            self.session.commit()
+            self.assertEqual(msg, 'Group added')
+
+            # check if group where we expect it
+            repo = pagure.get_authorized_project(self.session, 'test')
+            self.assertEqual(len(repo.projects_groups), 1)
 
             # Check before deleting the project
             output = self.app.get('/')
@@ -3211,31 +3206,30 @@ index 0000000..fb7093d
                 'Forks <span class="label label-default">0</span>',
                 output.data)
 
-            with patch('pagure.ensure_lock'):
-                # Create the issue
-                repo = pagure.get_authorized_project(self.session, 'test')
-                msg = pagure.lib.new_issue(
-                    session=self.session,
-                    repo=repo,
-                    title='Test issue',
-                    content='We should work on this',
-                    user='pingou',
-                    ticketfolder=os.path.join(self.path, 'tickets')
-                )
-                self.session.commit()
-                self.assertEqual(msg.title, 'Test issue')
-
-                # Add a tag to the issue
-                repo = pagure.get_authorized_project(self.session, 'test')
-                issue = pagure.lib.search_issues(self.session, repo, issueid=1)
-                msg = pagure.lib.add_tag_obj(
-                    session=self.session,
-                    obj=issue,
-                    tags='tag1',
-                    user='pingou',
-                    ticketfolder=None)
-                self.session.commit()
-                self.assertEqual(msg, 'Issue tagged with: tag1')
+            # Create the issue
+            repo = pagure.get_authorized_project(self.session, 'test')
+            msg = pagure.lib.new_issue(
+                session=self.session,
+                repo=repo,
+                title='Test issue',
+                content='We should work on this',
+                user='pingou',
+                ticketfolder=os.path.join(self.path, 'tickets')
+            )
+            self.session.commit()
+            self.assertEqual(msg.title, 'Test issue')
+
+            # Add a tag to the issue
+            repo = pagure.get_authorized_project(self.session, 'test')
+            issue = pagure.lib.search_issues(self.session, repo, issueid=1)
+            msg = pagure.lib.add_tag_obj(
+                session=self.session,
+                obj=issue,
+                tags='tag1',
+                user='pingou',
+                ticketfolder=None)
+            self.session.commit()
+            self.assertEqual(msg, 'Issue tagged with: tag1')
 
             # Check before deleting the project
             output = self.app.get('/')
diff --git a/tests/test_pagure_lib_git.py b/tests/test_pagure_lib_git.py
index f87659c..604aff3 100644
--- a/tests/test_pagure_lib_git.py
+++ b/tests/test_pagure_lib_git.py
@@ -1298,9 +1298,8 @@ index 9f44358..2a552bb 100644
         patch = '\n'.join(npatch)
         self.assertEqual(patch, exp)
 
-    @patch('pagure.ensure_lock')
     @patch('pagure.lib.notify.send_email')
-    def test_update_git(self, elock, email_f):
+    def test_update_git(self, email_f):
         """ Test the update_git of pagure.lib.git. """
         email_f.return_value = True
 
@@ -1518,8 +1517,7 @@ index 458821a..77674a8
         #print patch
         self.assertEqual(patch, exp)
 
-    @patch('pagure.ensure_lock')
-    def test_clean_git(self, elock):
+    def test_clean_git(self):
         """ Test the clean_git method of pagure.lib.git. """
         pagure.lib.git.clean_git(None, None, None)
 
@@ -1550,9 +1548,8 @@ index 458821a..77674a8
         files = [entry.name for entry in commit.tree]
         self.assertEqual(files, [])
 
-    @patch('pagure.ensure_lock')
     @patch('pagure.lib.notify.send_email')
-    def test_update_git_requests(self, elock, email_f):
+    def test_update_git_requests(self, email_f):
         """ Test the update_git of pagure.lib.git for pull-requests. """
         email_f.return_value = True
 
@@ -2393,8 +2390,7 @@ index 0000000..60f7480
             'test request to namespaced repo'
         )
 
-    @patch('pagure.ensure_lock')
-    def test_read_git_lines(self, elock):
+    def test_read_git_lines(self):
         """ Test the read_git_lines method of pagure.lib.git. """
         self.test_update_git()
 
@@ -2417,8 +2413,7 @@ index 0000000..60f7480
             output[0].endswith(": Test issue'\n")
         )
 
-    @patch('pagure.ensure_lock')
-    def test_get_revs_between(self, elock):
+    def test_get_revs_between(self):
         """ Test the get_revs_between method of pagure.lib.git. """
 
         self.test_update_git()
@@ -2485,8 +2480,7 @@ index 0000000..60f7480
             '0', branch_commit.oid.hex, gitrepo, 'refs/heads/feature')
         self.assertEqual(output4, [branch_commit.oid.hex])
 
-    @patch('pagure.ensure_lock')
-    def test_get_author(self, elock):
+    def test_get_author(self):
         """ Test the get_author method of pagure.lib.git. """
 
         self.test_update_git()