diff --git a/tests/test_user_common.sh b/tests/test_user_common.sh
index 9e494df3..9fa44f73 100755
--- a/tests/test_user_common.sh
+++ b/tests/test_user_common.sh
@@ -45,6 +45,8 @@ test_admin_user() {
   assert_success
 
   if [ "$RECREATE_BUCKETS" == "true" ]; then
+    run bucket_cleanup_if_bucket_exists "s3api" "$BUCKET_TWO_NAME"
+    assert_success
     run create_bucket_with_user "s3api" "$BUCKET_TWO_NAME" "$admin_username" "$admin_password"
     assert_success
   else