diff --git a/kernel/syzkaller/syzkaller_test.py b/kernel/syzkaller/syzkaller_test.py
index 5d30d73..d951592 100644
--- a/kernel/syzkaller/syzkaller_test.py
+++ b/kernel/syzkaller/syzkaller_test.py
@@ -143,6 +143,15 @@
             asserts.fail('%s caused crash in our device.',
                          test_case._test_name)
 
+    def tearDownClass(self):
+        """Removes the temporary directory used for Syzkaller."""
+        logging.debug('Temporary directory %s is being deleted',
+                      self._env['temp_dir'])
+        try:
+            shutil.rmtree(self._env['temp_dir'])
+        except OSError as e:
+            logging.exception(e)
+
     def generateKernelFuzzerTests(self):
         """Runs kernel fuzzer tests."""
         self.FetchSyzkaller()
diff --git a/template/libfuzzer_test/libfuzzer_test.py b/template/libfuzzer_test/libfuzzer_test.py
index ba4ea03..28137c5 100644
--- a/template/libfuzzer_test/libfuzzer_test.py
+++ b/template/libfuzzer_test/libfuzzer_test.py
@@ -17,6 +17,7 @@
 
 import logging
 import os
+import shutil
 
 from vts.runners.host import asserts
 from vts.runners.host import base_test
@@ -183,7 +184,8 @@
         inuse_seed = self.RetrieveCorpusSeed(test_case)
         if inuse_seed == 'locked':
             # skip this test case
-            logging.warning('test case locked, skipping testcase %s.', test_case.test_name)
+            logging.warning('test case locked, skipping testcase %s.',
+                            test_case.test_name)
             return
 
         fuzz_cmd = '"%s"' % test_case.GetRunCommand()
@@ -275,6 +277,15 @@
         elif exit_code != config.ExitCode.FUZZER_TEST_PASS:
             asserts.fail('%s failed abnormally.' % test_case.test_name)
 
+    def tearDownClass(self):
+        """Removes the temporary directory used for corpus management."""
+        logging.debug('Temporary directory %s is being deleted',
+                      self._temp_dir)
+        try:
+            shutil.rmtree(self._temp_dir)
+        except OSError as e:
+            logging.exception(e)
+
     def generateFuzzerTests(self):
         """Runs fuzzer tests."""
         self.runGeneratedTests(