diff --git a/pagure/lib/git.py b/pagure/lib/git.py
index 2bd7bd0..0c5f18c 100644
--- a/pagure/lib/git.py
+++ b/pagure/lib/git.py
@@ -963,6 +963,7 @@ def merge_pull_request(
             'Enforce_signed-off_commits_in_pull-request', False):
         for commit in diff_commits:
             if 'signed-off-by' not in commit.message.lower():
+                shutil.rmtree(newpath)
                 raise pagure.exceptions.PagureException(
                     'This repo enforces that all commits are '
                     'signed off by their author. ')
@@ -1013,12 +1014,12 @@ def merge_pull_request(
             pagure.lib.close_pull_request(
                 session, request, username,
                 requestfolder=request_folder)
+            shutil.rmtree(newpath)
             try:
                 session.commit()
             except SQLAlchemyError as err:  # pragma: no cover
                 session.rollback()
                 pagure.APP.logger.exception(err)
-                shutil.rmtree(newpath)
                 raise pagure.exceptions.PagureException(
                     'Could not close this pull-request')
             raise pagure.exceptions.PagureException(
@@ -1026,6 +1027,7 @@ def merge_pull_request(
         else:
             request.merge_status = 'NO_CHANGE'
             session.commit()
+            shutil.rmtree(newpath)
             return 'NO_CHANGE'
 
     elif (
@@ -1045,6 +1047,7 @@ def merge_pull_request(
         else:
             request.merge_status = 'FFORWARD'
             session.commit()
+            shutil.rmtree(newpath)
             return 'FFORWARD'
 
     else:
@@ -1063,6 +1066,7 @@ def merge_pull_request(
         if not domerge:
             request.merge_status = 'MERGE'
             session.commit()
+            shutil.rmtree(newpath)
             return 'MERGE'
 
         head = new_repo.lookup_reference('HEAD').get_object()
diff --git a/tests/test_progit_flask_api_project.py b/tests/test_progit_flask_api_project.py
index d20b452..f7abe34 100644
--- a/tests/test_progit_flask_api_project.py
+++ b/tests/test_progit_flask_api_project.py
@@ -103,6 +103,8 @@ class PagureFlaskApiProjecttests(tests.Modeltests):
             {'tags': ['0.0.1'], 'total_tags': 1}
         )
 
+        shutil.rmtree(newpath)
+
     def test_api_projects(self):
         """ Test the api_projects method of the flask api. """
         tests.create_projects(self.session)
diff --git a/tests/test_progit_flask_ui_repo.py b/tests/test_progit_flask_ui_repo.py
index de25908..c245dae 100644
--- a/tests/test_progit_flask_ui_repo.py
+++ b/tests/test_progit_flask_ui_repo.py
@@ -624,6 +624,8 @@ class PagureFlaskRepotests(tests.Modeltests):
         self.assertEqual(
             output.data.count('<span class="commitid">'), 0)
 
+        shutil.rmtree(newpath)
+
     def test_view_repo_branch(self):
         """ Test the view_repo_branch endpoint. """