diff --git a/libcore/JavaLibrary.mk b/libcore/JavaLibrary.mk
index 70037e8..210928b 100644
--- a/libcore/JavaLibrary.mk
+++ b/libcore/JavaLibrary.mk
@@ -142,6 +142,16 @@
 include $(BUILD_JAVA_LIBRARY)
 
 include $(CLEAR_VARS)
+LOCAL_SRC_FILES := $(call all-test-java-files-under,json)
+LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
+LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_JAVA_LIBRARIES := core core-tests-support
+LOCAL_DX_FLAGS := --core-library
+LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE := core-tests-json
+include $(BUILD_JAVA_LIBRARY)
+
+include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-test-java-files-under,logging)
 LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
 LOCAL_NO_STANDARD_LIBRARIES := true
@@ -169,14 +179,29 @@
 # together, so it has compile-time dependencies on all the other test
 # libraries.
 # TODO: we should have a bogus module that just contains tests.AllTests for speed.
-LOCAL_JAVA_LIBRARIES := core core-tests-support
-LOCAL_JAVA_LIBRARIES += core-tests-annotation core-tests-archive
-LOCAL_JAVA_LIBRARIES += core-tests-concurrent core-tests-crypto
-LOCAL_JAVA_LIBRARIES += core-tests-dom core-tests-icu core-tests-logging
-LOCAL_JAVA_LIBRARIES += core-tests-luni-kernel core-tests-math core-tests-nio
-LOCAL_JAVA_LIBRARIES += core-tests-nio_char core-tests-prefs core-tests-regex
-LOCAL_JAVA_LIBRARIES += core-tests-security core-tests-sql core-tests-suncompat
-LOCAL_JAVA_LIBRARIES += core-tests-text core-tests-x-net core-tests-xml
+LOCAL_JAVA_LIBRARIES := \
+        core \
+        core-tests-support \
+        core-tests-annotation \
+        core-tests-archive \
+        core-tests-concurrent \
+        core-tests-crypto \
+        core-tests-dom \
+        core-tests-icu \
+        core-tests-json \
+        core-tests-logging \
+        core-tests-luni-kernel \
+        core-tests-math \
+        core-tests-nio \
+        core-tests-nio_char \
+        core-tests-prefs \
+        core-tests-regex \
+        core-tests-security \
+        core-tests-sql \
+        core-tests-suncompat \
+        core-tests-text \
+        core-tests-x-net \
+        core-tests-xml
 LOCAL_DX_FLAGS := --core-library
 LOCAL_MODULE_TAGS := tests
 LOCAL_MODULE := core-tests-luni
diff --git a/libcore/json/src/test/java/org/json/AllTests.java b/libcore/json/src/test/java/org/json/AllTests.java
index 8261a4d..7779c91 100644
--- a/libcore/json/src/test/java/org/json/AllTests.java
+++ b/libcore/json/src/test/java/org/json/AllTests.java
@@ -21,7 +21,7 @@
 
 public class AllTests {
     public static Test suite() {
-        TestSuite suite = tests.TestSuiteFactory.createTestSuite();
+        TestSuite suite = new TestSuite();
         suite.addTestSuite(JSONArrayTest.class);
         suite.addTestSuite(JSONStringerTest.class);
         suite.addTestSuite(JSONStringerTest.class);