diff --git a/build.json b/build.json
index 401ef051924bfe54d94179f3b6dedd10fdb1cec9..d3e496e3799900453ef745b783dbd56b70a9c2e4 100644
--- a/build.json
+++ b/build.json
@@ -760,6 +760,7 @@
     {
       "name": "echo_client",
       "build": "test",
+      "run": false,
       "language": "c",
       "src": [
         "test/core/echo/client.c"
@@ -769,12 +770,12 @@
         "grpc",
         "gpr_test_util",
         "gpr"
-      ],
-      "run": false
+      ]
     },
     {
       "name": "echo_server",
       "build": "test",
+      "run": false,
       "language": "c",
       "src": [
         "test/core/echo/server.c"
@@ -784,8 +785,7 @@
         "grpc",
         "gpr_test_util",
         "gpr"
-      ],
-      "run": false
+      ]
     },
     {
       "name": "echo_test",
@@ -818,6 +818,7 @@
     {
       "name": "fling_client",
       "build": "test",
+      "run": false,
       "language": "c",
       "src": [
         "test/core/fling/client.c"
@@ -827,12 +828,12 @@
         "grpc",
         "gpr_test_util",
         "gpr"
-      ],
-      "run": false
+      ]
     },
     {
       "name": "fling_server",
       "build": "test",
+      "run": false,
       "language": "c",
       "src": [
         "test/core/fling/server.c"
@@ -842,8 +843,7 @@
         "grpc",
         "gpr_test_util",
         "gpr"
-      ],
-      "run": false
+      ]
     },
     {
       "name": "fling_stream_test",
@@ -1253,6 +1253,7 @@
     {
       "name": "json_rewrite",
       "build": "test",
+      "run": false,
       "language": "c",
       "src": [
         "test/core/json/json_rewrite.c"
@@ -1260,12 +1261,12 @@
       "deps": [
         "grpc",
         "gpr"
-      ],
-      "run": false
+      ]
     },
     {
       "name": "json_rewrite_test",
       "build": "test",
+      "run": false,
       "language": "c",
       "src": [
         "test/core/json/json_rewrite_test.c"
@@ -1275,8 +1276,7 @@
         "grpc",
         "gpr_test_util",
         "gpr"
-      ],
-      "run": false
+      ]
     },
     {
       "name": "json_test",
@@ -1588,6 +1588,7 @@
     {
       "name": "interop_client",
       "build": "test",
+      "run": false,
       "language": "c++",
       "src": [
         "test/cpp/interop/empty.proto",
@@ -1602,12 +1603,12 @@
         "grpc",
         "gpr_test_util",
         "gpr"
-      ],
-      "run": false
+      ]
     },
     {
       "name": "interop_server",
       "build": "test",
+      "run": false,
       "language": "c++",
       "src": [
         "test/cpp/interop/empty.proto",
@@ -1622,12 +1623,12 @@
         "grpc",
         "gpr_test_util",
         "gpr"
-      ],
-      "run": false
+      ]
     },
     {
       "name": "qps_client",
       "build": "test",
+      "run": false,
       "language": "c++",
       "src": [
         "test/cpp/qps/qpstest.proto",
@@ -1640,12 +1641,12 @@
         "grpc",
         "gpr_test_util",
         "gpr"
-      ],
-      "run": false
+      ]
     },
     {
       "name": "qps_server",
       "build": "test",
+      "run": false,
       "language": "c++",
       "src": [
         "test/cpp/qps/qpstest.proto",
@@ -1658,8 +1659,7 @@
         "grpc",
         "gpr_test_util",
         "gpr"
-      ],
-      "run": false
+      ]
     },
     {
       "name": "ruby_plugin",
@@ -1727,6 +1727,7 @@
     {
       "name": "tips_client",
       "build": "test",
+      "run": false,
       "language": "c++",
       "src": [
         "examples/tips/main.cc"
@@ -1739,8 +1740,7 @@
         "grpc",
         "gpr_test_util",
         "gpr"
-      ],
-      "run": false
+      ]
     },
     {
       "name": "tips_publisher_test",
diff --git a/tools/buildgen/build-cleaner.py b/tools/buildgen/build-cleaner.py
index 4992beb89707c8c06084e7681db3ada3b548d460..6477ad202fac0968fd37c69cdaffa7080abf56fd 100755
--- a/tools/buildgen/build-cleaner.py
+++ b/tools/buildgen/build-cleaner.py
@@ -13,6 +13,7 @@ _VERSION_KEYS = ['major', 'minor', 'micro', 'build']
 _ELEM_KEYS = [
     'name', 
     'build', 
+    'run',
     'language', 
     'public_headers', 
     'headers',