diff --git a/test/11-test--install.bats b/test/11-test--install.bats
index 0b5bbc7..6949d25 100644
--- a/test/11-test--install.bats
+++ b/test/11-test--install.bats
@@ -18,8 +18,10 @@ setup() {
     CONFIG_FILE="getssl-http01.cfg"
     setup_environment
 
+    # Fail if not running in docker and /etc/getssl already exists
+    refute [ -d /etc/getssl ]
+
     # Create /etc/getssl/$DOMAIN
-    rm -rf /etc/getssl
     mkdir -p /etc/getssl/${GETSSL_CMD_HOST}
 
     # Copy the config file to /etc/getssl
@@ -40,19 +42,12 @@ setup() {
 
 
 @test "Check that --install doesn't call the ACME server" {
+    # NOTE that this test depends on the previous test!
     if [ -n "$STAGING" ]; then
         skip "Using staging server, skipping internal test"
     fi
 
     CONFIG_FILE="getssl-http01.cfg"
-    #setup_environment
-
-    # Create /etc/getssl/$DOMAIN
-    #mkdir -p /etc/getssl/${GETSSL_CMD_HOST}
-
-    # Copy the config file to /etc/getssl
-    #cp "${CODE_DIR}/test/test-config/${CONFIG_FILE}" "/etc/getssl/${GETSSL_CMD_HOST}/getssl.cfg"
-    #cp "${CODE_DIR}/test/test-config/getssl-etc-template.cfg" "/etc/getssl/getssl.cfg"
 
     # Run getssl
     run ${CODE_DIR}/getssl --install "$GETSSL_CMD_HOST"
@@ -66,4 +61,7 @@ setup() {
     assert_line --partial 'copying domain certificate to'
     assert_line --partial 'copying private key to'
     assert_line --partial 'copying CA certificate to'
+
+    # Cleanup previous test
+    rm -rf /etc/getssl
 }