diff --git a/meson.build b/meson.build
index 5d8b9eb6..c126945f 100644
--- a/meson.build
+++ b/meson.build
@@ -103,6 +103,17 @@ endif
 subdir('include')
 subdir('libs')
 
+if vkd3d_platform == 'windows'
+  if enable_standalone_d3d12
+    lib_d3d12 = d3d12_dep
+  elif not lib_d3d12.found()
+    lib_d3d12 = vkd3d_utils_dep
+    if enable_extras
+      warning('No d3d12 lib, falling back to vkd3d_utils for extras ...')
+    endif
+  endif
+endif
+
 if enable_tests
   subdir('tests')
 endif
@@ -114,13 +125,6 @@ if enable_extras
     lib_xcbkeysyms   = vkd3d_compiler.find_library('xcb-keysyms')
   endif
 
-  if enable_standalone_d3d12
-    lib_d3d12 = d3d12_dep
-  elif not lib_d3d12.found()
-    lib_d3d12 = vkd3d_utils_dep
-    warning('No d3d12 lib, falling back to vkd3d_utils for extras...')
-  endif
-
   subdir('demos')
   subdir('programs')
 endif
diff --git a/tests/meson.build b/tests/meson.build
index 9fdcd317..c297d954 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,17 +1,26 @@
-vkd3d_test_deps = [ vkd3d_dep, vkd3d_utils_dep ]
 
+vkd3d_test_flags = []
 if vkd3d_platform == 'windows'
-  vkd3d_test_deps += lib_dxgi
+  if enable_standalone_d3d12
+    vkd3d_test_deps = [ lib_d3d12, lib_dxgi ]
+  else
+    vkd3d_test_deps = [ vkd3d_dep, vkd3d_utils_dep ]
+    vkd3d_test_flags = ['-DVKD3D_FORCE_UTILS_WRAPPER=1']
+  endif
+else
+  vkd3d_test_deps = [ vkd3d_dep, vkd3d_utils_dep ]
 endif
 
 executable('d3d12', 'd3d12.c', vkd3d_headers,
-  dependencies        : vkd3d_test_deps + [ vkd3d_shader_dep ],
+  dependencies        : vkd3d_test_deps,
   include_directories : vkd3d_private_includes,
   install             : true,
+  c_args              : vkd3d_test_flags,
   override_options    : [ 'c_std='+vkd3d_c_std ])
 
 executable('descriptor-performance', 'descriptor_performance.c', vkd3d_headers,
-  dependencies        : vkd3d_test_deps + [ vkd3d_shader_dep ],
+  dependencies        : vkd3d_test_deps,
   include_directories : vkd3d_private_includes,
   install             : true,
+  c_args              : vkd3d_test_flags,
   override_options    : [ 'c_std='+vkd3d_c_std ])