diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36592cab..6da85ca2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -306,6 +306,20 @@ if(WITH_TESTS)
 		set(${PY_NAME_LIST} "${LOCAL_LIST}" PARENT_SCOPE)
 	endfunction()
 
+    function(mosq_test_set_windows_path name)
+        if(WIN32)
+            set(PATHMOD
+                "PATH=path_list_prepend:$<TARGET_FILE_DIR:libmosquitto_common>"
+                "PATH=path_list_prepend:$<TARGET_FILE_DIR:libmosquitto>"
+                "PATH=path_list_prepend:${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin"
+            )
+            set_property(TEST ${name}
+				PROPERTY
+					ENVIRONMENT_MODIFICATION "${PATHMOD}"
+			)
+        endif()
+    endfunction()
+
 	function(mosq_set_test_props name)
 		set(fullname "${prefix}-${name}")
 		get_property(test_vars GLOBAL PROPERTY TEST_ENV_VARS)
@@ -314,6 +328,7 @@ if(WITH_TESTS)
 				ENVIRONMENT "${test_vars}"
 				SKIP_RETURN_CODE 77
 		)
+		mosq_test_set_windows_path(${name})
 	endfunction()
 
 	function(add_python_test PY_TEST_LIST PREFIX PORTS PY_TEST_FILE)
diff --git a/test/unit/broker/CMakeLists.txt b/test/unit/broker/CMakeLists.txt
index 4de1cf97..bd60b43e 100644
--- a/test/unit/broker/CMakeLists.txt
+++ b/test/unit/broker/CMakeLists.txt
@@ -14,6 +14,7 @@ add_executable(bridge-topic-test
 target_compile_definitions(bridge-topic-test PRIVATE WITH_BRIDGE WITH_BROKER)
 target_link_libraries(bridge-topic-test PRIVATE bridge-topic-obj common-unit-test-header libmosquitto_common)
 add_test(NAME unit-bridge-topic-test COMMAND bridge-topic-test)
+mosq_test_set_windows_path("unit-bridge-topic-test")
 
 # keepalive-test
 add_executable(keepalive-test
@@ -23,6 +24,7 @@ add_executable(keepalive-test
 target_compile_definitions(keepalive-test PRIVATE WITH_BROKER)
 target_link_libraries(keepalive-test PRIVATE common-unit-test-header libmosquitto_common)
 add_test(NAME unit-keepalive-test COMMAND keepalive-test)
+mosq_test_set_windows_path("unit-keepalive-test")
 
 # persist-read-test
 add_library(persistence-read-obj
@@ -51,6 +53,7 @@ if(WIN32)
 	target_link_libraries(persist-read-test PRIVATE ws2_32)
 endif()
 add_test(NAME unit-persist-read-test COMMAND persist-read-test)
+mosq_test_set_windows_path("unit-persist-read-test")
 
 # persist-write-test
 add_library(persistence-write-obj
@@ -84,6 +87,7 @@ if(WIN32)
 	target_link_libraries(persist-write-test PRIVATE ws2_32)
 endif()
 add_test(NAME unit-persist-write-test COMMAND persist-write-test)
+mosq_test_set_windows_path("unit-persist-write-test")
 
 # subs-test
 add_library(subs-obj
@@ -109,3 +113,4 @@ if(WIN32)
 	target_link_libraries(subs-test PRIVATE ws2_32)
 endif()
 add_test(NAME unit-subs-test COMMAND subs-test)
+mosq_test_set_windows_path("unit-subs-test")
diff --git a/test/unit/lib/CMakeLists.txt b/test/unit/lib/CMakeLists.txt
index 6e9566ab..e4694129 100644
--- a/test/unit/lib/CMakeLists.txt
+++ b/test/unit/lib/CMakeLists.txt
@@ -19,3 +19,4 @@ if(WIN32)
 	target_link_libraries(lib-test PRIVATE ${THREADLIB} ws2_32)
 endif()
 add_test(NAME unit-lib-test COMMAND lib-test)
+mosq_test_set_windows_path("unit-lib-test")
\ No newline at end of file
diff --git a/test/unit/libcommon/CMakeLists.txt b/test/unit/libcommon/CMakeLists.txt
index f35c26d2..25273d85 100644
--- a/test/unit/libcommon/CMakeLists.txt
+++ b/test/unit/libcommon/CMakeLists.txt
@@ -20,3 +20,4 @@ target_link_libraries(libcommon-test
 		libmosquitto_common
 )
 add_test(NAME unit-libcommon-test COMMAND libcommon-test)
+mosq_test_set_windows_path("unit-libcommon-test")