diff --git a/broker/CMakeLists.txt b/broker/CMakeLists.txt
index ac9c6553135a42273aca66200bf893895dd641cc..6ba55360368b03d630f9a56fb2ffba493a229555 100644
--- a/broker/CMakeLists.txt
+++ b/broker/CMakeLists.txt
@@ -12,24 +12,26 @@ message(STATUS "global gopath ${GOPATH}")
 
 IF(WIN32)
     set (gopath "${GOPATH}\;${CMAKE_CURRENT_SOURCE_DIR}")
+    set (exe_name "${TARGET_NAME}.exe")
 ELSE()
     set (gopath ${GOPATH}:${CMAKE_CURRENT_SOURCE_DIR})
+    set (exe_name "${TARGET_NAME}")
 ENDIF()
 
 include(testing_go)
 
 add_custom_target(hidra2-broker ALL
     COMMAND  ${CMAKE_COMMAND} -E env GOPATH=${gopath}
-    go build ${GO_OPTS} -o ${TARGET_NAME} hidra2_broker/main
+    go build ${GO_OPTS} -o ${exe_name} hidra2_broker/main
     VERBATIM)
 define_property(TARGET PROPERTY EXENAME
         BRIEF_DOCS <executable name>
         FULL_DOCS <full-doc>)
 
-set_target_properties(hidra2-broker PROPERTIES EXENAME ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME})
+set_target_properties(hidra2-broker PROPERTIES EXENAME ${CMAKE_CURRENT_BINARY_DIR}/${exe_name})
 
 
-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME} DESTINATION bin)
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${exe_name} DESTINATION bin)
 
 gotest(${TARGET_NAME} "./...")
 go_integration_test(${TARGET_NAME}-connectdb "./..." "MongoDBConnect")
diff --git a/tests/broker/get_next/check_windows.bat b/tests/broker/get_next/check_windows.bat
index 3477690c7f11066891cd85511ed4e1e24daa30ed..351a030364f89034b28442438b6cfa765e38dc7f 100644
--- a/tests/broker/get_next/check_windows.bat
+++ b/tests/broker/get_next/check_windows.bat
@@ -1,15 +1,18 @@
 SET database_name=data
 SET mongo_exe="c:\Program Files\MongoDB\Server\3.6\bin\mongo.exe"
 
-echo db.data.insert({"_id":1}) | %mongo_exe% %database_name% | findstr file2  || goto :error
-echo db.data.insert({"_id":2}) | %mongo_exe% %database_name% | findstr file1  || goto :error
+echo db.data.insert({"_id":1}) | %mongo_exe% %database_name%  || goto :error
+echo db.data.insert({"_id":2}) | %mongo_exe% %database_name%  || goto :error
 
-start /B /CMD %1
+set full_name="%1"
+set short_name="%~nx1"
+
+start /B "" "%full_name%"
 
 ping 1.0.0.0 -n 1 -w 100 > nul
 
-C:\Curl\curl.exe -v  --silent 127.0.0.1:5005/next?database=data --stderr - | findstr '"_id":1'  || goto :error
-C:\Curl\curl.exe -v  --silent 127.0.0.1:5005/next?database=data --stderr - | findstr '"_id":2'  || goto :error
+C:\Curl\curl.exe -v  --silent 127.0.0.1:5005/next?database=data --stderr - | findstr \"_id\":1  || goto :error
+C:\Curl\curl.exe -v  --silent 127.0.0.1:5005/next?database=data --stderr - | findstr \"_id\":2  || goto :error
 C:\Curl\curl.exe -v  --silent 127.0.0.1:5005/next?database=data --stderr - | findstr  "No Content"  || goto :error
 
 goto :clean
@@ -19,6 +22,6 @@ call :clean
 exit /b 1
 
 :clean
-Taskkill /IM %1 /F
+Taskkill /IM "%short_name%" /F
 echo db.data.deleteMany({}) | %mongo_exe% %database_name%
 echo db.current_location.deleteMany({}) | %mongo_exe% %database_name%