diff --git a/tests/unit/10_apps.bats b/tests/unit/10_apps.bats
index 5fb722f6b..aa4052802 100644
--- a/tests/unit/10_apps.bats
+++ b/tests/unit/10_apps.bats
@@ -53,6 +53,19 @@ teardown () {
   destroy_app
 }
 
+@test "(apps) app autocreate disabled" {
+  run dokku config:set --no-restart --global DOKKU_DISABLE_APP_AUTOCREATION='true'
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  run deploy_app
+  echo "output: "$output
+  echo "status: "$status
+  assert_failure
+  run dokku config:unset --no-restart --global DOKKU_DISABLE_APP_AUTOCREATION
+}
+
 @test "(apps) apps:destroy" {
   create_app
   run bash -c "dokku --force apps:destroy $TEST_APP"
diff --git a/tests/unit/20_build-env.bats b/tests/unit/20_build-env.bats
index c66b5d99a..dc7affbe8 100644
--- a/tests/unit/20_build-env.bats
+++ b/tests/unit/20_build-env.bats
@@ -70,16 +70,3 @@ teardown() {
   echo "status: "$status
   assert_output "herokuish"
 }
-
-@test "(build-env) app autocreate disabled" {
-  run dokku config:set --no-restart --global DOKKU_DISABLE_APP_AUTOCREATION='true'
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-
-  run deploy_app
-  echo "output: "$output
-  echo "status: "$status
-  assert_failure
-  run dokku config:unset --no-restart --global DOKKU_DISABLE_APP_AUTOCREATION
-}