4 files changed, 31 insertions, 16 deletions
diff --git a/test/core/bad_client/gen_build_json.py b/test/core/bad_client/gen_build_json.py
index a6fa266bec..33bf65ac04 100755
--- a/test/core/bad_client/gen_build_json.py
+++ b/test/core/bad_client/gen_build_json.py
@@ -54,6 +54,15 @@ def main():
             'language': 'c',
             'src': [
               'test/core/bad_client/bad_client.c'
+            ],
+            'headers': [
+              'test/core/bad_client/bad_client.h'
+            ],
+            'deps': [
+              'grpc_test_util_unsecure',
+              'grpc_unsecure',
+              'gpr_test_util',
+              'gpr'
             ]
           }],
       'targets': [
diff --git a/test/core/end2end/gen_build_json.py b/test/core/end2end/gen_build_json.py
index f47c92bc47..f1c7e85e08 100755
--- a/test/core/end2end/gen_build_json.py
+++ b/test/core/end2end/gen_build_json.py
@@ -93,6 +93,19 @@ END2END_TESTS = {
 
 
 def main():
+  sec_deps = [
+    'end2end_certs',
+    'grpc_test_util',
+    'grpc',
+    'gpr_test_util',
+    'gpr'
+  ]
+  unsec_deps = [
+    'grpc_test_util_unsecure',
+    'grpc_unsecure',
+    'gpr_test_util',
+    'gpr'
+  ]
   json = {
       '#': 'generated with test/end2end/gen_build_json.py',
       'libs': [
@@ -103,6 +116,8 @@ def main():
               'secure': 'check' if END2END_FIXTURES[f].secure else 'no',
               'src': ['test/core/end2end/fixtures/%s.c' % f],
               'platforms': [ 'posix' ] if f.endswith('_posix') else END2END_FIXTURES[f].platforms,
+              'deps': sec_deps if END2END_FIXTURES[f].secure else unsec_deps,
+              'headers': ['test/core/end2end/end2end_tests.h'],
           }
           for f in sorted(END2END_FIXTURES.keys())] + [
           {
@@ -111,7 +126,9 @@ def main():
               'language': 'c',
               'secure': 'check' if END2END_TESTS[t].secure else 'no',
               'src': ['test/core/end2end/tests/%s.c' % t],
-              'headers': ['test/core/end2end/tests/cancel_test_helpers.h']
+              'headers': ['test/core/end2end/tests/cancel_test_helpers.h',
+                          'test/core/end2end/end2end_tests.h'],
+              'deps': sec_deps if END2END_TESTS[t].secure else unsec_deps
           }
           for t in sorted(END2END_TESTS.keys())] + [
           {
@@ -135,13 +152,7 @@ def main():
               'platforms': END2END_FIXTURES[f].platforms,
               'deps': [
                   'end2end_fixture_%s' % f,
-                  'end2end_test_%s' % t,
-                  'end2end_certs',
-                  'grpc_test_util',
-                  'grpc',
-                  'gpr_test_util',
-                  'gpr'
-              ]
+                  'end2end_test_%s' % t] + sec_deps
           }
       for f in sorted(END2END_FIXTURES.keys())
       for t in sorted(END2END_TESTS.keys())] + [
@@ -155,12 +166,7 @@ def main():
               'platforms': END2END_FIXTURES[f].platforms,
               'deps': [
                   'end2end_fixture_%s' % f,
-                  'end2end_test_%s' % t,
-                  'grpc_test_util_unsecure',
-                  'grpc_unsecure',
-                  'gpr_test_util',
-                  'gpr'
-              ]
+                  'end2end_test_%s' % t] + unsec_deps
           }
       for f in sorted(END2END_FIXTURES.keys()) if not END2END_FIXTURES[f].secure
       for t in sorted(END2END_TESTS.keys()) if not END2END_TESTS[t].secure]}
diff --git a/test/cpp/qps/qps_worker.cc b/test/cpp/qps/qps_worker.cc
index 423275ee85..f1cea5ee66 100644
--- a/test/cpp/qps/qps_worker.cc
+++ b/test/cpp/qps/qps_worker.cc
@@ -31,7 +31,7 @@
  *
  */
 
-#include "qps_worker.h"
+#include "test/cpp/qps/qps_worker.h"
 
 #include <cassert>
 #include <memory>
diff --git a/test/cpp/qps/worker.cc b/test/cpp/qps/worker.cc
index dfc102fc17..14a8b0b089 100644
--- a/test/cpp/qps/worker.cc
+++ b/test/cpp/qps/worker.cc
@@ -40,7 +40,7 @@
 #include <grpc/support/time.h>
 #include <gflags/gflags.h>
 
-#include "qps_worker.h"
+#include "test/cpp/qps/qps_worker.h"
 #include "test/cpp/util/test_config.h"
 
 DEFINE_int32(driver_port, 0, "Driver server port.");