diff --git a/templates/tools/run_tests/tests.json.template b/templates/tools/run_tests/tests.json.template
index 04a5137f39d..f28a1daad8a 100644
--- a/templates/tools/run_tests/tests.json.template
+++ b/templates/tools/run_tests/tests.json.template
@@ -4,6 +4,6 @@ import json
 
 ${json.dumps([{"name": tgt.name, "language": tgt.language}
               for tgt in targets
-              if tgt.build == "test" and tgt.name[-5:] == "_test"],
+              if tgt.get('run', True)],
              sort_keys=True, indent=2)}
 
diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json
index d2b125fc014..76a089de877 100644
--- a/tools/run_tests/tests.json
+++ b/tools/run_tests/tests.json
@@ -45,10 +45,18 @@
     "language": "c", 
     "name": "census_statistics_small_log_test"
   }, 
+  {
+    "language": "c", 
+    "name": "census_stats_store_test"
+  }, 
   {
     "language": "c", 
     "name": "census_stub_test"
   }, 
+  {
+    "language": "c", 
+    "name": "census_trace_store_test"
+  }, 
   {
     "language": "c", 
     "name": "census_window_stats_test"
@@ -89,6 +97,10 @@
     "language": "c", 
     "name": "fling_test"
   }, 
+  {
+    "language": "c", 
+    "name": "gen_hpack_tables"
+  }, 
   {
     "language": "c", 
     "name": "gpr_cancellable_test"
@@ -157,6 +169,10 @@
     "language": "c", 
     "name": "grpc_channel_stack_test"
   }, 
+  {
+    "language": "c", 
+    "name": "grpc_completion_queue_benchmark"
+  }, 
   {
     "language": "c", 
     "name": "grpc_completion_queue_test"
@@ -165,6 +181,10 @@
     "language": "c", 
     "name": "grpc_credentials_test"
   }, 
+  {
+    "language": "c", 
+    "name": "grpc_fetch_oauth2"
+  }, 
   {
     "language": "c", 
     "name": "grpc_json_token_test"
@@ -199,15 +219,15 @@
   }, 
   {
     "language": "c", 
-    "name": "json_rewrite_test"
+    "name": "json_test"
   }, 
   {
     "language": "c", 
-    "name": "json_test"
+    "name": "lame_client_test"
   }, 
   {
     "language": "c", 
-    "name": "lame_client_test"
+    "name": "low_level_ping_pong_benchmark"
   }, 
   {
     "language": "c", 
@@ -289,6 +309,18 @@
     "language": "c++", 
     "name": "end2end_test"
   }, 
+  {
+    "language": "c++", 
+    "name": "grpc_cpp_plugin"
+  }, 
+  {
+    "language": "c++", 
+    "name": "grpc_python_plugin"
+  }, 
+  {
+    "language": "c++", 
+    "name": "grpc_ruby_plugin"
+  }, 
   {
     "language": "c++", 
     "name": "pubsub_publisher_test"