diff --git a/tests/unit/nginx-vhosts_6.bats b/tests/unit/nginx-vhosts_6.bats
index efde0a5d8..0ff29f4e5 100644
--- a/tests/unit/nginx-vhosts_6.bats
+++ b/tests/unit/nginx-vhosts_6.bats
@@ -24,114 +24,6 @@ teardown() {
   assert_failure
 }
 
-@test "(nginx-vhosts) logging" {
-  deploy_app
-
-  run [ -a "/var/log/nginx/$TEST_APP-access.log" ]
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-  run [ -a "/var/log/nginx/$TEST_APP-error.log" ]
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-  run /bin/bash -c "dokku nginx:access-logs $TEST_APP"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-  run /bin/bash -c "dokku nginx:error-logs $TEST_APP"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-}
-
-@test "(nginx-vhosts) log-path" {
-  deploy_app
-
-  run /bin/bash -c "dokku nginx:set $TEST_APP access-log-path off"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-  run /bin/bash -c "dokku nginx:build-config $TEST_APP"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-  run /bin/bash -c "dokku nginx:show-config $TEST_APP"
-  echo "output: $output"
-  echo "status: $status"
-  assert_output_contains "off;"
-
-  run /bin/bash -c "dokku nginx:set $TEST_APP access-log-path"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-  run /bin/bash -c "dokku nginx:build-config $TEST_APP"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-  run /bin/bash -c "dokku nginx:show-config $TEST_APP"
-  echo "output: $output"
-  echo "status: $status"
-  assert_output_contains "off;" 0
-
-  run /bin/bash -c "dokku nginx:set $TEST_APP error-log-path off"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-  run /bin/bash -c "dokku nginx:build-config $TEST_APP"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-  run /bin/bash -c "dokku nginx:show-config $TEST_APP"
-  echo "output: $output"
-  echo "status: $status"
-  assert_output_contains "off;"
-
-  run /bin/bash -c "dokku nginx:set $TEST_APP error-log-path"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-  run /bin/bash -c "dokku nginx:build-config $TEST_APP"
-  echo "output: $output"
-  echo "status: $status"
-  assert_success
-
-  run /bin/bash -c "dokku nginx:show-config $TEST_APP"
-  echo "output: $output"
-  echo "status: $status"
-  assert_output_contains "off;" 0
-}
-
-@test "(nginx-vhosts) nginx:build-config (with SSL and unrelated domain)" {
-  setup_test_tls
-  add_domain "node-js-app.dokku.me"
-  add_domain "test.dokku.me"
-  deploy_app
-  dokku nginx:show-config $TEST_APP
-  assert_ssl_domain "node-js-app.dokku.me"
-  assert_http_redirect "http://test.dokku.me" "https://test.dokku.me:443/"
-}
-
-@test "(nginx-vhosts) nginx:build-config (wildcard SSL)" {
-  setup_test_tls wildcard
-  add_domain "wildcard1.dokku.me"
-  add_domain "wildcard2.dokku.me"
-  deploy_app
-  dokku nginx:show-config $TEST_APP
-  assert_ssl_domain "wildcard1.dokku.me"
-  assert_ssl_domain "wildcard2.dokku.me"
-}
-
 @test "(nginx-vhosts) nginx:set hsts" {
   setup_test_tls wildcard
   local HSTS_CONF="/home/dokku/${TEST_APP}/nginx.conf.d/hsts.conf"
diff --git a/tests/unit/nginx-vhosts_8.bats b/tests/unit/nginx-vhosts_8.bats
new file mode 100644
index 000000000..c90095a02
--- /dev/null
+++ b/tests/unit/nginx-vhosts_8.bats
@@ -0,0 +1,125 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  global_setup
+  [[ -f "$DOKKU_ROOT/VHOST" ]] && cp -fp "$DOKKU_ROOT/VHOST" "$DOKKU_ROOT/VHOST.bak"
+  [[ -f "$DOKKU_ROOT/HOSTNAME" ]] && cp -fp "$DOKKU_ROOT/HOSTNAME" "$DOKKU_ROOT/HOSTNAME.bak"
+  create_app
+}
+
+teardown() {
+  destroy_app 0 $TEST_APP
+  [[ -f "$DOKKU_ROOT/VHOST.bak" ]] && mv "$DOKKU_ROOT/VHOST.bak" "$DOKKU_ROOT/VHOST" && chown dokku:dokku "$DOKKU_ROOT/VHOST"
+  [[ -f "$DOKKU_ROOT/HOSTNAME.bak" ]] && mv "$DOKKU_ROOT/HOSTNAME.bak" "$DOKKU_ROOT/HOSTNAME" && chown dokku:dokku "$DOKKU_ROOT/HOSTNAME"
+  global_teardown
+}
+
+@test "(nginx-vhosts) logging" {
+  deploy_app
+
+  run [ -a "/var/log/nginx/$TEST_APP-access.log" ]
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run [ -a "/var/log/nginx/$TEST_APP-error.log" ]
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku nginx:access-logs $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku nginx:error-logs $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+}
+
+@test "(nginx-vhosts) log-path" {
+  deploy_app
+
+  run /bin/bash -c "dokku nginx:set $TEST_APP access-log-path off"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku nginx:build-config $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku nginx:show-config $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output_contains "off;"
+
+  run /bin/bash -c "dokku nginx:set $TEST_APP access-log-path"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku nginx:build-config $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku nginx:show-config $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output_contains "off;" 0
+
+  run /bin/bash -c "dokku nginx:set $TEST_APP error-log-path off"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku nginx:build-config $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku nginx:show-config $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output_contains "off;"
+
+  run /bin/bash -c "dokku nginx:set $TEST_APP error-log-path"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku nginx:build-config $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku nginx:show-config $TEST_APP"
+  echo "output: $output"
+  echo "status: $status"
+  assert_output_contains "off;" 0
+}
+
+@test "(nginx-vhosts) nginx:build-config (with SSL and unrelated domain)" {
+  setup_test_tls
+  add_domain "node-js-app.dokku.me"
+  add_domain "test.dokku.me"
+  deploy_app
+  dokku nginx:show-config $TEST_APP
+  assert_ssl_domain "node-js-app.dokku.me"
+  assert_http_redirect "http://test.dokku.me" "https://test.dokku.me:443/"
+}
+
+@test "(nginx-vhosts) nginx:build-config (wildcard SSL)" {
+  setup_test_tls wildcard
+  add_domain "wildcard1.dokku.me"
+  add_domain "wildcard2.dokku.me"
+  deploy_app
+  dokku nginx:show-config $TEST_APP
+  assert_ssl_domain "wildcard1.dokku.me"
+  assert_ssl_domain "wildcard2.dokku.me"
+}