diff --git a/node.gyp b/node.gyp
index 6166f9d577ea41..5aed08ee4164b8 100644
--- a/node.gyp
+++ b/node.gyp
@@ -402,26 +402,8 @@
     ],
     'node_cctest_sources': [
       'src/node_snapshot_stub.cc',
-      'test/cctest/node_test_fixture.cc',
-      'test/cctest/node_test_fixture.h',
-      'test/cctest/test_aliased_buffer.cc',
-      'test/cctest/test_base64.cc',
-      'test/cctest/test_base_object_ptr.cc',
-      'test/cctest/test_cppgc.cc',
-      'test/cctest/test_node_postmortem_metadata.cc',
-      'test/cctest/test_node_task_runner.cc',
-      'test/cctest/test_environment.cc',
-      'test/cctest/test_linked_binding.cc',
-      'test/cctest/test_node_api.cc',
-      'test/cctest/test_path.cc',
-      'test/cctest/test_per_process.cc',
-      'test/cctest/test_platform.cc',
-      'test/cctest/test_report.cc',
-      'test/cctest/test_json_utils.cc',
-      'test/cctest/test_sockaddr.cc',
-      'test/cctest/test_traced_value.cc',
-      'test/cctest/test_util.cc',
-      'test/cctest/test_dataqueue.cc',
+      '<!@(<(python) tools/search_files.py . test/cctest cc)',
+      '<!@(<(python) tools/search_files.py . test/cctest h)',
     ],
     'node_cctest_openssl_sources': [
       'test/cctest/test_crypto_clienthello.cc',
@@ -1204,13 +1186,13 @@
           'dependencies': [
             'deps/ncrypto/ncrypto.gyp:ncrypto',
           ],
-          'sources': [ '<@(node_cctest_openssl_sources)' ],
+        }, {
+          'sources!': [ '<@(node_cctest_openssl_sources)' ],
         }],
         ['v8_enable_inspector==1', {
           'defines': [
             'HAVE_INSPECTOR=1',
           ],
-          'sources': [ '<@(node_cctest_inspector_sources)' ],
           'include_dirs': [
             # TODO(legendecas): make node_inspector.gypi a dependable target.
             '<(SHARED_INTERMEDIATE_DIR)', # for inspector
@@ -1222,7 +1204,8 @@
         }, {
            'defines': [
              'HAVE_INSPECTOR=0',
-           ]
+           ],
+           'sources!': [ '<@(node_cctest_inspector_sources)' ],
         }],
         ['OS=="solaris"', {
           'ldflags': [ '-I<(SHARED_INTERMEDIATE_DIR)' ]
diff --git a/tools/search_files.py b/tools/search_files.py
index 65d0e1be42f0a8..856878c33681a7 100755
--- a/tools/search_files.py
+++ b/tools/search_files.py
@@ -14,6 +14,9 @@
   try:
     files = SearchFiles(*sys.argv[2:])
     files = [ os.path.relpath(x, sys.argv[1]) for x in files ]
+    # Apply the same transform in SearchFiles after relpath
+    if sys.platform == 'win32':
+      files = [ x.replace('\\', '/') for x in files ]
     print('\n'.join(files))
   except Exception as e:
     print(str(e))