diff --git a/tests/unit/app-json.bats b/tests/unit/app-json.bats
index b9bb6f8bf..31bf44275 100644
--- a/tests/unit/app-json.bats
+++ b/tests/unit/app-json.bats
@@ -179,12 +179,12 @@ teardown() {
   echo "status: $status"
   assert_success
 
-  run /bin/bash -c "dokku --force postgres:destroy $TEST_APP"
+  run /bin/bash -c "dokku postgres:destroy $TEST_APP --force"
   echo "output: $output"
   echo "status: $status"
   assert_success
 
-  run /bin/bash -c "dokku --force redis:destroy $TEST_APP"
+  run /bin/bash -c "dokku redis:destroy $TEST_APP --force"
   echo "output: $output"
   echo "status: $status"
   assert_success
diff --git a/tests/unit/ports.bats b/tests/unit/ports.bats
index e09440b60..5a159efc1 100644
--- a/tests/unit/ports.bats
+++ b/tests/unit/ports.bats
@@ -7,19 +7,19 @@ setup() {
   [[ -f "$DOKKU_ROOT/VHOST" ]] && cp -fp "$DOKKU_ROOT/VHOST" "$DOKKU_ROOT/VHOST.bak"
   create_app
 
-  dokku --force postgres:destroy $TEST_APP 2>/dev/null || true
-  dokku --force redis:destroy $TEST_APP 2>/dev/null || true
-  dokku --force postgres:destroy $TEST_APP-other 2>/dev/null || true
-  dokku --force redis:destroy $TEST_APP-other 2>/dev/null || true
+  dokku postgres:destroy $TEST_APP --force 2>/dev/null || true
+  dokku redis:destroy $TEST_APP --force 2>/dev/null || true
+  dokku postgres:destroy $TEST_APP-other --force 2>/dev/null || true
+  dokku redis:destroy $TEST_APP-other --force 2>/dev/null || true
 }
 
 teardown() {
   destroy_app
 
-  dokku --force postgres:destroy $TEST_APP 2>/dev/null || true
-  dokku --force redis:destroy $TEST_APP 2>/dev/null || true
-  dokku --force postgres:destroy $TEST_APP-other 2>/dev/null || true
-  dokku --force redis:destroy $TEST_APP-other 2>/dev/null || true
+  dokku postgres:destroy $TEST_APP --force 2>/dev/null || true
+  dokku redis:destroy $TEST_APP --force 2>/dev/null || true
+  dokku postgres:destroy $TEST_APP-other --force 2>/dev/null || true
+  dokku redis:destroy $TEST_APP-other --force 2>/dev/null || true
 
   [[ -f "$DOKKU_ROOT/VHOST.bak" ]] && mv "$DOKKU_ROOT/VHOST.bak" "$DOKKU_ROOT/VHOST" && chown dokku:dokku "$DOKKU_ROOT/VHOST"
   global_teardown