diff --git a/storage/tests/system.py b/storage/tests/system.py
index da673521ed2e..f8cc0136194d 100644
--- a/storage/tests/system.py
+++ b/storage/tests/system.py
@@ -83,7 +83,7 @@ def setUpModule():
 
 def tearDownModule():
     errors = (exceptions.Conflict, exceptions.TooManyRequests)
-    retry = RetryErrors(errors, max_tries=6)
+    retry = RetryErrors(errors, max_tries=9)
     retry(Config.TEST_BUCKET.delete)(force=True)
 
 
@@ -1148,6 +1148,7 @@ def _kms_key_name(self, key_name=None):
     @classmethod
     def setUpClass(cls):
         super(TestKMSIntegration, cls).setUpClass()
+        _empty_bucket(cls.bucket)
 
     def setUp(self):
         super(TestKMSIntegration, self).setUp()