diff --git a/CHANGELOG.md b/CHANGELOG.md
index bca30ea4c..5fa0e63c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+* Nothing
+
 ### Added
 * Add `include_existing_files` parameter to `ReplicationSetupHelper`
 
diff --git a/test/integration/test_raw_api.py b/test/integration/test_raw_api.py
index 798a62fbf..4ae257a88 100644
--- a/test/integration/test_raw_api.py
+++ b/test/integration/test_raw_api.py
@@ -586,6 +586,9 @@ def _clean_and_delete_bucket(raw_api, api_url, account_auth_token, account_id, b
 def _should_delete_bucket(bucket_name):
     # Bucket names for this test look like: c7b22d0b0ad7-1460060364-5670
     # Other buckets should not be deleted.
+    if bucket_name.startswith('clitst'):
+        return True
+
     match = re.match(r'^test-raw-api-[a-f0-9]+-([0-9]+)-([0-9]+)', bucket_name)
     if match is None:
         return False