diff --git a/Makefile b/Makefile
index e45ca3fb449..fe6368d5704 100644
--- a/Makefile
+++ b/Makefile
@@ -1018,6 +1018,8 @@ test_c: buildtests_c
 	$(Q) $(BINDIR)/$(CONFIG)/httpcli_test || ( echo test httpcli_test failed ; exit 1 )
 	$(E) "[RUN]     Testing interop_test"
 	$(Q) $(BINDIR)/$(CONFIG)/interop_test || ( echo test interop_test failed ; exit 1 )
+	$(E) "[RUN]     Testing json_rewrite_test"
+	$(Q) $(BINDIR)/$(CONFIG)/json_rewrite_test || ( echo test json_rewrite_test failed ; exit 1 )
 	$(E) "[RUN]     Testing json_test"
 	$(Q) $(BINDIR)/$(CONFIG)/json_test || ( echo test json_test failed ; exit 1 )
 	$(E) "[RUN]     Testing lame_client_test"
diff --git a/build.json b/build.json
index 6e52d0b6d87..fca657866a8 100644
--- a/build.json
+++ b/build.json
@@ -1282,7 +1282,6 @@
     {
       "name": "json_rewrite_test",
       "build": "test",
-      "run": false,
       "language": "c",
       "src": [
         "test/core/json/json_rewrite_test.c"
diff --git a/templates/tools/run_tests/tests.json.template b/templates/tools/run_tests/tests.json.template
index 04a5137f39d..bb544898615 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) and tgt.build == 'test'],
              sort_keys=True, indent=2)}