diff --git a/test/windows/SConscript b/test/windows/SConscript
index 29a464949..232f01b1a 100644
--- a/test/windows/SConscript
+++ b/test/windows/SConscript
@@ -23,24 +23,18 @@ env.AppendENVPath('Path', Dir('#build/bin'))
 common_tests_src = ['fake_win_packet_raw.c', 'fake_win_memory.c', 'fake_vrouter.c']
 common_tests_obj = env.Object(common_tests_src)
 
-win_packet_clone_tests_src = ['test_win_packet_clone.c'] + common_tests_obj
-win_packet_clone_tests = env.UnitTest('win_packet_clone_tests', win_packet_clone_tests_src)
-
-win_packet_free_tests_src = ['test_win_packet_free.c'] + common_tests_obj
-win_packet_free_tests = env.UnitTest('win_packet_free_tests', win_packet_free_tests_src)
-
-win_pclone_tests_src = ['test_win_pclone.c'] + common_tests_obj
-win_pclone_tests = env.UnitTest('win_pclone_tests', win_pclone_tests_src)
-
-win_pfree_tests_src = ['test_win_pfree.c'] + common_tests_obj
-win_pfree_tests = env.UnitTest('win_pfree_tests', win_pfree_tests_src)
-
-test_suites = [
-    win_packet_clone_tests,
-    win_packet_free_tests,
-    win_pclone_tests,
-    win_pfree_tests,
+test_suite_base_names = [
+    'win_packet_clone',
+    'win_packet_free',
+    'win_pclone',
+    'win_pfree',
 ]
 
+test_suites = []
+for test_suite_name in test_suite_base_names:
+    test_suite_src = ['test_{}.c'.format(test_suite_name)] + common_tests_obj
+    test_suite = env.UnitTest('{}_tests'.format(test_suite_name), test_suite_src)
+    test_suites.append(test_suite)
+
 kernel_tests = env.TestSuite('kernel-tests', test_suites)
 env.Requires(kernel_tests, '#build/bin/cmocka.dll')