diff --git a/tests/nightly.TestCase b/tests/nightly.TestCase
index f93d3b66..8eddc6d7 100755
--- a/tests/nightly.TestCase
+++ b/tests/nightly.TestCase
@@ -71,6 +71,7 @@ class NightlyTest(unittest.TestCase):
 
     def tearDown(self):
         self.tempdir.cleanup()
+        os.rmdir(self.testroot)
 
     def _copy_test_debug_keystore(self):
         self.dot_android.mkdir()