diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt
index 4004bee598..c1e275e4d3 100644
--- a/domain-server/CMakeLists.txt
+++ b/domain-server/CMakeLists.txt
@@ -44,7 +44,6 @@ if (UNIX)
 endif ()
 
 if (WIN32)
-  add_dependency_external_projects(wasapi)
   package_libraries_for_deployment()
 endif ()
 
diff --git a/tests/controllers/CMakeLists.txt b/tests/controllers/CMakeLists.txt
index 062d69ca03..c3d25cfe2e 100644
--- a/tests/controllers/CMakeLists.txt
+++ b/tests/controllers/CMakeLists.txt
@@ -19,6 +19,7 @@ if (WIN32)
 endif()
 if (WIN32)
     target_link_libraries(${TARGET_NAME} Winmm.lib)
+    add_dependency_external_projects(wasapi)
 endif()
 
 package_libraries_for_deployment()
diff --git a/tests/entities/CMakeLists.txt b/tests/entities/CMakeLists.txt
index 080ae7cdd9..0c33eb8555 100644
--- a/tests/entities/CMakeLists.txt
+++ b/tests/entities/CMakeLists.txt
@@ -9,4 +9,8 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
 # link in the shared libraries
 link_hifi_libraries(entities avatars shared octree gpu model fbx networking animation audio gl)
 
+if (WIN32)
+  add_dependency_external_projects(wasapi)
+endif ()
+
 package_libraries_for_deployment()
diff --git a/tests/gpu-test/CMakeLists.txt b/tests/gpu-test/CMakeLists.txt
index d73d7a111d..8e49d523b8 100644
--- a/tests/gpu-test/CMakeLists.txt
+++ b/tests/gpu-test/CMakeLists.txt
@@ -5,6 +5,11 @@ setup_hifi_project(Quick Gui OpenGL Script Widgets)
 setup_memory_debugger()
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
 link_hifi_libraries(networking gl gpu gpu-gl procedural shared fbx model model-networking animation script-engine render render-utils octree image ktx)
+
+if (WIN32)
+  add_dependency_external_projects(wasapi)
+endif ()
+
 package_libraries_for_deployment()
 
 target_nsight()
diff --git a/tests/qt59/CMakeLists.txt b/tests/qt59/CMakeLists.txt
index e0e8138a1e..e3450ae069 100644
--- a/tests/qt59/CMakeLists.txt
+++ b/tests/qt59/CMakeLists.txt
@@ -11,7 +11,12 @@ setup_memory_debugger()
 setup_hifi_project(Gui)
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
 
+
 # link in the shared libraries
 link_hifi_libraries(shared networking)
 
+if (WIN32)
+	add_dependency_external_projects(wasapi)
+endif()
+
 package_libraries_for_deployment()
diff --git a/tests/recording/CMakeLists.txt b/tests/recording/CMakeLists.txt
index 7ed4f5b1b0..dbb942a27a 100644
--- a/tests/recording/CMakeLists.txt
+++ b/tests/recording/CMakeLists.txt
@@ -6,6 +6,7 @@ setup_memory_debugger()
 link_hifi_libraries(shared recording)
 if (WIN32)
     target_link_libraries(${TARGET_NAME} Winmm.lib)
+	add_dependency_external_projects(wasapi)
 endif()
 package_libraries_for_deployment()
 
@@ -17,4 +18,4 @@ package_libraries_for_deployment()
 #
 #  package_libraries_for_deployment()
 #endmacro ()
-#setup_hifi_testcase()
+#setup_hifi_testcase()
\ No newline at end of file
diff --git a/tests/render-perf/CMakeLists.txt b/tests/render-perf/CMakeLists.txt
index 59e043cd64..09b2dc6a50 100644
--- a/tests/render-perf/CMakeLists.txt
+++ b/tests/render-perf/CMakeLists.txt
@@ -16,6 +16,7 @@ link_hifi_libraries(shared networking model fbx ktx image octree gl gpu gpu-gl r
 
 if (WIN32)
     target_link_libraries(${TARGET_NAME} Winmm.lib)
+    add_dependency_external_projects(wasapi)
 endif()
 
 package_libraries_for_deployment()
diff --git a/tests/render-texture-load/CMakeLists.txt b/tests/render-texture-load/CMakeLists.txt
index 30030914ab..432a1f00d6 100644
--- a/tests/render-texture-load/CMakeLists.txt
+++ b/tests/render-texture-load/CMakeLists.txt
@@ -26,7 +26,8 @@ target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${QUAZIP_INCLUDE_DIRS})
 target_link_libraries(${TARGET_NAME} ${QUAZIP_LIBRARIES})
 
 if (WIN32)
-add_paths_to_fixup_libs(${QUAZIP_DLL_PATH})
+  add_paths_to_fixup_libs(${QUAZIP_DLL_PATH})
+  add_dependency_external_projects(wasapi)
 endif ()
 
 
diff --git a/tests/render-utils/CMakeLists.txt b/tests/render-utils/CMakeLists.txt
index 4944ad2cbc..4e67aef3be 100644
--- a/tests/render-utils/CMakeLists.txt
+++ b/tests/render-utils/CMakeLists.txt
@@ -11,4 +11,8 @@ setup_memory_debugger()
 link_hifi_libraries(render-utils gl gpu gpu-gl shared)
 target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT})
 
+if (WIN32)
+  add_dependency_external_projects(wasapi)
+endif ()
+
 package_libraries_for_deployment()
diff --git a/tests/shaders/CMakeLists.txt b/tests/shaders/CMakeLists.txt
index bab1e0dcdc..ba4ca88127 100644
--- a/tests/shaders/CMakeLists.txt
+++ b/tests/shaders/CMakeLists.txt
@@ -17,4 +17,8 @@ include_directories("${PROJECT_BINARY_DIR}/../../libraries/render-utils/")
 include_directories("${PROJECT_BINARY_DIR}/../../libraries/entities-renderer/")
 include_directories("${PROJECT_BINARY_DIR}/../../libraries/model/")
 
+if (WIN32)
+  add_dependency_external_projects(wasapi)
+endif ()
+
 package_libraries_for_deployment()