diff --git a/tests/setup.sh b/tests/setup.sh
index 9406884..a4a05e2 100644
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -155,11 +155,17 @@ teardown() {
       log 3 "error deleting bucket $BUCKET_TWO_NAME or contents"
     fi
   fi
-  if user_exists "$USERNAME_ONE" && ! delete_user "$USERNAME_ONE"; then
-    log 3 "error deleting user $USERNAME_ONE"
-  fi
-  if user_exists "$USERNAME_TWO" && ! delete_user "$USERNAME_TWO"; then
-    log 3 "error deleting user $USERNAME_TWO"
+  if [ "$SKIP_USERS_TESTS" != "true" ]; then
+    if [ -n "$USERNAME_ONE" ]; then
+      if user_exists "$USERNAME_ONE" && ! delete_user "$USERNAME_ONE"; then
+        log 3 "error deleting user $USERNAME_ONE"
+      fi
+    fi
+    if [ -n "$USERNAME_TWO" ]; then
+      if user_exists "$USERNAME_TWO" && ! delete_user "$USERNAME_TWO"; then
+        log 3 "error deleting user $USERNAME_TWO"
+      fi
+    fi
   fi
   if [ "$AUTOGENERATE_USERS" == "true" ] && ! delete_autogenerated_users; then
     log 3 "error deleting autocreated users"