diff --git a/tests/test_download.py b/tests/test_download.py
index 81e2866407..3b4572ccb0 100755
--- a/tests/test_download.py
+++ b/tests/test_download.py
@@ -85,13 +85,14 @@ def setUp(self):
 
   # Stop server process and perform clean up.
   def tearDown(self):
-    unittest_toolbox.Modified_TestCase.tearDown(self)
-
     # Cleans the resources and flush the logged lines (if any).
     self.server_process_handler.clean()
 
     self.target_fileobj.close()
 
+    # Remove temp directory
+    unittest_toolbox.Modified_TestCase.tearDown(self)
+
 
   # Test: Normal case.
   def test_download_url_to_tempfileobj(self):
diff --git a/tests/test_fetcher.py b/tests/test_fetcher.py
index 0df0a4824c..bf94f252d8 100644
--- a/tests/test_fetcher.py
+++ b/tests/test_fetcher.py
@@ -55,14 +55,15 @@ def setUp(self):
 
   # Stop server process and perform clean up.
   def tearDown(self):
-    unittest_toolbox.Modified_TestCase.tearDown(self)
-
     # Cleans the resources and flush the logged lines (if any).
     self.server_process_handler.clean()
 
     self.target_fileobj.close()
     self.temp_file.close()
 
+    # Remove temporary directory
+    unittest_toolbox.Modified_TestCase.tearDown(self)
+
 
   # Test: Normal case.
   def test_fetch(self):