Cleaned up
diff --git a/build.json b/build.json
index 119bd4c..5e4d806 100644
--- a/build.json
+++ b/build.json
@@ -1645,6 +1645,58 @@
       ]
     },
     {
+      "name": "pubsub_client",
+      "build": "test",
+      "run": false,
+      "language": "c++",
+      "src": [
+        "examples/pubsub/main.cc"
+      ],
+      "deps": [
+        "pubsub_client_lib",
+        "grpc++_test_util",
+        "grpc_test_util",
+        "grpc++",
+        "grpc",
+        "gpr_test_util",
+        "gpr"
+      ]
+    },
+    {
+      "name": "pubsub_publisher_test",
+      "build": "test",
+      "language": "c++",
+      "src": [
+        "examples/pubsub/publisher_test.cc"
+      ],
+      "deps": [
+        "pubsub_client_lib",
+        "grpc++_test_util",
+        "grpc_test_util",
+        "grpc++",
+        "grpc",
+        "gpr_test_util",
+        "gpr"
+      ]
+    },
+    {
+      "name": "pubsub_subscriber_test",
+      "build": "test",
+      "language": "c++",
+      "src": [
+        "examples/pubsub/subscriber_test.cc"
+      ],
+      "deps": [
+        "pubsub_client_lib",
+        "grpc++_test_util",
+        "grpc_test_util",
+        "grpc++",
+        "grpc",
+        "gpr_test_util",
+        "gpr"
+      ]
+    },
+    {
       "name": "qps_client",
       "build": "test",
       "run": false,
@@ -1726,58 +1778,6 @@
         "gpr_test_util",
         "gpr"
       ]
-    },
-    {
-      "name": "pubsub_client",
-      "build": "test",
-      "run": false,
-      "language": "c++",
-      "src": [
-        "examples/pubsub/main.cc"
-      ],
-      "deps": [
-        "pubsub_client_lib",
-        "grpc++_test_util",
-        "grpc_test_util",
-        "grpc++",
-        "grpc",
-        "gpr_test_util",
-        "gpr"
-      ]
-    },
-    {
-      "name": "pubsub_publisher_test",
-      "build": "test",
-      "language": "c++",
-      "src": [
-        "examples/pubsub/publisher_test.cc"
-      ],
-      "deps": [
-        "pubsub_client_lib",
-        "grpc++_test_util",
-        "grpc_test_util",
-        "grpc++",
-        "grpc",
-        "gpr_test_util",
-        "gpr"
-      ]
-    },
-    {
-      "name": "pubsub_subscriber_test",
-      "build": "test",
-      "language": "c++",
-      "src": [
-        "examples/pubsub/subscriber_test.cc"
-      ],
-      "deps": [
-        "pubsub_client_lib",
-        "grpc++_test_util",
-        "grpc_test_util",
-        "grpc++",
-        "grpc",
-        "gpr_test_util",
-        "gpr"
-      ]
     }
   ]
 }
diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json
index 20c585a..9b1009f 100644
--- a/tools/run_tests/tests.json
+++ b/tools/run_tests/tests.json
@@ -283,14 +283,6 @@
   }, 
   {
     "language": "c++", 
-    "name": "status_test"
-  }, 
-  {
-    "language": "c++", 
-    "name": "thread_pool_test"
-  }, 
-  {
-    "language": "c++", 
     "name": "pubsub_publisher_test"
   }, 
   {
@@ -298,6 +290,14 @@
     "name": "pubsub_subscriber_test"
   }, 
   {
+    "language": "c++", 
+    "name": "status_test"
+  }, 
+  {
+    "language": "c++", 
+    "name": "thread_pool_test"
+  }, 
+  {
     "language": "c", 
     "name": "chttp2_fake_security_cancel_after_accept_test"
   },