diff --git a/src/meson.build b/src/meson.build
index f71cb5e17..186563365 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -489,17 +489,17 @@ if get_option('tests').enabled()
 
   compiled_tests = {
     'test-algs': ['test-algs.cc', 'hb-static.cc'],
-    'test-array': 'test-array.cc',
+    'test-array': ['test-array.cc'],
     'test-iter': ['test-iter.cc', 'hb-static.cc'],
     'test-meta': ['test-meta.cc', 'hb-static.cc'],
     'test-number': ['test-number.cc', 'hb-number.cc'],
-    'test-ot-tag': 'hb-ot-tag.cc',
-    'test-unicode-ranges': 'test-unicode-ranges.cc',
+    'test-ot-tag': ['hb-ot-tag.cc'],
+    'test-unicode-ranges': ['test-unicode-ranges.cc'],
     'test-bimap': ['test-bimap.cc', 'hb-static.cc'],
   }
   foreach name, source : compiled_tests
-    if cpp.get_id() == 'msvc' and ['test-algs', 'test-bimap', 'test-iter', 'test-meta'].contains(name)
-      # TODO: MSVC doesn't like these, fix them
+    if cpp.get_id() == 'msvc' and source.contains('hb-static.cc')
+      # TODO: MSVC doesn't like tests having hb-static.cc, fix them
       continue
     endif
     test(name, executable(name, source,