diff --git a/storage/test/storageTest.php b/storage/test/storageTest.php
index 56a4b173a..0e1b1df8c 100644
--- a/storage/test/storageTest.php
+++ b/storage/test/storageTest.php
@@ -867,6 +867,7 @@ public function testCreateBucketHnsEnabled()
             $output
         );
         $this->assertTrue($info['hierarchicalNamespace']['enabled']);
+        $this->runFunctionSnippet('delete_bucket', [$bucketName]);
     }
 
     public function testObjectCsekToCmek()
@@ -948,7 +949,11 @@ public function testGetBucketWithAutoclass()
     public function testGetRestoreSoftDeletedBucket()
     {
         $bucketName = sprintf('test-soft-deleted-bucket-%s-%s', time(), rand());
-        $bucket = self::$storage->createBucket($bucketName);
+        $bucket = self::$storage->createBucket($bucketName, [
+            'softDeletePolicy' => [
+                'retentionDuration' => 604800,
+            ],
+        ]);
 
         $this->assertTrue($bucket->exists());
         $generation = $bucket->info()['generation'];
@@ -983,6 +988,7 @@ public function testGetRestoreSoftDeletedBucket()
             ),
             $output
         );
+        $this->runFunctionSnippet('delete_bucket', [$bucketName]);
     }
 
     public function testSetBucketWithAutoclass()