diff --git a/test/mail_dhparams_default.bats b/test/mail_dhparams_default.bats
index 97c081f0..5d571b9e 100644
--- a/test/mail_dhparams_default.bats
+++ b/test/mail_dhparams_default.bats
@@ -27,6 +27,7 @@ function setup_file() {
 		-e DMS_DEBUG=0 \
 		-e ONE_DIR=1 \
 		-h mail.my-domain.com -t ${NAME}
+    wait_for_finished_setup_in_container mail_default_dhparams_one_dir
 
     docker run -d --name mail_default_dhparams_not_one_dir \
 		-v "`pwd`/test/config":/tmp/docker-mailserver \
@@ -34,8 +35,6 @@ function setup_file() {
 		-e DMS_DEBUG=0 \
 		-e ONE_DIR=0 \
 		-h mail.my-domain.com -t ${NAME}
-
-    wait_for_finished_setup_in_container mail_default_dhparams_one_dir
     wait_for_finished_setup_in_container mail_default_dhparams_not_one_dir
 }
 
diff --git a/test/mail_dhparams_manual_not_one_dir.bats b/test/mail_dhparams_manual_not_one_dir.bats
index eb713dfe..e2604c73 100644
--- a/test/mail_dhparams_manual_not_one_dir.bats
+++ b/test/mail_dhparams_manual_not_one_dir.bats
@@ -31,7 +31,6 @@ function setup_file() {
 		-e DMS_DEBUG=0 \
 		-e ONE_DIR=0 \
 		-h mail.my-domain.com -t ${NAME}
-
     wait_for_finished_setup_in_container mail_manual_dhparams_not_one_dir
 }
 
diff --git a/test/mail_dhparams_manual_one_dir.bats b/test/mail_dhparams_manual_one_dir.bats
index d9ce6d64..a144ffc3 100644
--- a/test/mail_dhparams_manual_one_dir.bats
+++ b/test/mail_dhparams_manual_one_dir.bats
@@ -28,7 +28,6 @@ function setup_file() {
 		-e DMS_DEBUG=0 \
 		-e ONE_DIR=1 \
 		-h mail.my-domain.com -t ${NAME}
-
     wait_for_finished_setup_in_container mail_manual_dhparams_one_dir
 }