diff --git a/test/2-simple-dns01-dig.bats b/test/2-simple-dns01-dig.bats
index 0a54684..6e1eca3 100644
--- a/test/2-simple-dns01-dig.bats
+++ b/test/2-simple-dns01-dig.bats
@@ -27,11 +27,11 @@ teardown() {
 
 
 @test "Create new certificate using DNS-01 verification (dig)" {
+    CONFIG_FILE="getssl-dns01.cfg"
     if [ -n "$STAGING" ]; then
-        skip "Using staging server, skipping internal test"
+        CONFIG_FILE="getssl-staging-dns01.cfg"
     fi
 
-    CONFIG_FILE="getssl-dns01.cfg"
     setup_environment
     init_getssl
     create_certificate -d
@@ -42,9 +42,6 @@ teardown() {
 
 
 @test "Force renewal of certificate using DNS-01 (dig)" {
-    if [ -n "$STAGING" ]; then
-        skip "Using staging server, skipping internal test"
-    fi
     run ${CODE_DIR}/getssl -d -f $GETSSL_HOST
     assert_success
     assert_output --partial "dig"
diff --git a/test/2-simple-dns01-nslookup.bats b/test/2-simple-dns01-nslookup.bats
index dc6f2f5..39c8bae 100644
--- a/test/2-simple-dns01-nslookup.bats
+++ b/test/2-simple-dns01-nslookup.bats
@@ -28,11 +28,11 @@ teardown() {
 
 
 @test "Create new certificate using DNS-01 verification (nslookup)" {
+    CONFIG_FILE="getssl-dns01.cfg"
     if [ -n "$STAGING" ]; then
-        skip "Using staging server, skipping internal test"
+        CONFIG_FILE="getssl-dns01.cfg"
     fi
 
-    CONFIG_FILE="getssl-dns01.cfg"
     setup_environment
     init_getssl
     create_certificate -d
diff --git a/test/7-staging-dns01-dig.bats b/test/7-staging-dns01-dig.bats
index 7e21124..3d70ce5 100644
--- a/test/7-staging-dns01-dig.bats
+++ b/test/7-staging-dns01-dig.bats
@@ -7,6 +7,7 @@ load '/getssl/test/test_helper.bash'
 
 
 @test "Create new certificate using staging server, dig and DuckDNS" {
+    skip
     if [ -z "$STAGING" ]; then
         skip "Running internal tests, skipping external test"
     fi
@@ -20,6 +21,7 @@ load '/getssl/test/test_helper.bash'
 }
 
 @test "Force renewal of certificate using staging server, dig and DuckDNS" {
+    skip
     if [ -z "$STAGING" ]; then
         skip "Running internal tests, skipping external test"
     fi