diff --git a/tests/unit/ps-general.bats b/tests/unit/ps-general-1.bats
similarity index 54%
rename from tests/unit/ps-general.bats
rename to tests/unit/ps-general-1.bats
index 24b1edd9d..4171f8fbb 100644
--- a/tests/unit/ps-general.bats
+++ b/tests/unit/ps-general-1.bats
@@ -121,120 +121,3 @@ EOF
   echo "status: $status"
   assert_output "$test_restart_policy"
 }
-
-@test "(ps:rebuild) old app name" {
-  run /bin/bash -c "dokku --force apps:destroy $TEST_APP"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-  mkdir -p /home/dokku/test_app
-  sudo chown -R dokku:dokku /home/dokku/test_app
-
-  run /bin/bash -c "dokku plugin:trigger post-create test_app"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-  run /bin/bash -c "dokku git:sync --build test_app https://github.com/dokku/smoke-test-app.git"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-  run /bin/bash -c "dokku ps:rebuild test_app"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-  run /bin/bash -c "dokku apps:rename test_app $TEST_APP"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-}
-
-@test "(ps:scale) console-only app" {
-  run /bin/bash -c "dokku ps:scale $TEST_APP web=0 console=0"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-  run /bin/bash -c "dokku ps:report $TEST_APP --deployed"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-  assert_output "false"
-
-  run deploy_app python-console-only
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-  run /bin/bash -c "dokku ps:report $TEST_APP --deployed"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-  assert_output "true"
-
-  run /bin/bash -c "dokku run $TEST_APP console"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-  assert_output_contains "Hello world!"
-
-  run /bin/bash -c "dokku run $TEST_APP printenv FOO"
-  echo "output: $output"
-  echo "status: $status"
-  assert_failure
-
-  run /bin/bash -c "dokku config:set $TEST_APP FOO=bar"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-  assert_output_contains "Releasing $TEST_APP"
-
-  run /bin/bash -c "dokku run $TEST_APP printenv FOO"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-  assert_output_contains "bar"
-}
-
-@test "(ps:set) procfile-path" {
-  run deploy_app dockerfile-procfile
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-  run /bin/bash -c "dokku ps:set $TEST_APP procfile-path nonexistent-procfile"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-  run /bin/bash -c "dokku ps:rebuild $TEST_APP"
-  echo "output: $output"
-  echo "status: $status"
-  assert_failure
-  assert_output_contains "Could not start due to"
-
-  run /bin/bash -c "dokku ps:set $TEST_APP procfile-path second.Procfile"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-  run /bin/bash -c "dokku ps:rebuild $TEST_APP"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-  assert_output_contains 'SECRET_KEY:' 0
-
-  run /bin/bash -c "dokku ps:set $TEST_APP procfile-path"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-  run /bin/bash -c "dokku ps:rebuild $TEST_APP"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-  assert_output_contains 'SECRET_KEY:'
-}
diff --git a/tests/unit/ps-general-2.bats b/tests/unit/ps-general-2.bats
new file mode 100644
index 000000000..8ec18ed00
--- /dev/null
+++ b/tests/unit/ps-general-2.bats
@@ -0,0 +1,130 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  global_setup
+  create_app
+}
+
+teardown() {
+  destroy_app
+  global_teardown
+}
+
+@test "(ps:rebuild) old app name" {
+  run /bin/bash -c "dokku --force apps:destroy $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  mkdir -p /home/dokku/test_app
+  sudo chown -R dokku:dokku /home/dokku/test_app
+
+  run /bin/bash -c "dokku plugin:trigger post-create test_app"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku git:sync --build test_app https://github.com/dokku/smoke-test-app.git"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku ps:rebuild test_app"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku apps:rename test_app $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+}
+
+@test "(ps:scale) console-only app" {
+  run /bin/bash -c "dokku ps:scale $TEST_APP web=0 console=0"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku ps:report $TEST_APP --deployed"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "false"
+
+  run deploy_app python-console-only
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku ps:report $TEST_APP --deployed"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "true"
+
+  run /bin/bash -c "dokku run $TEST_APP console"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "Hello world!"
+
+  run /bin/bash -c "dokku run $TEST_APP printenv FOO"
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+
+  run /bin/bash -c "dokku config:set $TEST_APP FOO=bar"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "Releasing $TEST_APP"
+
+  run /bin/bash -c "dokku run $TEST_APP printenv FOO"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "bar"
+}
+
+@test "(ps:set) procfile-path" {
+  run deploy_app dockerfile-procfile
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku ps:set $TEST_APP procfile-path nonexistent-procfile"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku ps:rebuild $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+  assert_output_contains "Could not start due to"
+
+  run /bin/bash -c "dokku ps:set $TEST_APP procfile-path second.Procfile"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku ps:rebuild $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains 'SECRET_KEY:' 0
+
+  run /bin/bash -c "dokku ps:set $TEST_APP procfile-path"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku ps:rebuild $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains 'SECRET_KEY:'
+}