diff --git a/tests.gyp b/tests.gyp
index 915bb3c7..84bd4941 100644
--- a/tests.gyp
+++ b/tests.gyp
@@ -37,11 +37,45 @@
         'externals/crypto-algorithms',
       ],
       'sources': [
+        'test/compiler/build_tables/lex_conflict_manager_test.cc',
+        'test/compiler/build_tables/lex_item_test.cc',
+        'test/compiler/build_tables/lex_table_builder_test.cc',
+        'test/compiler/build_tables/parse_item_set_builder_test.cc',
+        'test/compiler/build_tables/rule_can_be_blank_test.cc',
+        'test/compiler/prepare_grammar/expand_repeats_test.cc',
+        'test/compiler/prepare_grammar/expand_tokens_test.cc',
+        'test/compiler/prepare_grammar/extract_choices_test.cc',
+        'test/compiler/prepare_grammar/extract_tokens_test.cc',
+        'test/compiler/prepare_grammar/flatten_grammar_test.cc',
+        'test/compiler/prepare_grammar/intern_symbols_test.cc',
+        'test/compiler/prepare_grammar/parse_regex_test.cc',
+        'test/compiler/rules/character_set_test.cc',
+        'test/compiler/rules/choice_test.cc',
+        'test/compiler/rules/repeat_test.cc',
+        'test/compiler/util/string_helpers_test.cc',
+        'test/helpers/encoding_helpers.cc',
+        'test/helpers/file_helpers.cc',
+        'test/helpers/load_language.cc',
+        'test/helpers/point_helpers.cc',
+        'test/helpers/random_helpers.cc',
+        'test/helpers/read_test_entries.cc',
+        'test/helpers/record_alloc.cc',
+        'test/helpers/scope_sequence.cc',
+        'test/helpers/spy_input.cc',
+        'test/helpers/spy_logger.cc',
+        'test/helpers/stderr_logger.cc',
+        'test/helpers/stream_methods.cc',
+        'test/helpers/tree_helpers.cc',
+        'test/integration/fuzzing-examples.cc',
+        'test/integration/real_grammars.cc',
+        'test/integration/test_grammars.cc',
+        'test/runtime/document_test.cc',
+        'test/runtime/language_test.cc',
+        'test/runtime/node_test.cc',
+        'test/runtime/parser_test.cc',
+        'test/runtime/stack_test.cc',
+        'test/runtime/tree_test.cc',
         'test/tests.cc',
-        '<!@(find test/compiler -name "*.cc")',
-        '<!@(find test/runtime -name "*.cc")',
-        '<!@(find test/integration -name "*.cc")',
-        '<!@(find test/helpers -name "*.cc")',
       ],
       'cflags': [
         '-g',