diff --git a/config/nomad/nginx_kill_win.nmd b/config/nomad/nginx_kill_win.nmd
index 978b98d4b8faf7ed23b79a64deac270003d5cb01..3480ab65238a697acf6668b771a556e4ec61bc2b 100644
--- a/config/nomad/nginx_kill_win.nmd
+++ b/config/nomad/nginx_kill_win.nmd
@@ -11,7 +11,7 @@ job "nginx_kill" {
       driver = "raw_exec"
       config {
         command = "taskkill",
-        args =  ["/f","/im","nginx_exe.exe"]
+        args =  ["/f","/im","nginx.exe"]
       }
    }
   }
diff --git a/tests/automatic/full_chain/simple_chain_metadata/check_windows.bat b/tests/automatic/full_chain/simple_chain_metadata/check_windows.bat
index 536df36fff5e8805c20cfc4745fe1ad16490c07b..399df73f5a9063db17a091cad6c5b739c7ee574d 100644
--- a/tests/automatic/full_chain/simple_chain_metadata/check_windows.bat
+++ b/tests/automatic/full_chain/simple_chain_metadata/check_windows.bat
@@ -20,6 +20,19 @@ c:\opt\consul\nomad run nginx.nmd
 
 ping 1.0.0.0 -n 10 -w 100 > nul
 
+set i=0
+:repeat
+set /a i=%i%+1
+echo %i%
+if %i% EQU 20 (
+    goto :error
+)
+timeout /t 1
+curl --fail 127.0.0.1:8400/asapo-discovery/asapo-receiver || goto :repeat
+curl --fail 127.0.0.1:8400/asapo-discovery/asapo-broker|| goto :repeat
+echo discovery ready
+
+
 REM producer
 mkdir %receiver_folder%
 "%1" %proxy_address% %beamtime_id% 100 0 1 0 1000
diff --git a/tests/automatic/settings/nginx.conf.tpl b/tests/automatic/settings/nginx.conf.tpl
index b4a518fcd2b9d291c6b4170af53167c00b171e37..09a376250af365dde744bd36ae718a5b3a09c491 100644
--- a/tests/automatic/settings/nginx.conf.tpl
+++ b/tests/automatic/settings/nginx.conf.tpl
@@ -1,5 +1,5 @@
 worker_processes  1;
-
+daemon off;
 events {
     worker_connections  1024;
 }