diff --git a/testrunner/test_defs.xml b/testrunner/test_defs.xml
index b8364e46d..a0420d400 100644
--- a/testrunner/test_defs.xml
+++ b/testrunner/test_defs.xml
@@ -232,7 +232,7 @@ See test_defs.xsd for more information.
 <test name="cts-permission"
     build_path="cts/tests/tests/permission"
     package="com.android.cts.permission"
-    runner="android.test.InstrumentationTestRunner"
+    runner="android.support.test.runner.AndroidJUnitRunner"
     coverage_target="framework"
     continuous="true"
     suite="cts" />
@@ -240,7 +240,7 @@ See test_defs.xsd for more information.
 <test name="cts-permission2"
     build_path="cts/tests/tests/permission2"
     package="com.android.cts.permission2"
-    runner="android.test.InstrumentationTestRunner"
+    runner="android.support.test.runner.AndroidJUnitRunner"
     coverage_target="framework"
     continuous="true"
     suite="true" />
@@ -254,20 +254,20 @@ See test_defs.xsd for more information.
 <test name="cts-security"
     build_path="cts/tests/tests/security"
     package="com.android.cts.security"
-    runner="android.test.InstrumentationCtsTestRunner"
+    runner="android.support.test.runner.AndroidJUnitRunner"
     suite="cts" />
 
 <test name="cts-accounts"
     build_path="cts/tests/tests/accounts"
     package="android.accounts.cts"
-    runner="android.test.InstrumentationTestRunner"
+    runner="android.support.test.runner.AndroidJUnitRunner"
     coverage_target="framework"
     suite="cts" />
 
 <test name="cts-api-signature"
     build_path="cts/tests/SignatureTest"
     package="android.tests.sigtest"
-    runner=".InstrumentationRunner"
+    runner="android.support.test.runner.AndroidJUnitRunner"
     suite="cts" />
 
 <test name="cts-api-signature-func"
@@ -278,49 +278,49 @@ See test_defs.xsd for more information.
 <test name="cts-app"
     build_path="cts/tests/tests/app"
     package="com.android.cts.app"
-    runner="android.test.InstrumentationCtsTestRunner"
+    runner="android.support.test.runner.AndroidJUnitRunner"
     coverage_target="framework"
     suite="cts" />
 
 <test name="cts-content"
     build_path="cts/tests/tests/content"
     package="com.android.cts.content"
-    runner="android.test.InstrumentationTestRunner"
+    runner="android.support.test.runner.AndroidJUnitRunner"
     coverage_target="framework"
     suite="cts" />
 
 <test name="cts-database"
     build_path="cts/tests/tests/database"
     package="com.android.cts.database"
-    runner="android.test.InstrumentationCtsTestRunner"
+    runner="android.support.test.runner.AndroidJUnitRunner"
     coverage_target="framework"
     suite="cts" />
 
 <test name="cts-dreams"
     build_path="cts/tests/tests/dreams"
     package="com.android.cts.dreams"
-    runner="android.test.InstrumentationCtsTestRunner"
+    runner="android.support.test.runner.AndroidJUnitRunner"
     coverage_target="framework"
     suite="cts" />
 
 <test name="cts-gesture"
     build_path="cts/tests/tests/gesture"
     package="com.android.cts.gesture"
-    runner="android.test.InstrumentationTestRunner"
+    runner="android.support.test.runner.AndroidJUnitRunner"
     coverage_target="framework"
     suite="cts" />
 
 <test name="cts-graphics"
     build_path="cts/tests/tests/graphics"
     package="com.android.cts.graphics"
-    runner="android.test.InstrumentationCtsTestRunner"
+    runner="android.support.test.runner.AndroidJUnitRunner"
     coverage_target="framework"
     suite="cts" />
 
 <test name="cts-hardware"
     build_path="cts/tests/tests/hardware"
     package="com.android.cts.hardware"
-    runner="android.test.InstrumentationCtsTestRunner"
+    runner="android.support.test.runner.AndroidJUnitRunner"
     coverage_target="framework"
     continuous="true"
     suite="cts" />
@@ -328,77 +328,77 @@ See test_defs.xsd for more information.
 <test name="cts-location"
     build_path="cts/tests/tests/location"
     package="com.android.cts.location"
-    runner="android.test.InstrumentationCtsTestRunner"
+    runner="android.support.test.runner.AndroidJUnitRunner"
     coverage_target="framework"
     suite="cts" />
 
 <test name="cts-media"
     build_path="cts/tests/tests/media"
     package="com.android.cts.media"
-    runner="android.test.InstrumentationCtsTestRunner"
+    runner="android.support.test.runner.AndroidJUnitRunner"
     coverage_target="framework"
     suite="cts" />
 
 <test name="cts-net"
     build_path="cts/tests/tests/net"
     package="com.android.cts.net"
-    runner="android.test.InstrumentationCtsTestRunner"
+    runner="android.support.test.runner.AndroidJUnitRunner"
     coverage_target="framework"
     suite="cts" />
 
 <test name="cts-os"
     build_path="cts/tests/tests/os"
     package="com.android.cts.os"
-    runner="android.test.InstrumentationCtsTestRunner"
+    runner="android.support.test.runner.AndroidJUnitRunner"
     coverage_target="framework"
     suite="cts" />
 
 <test name="cts-provider"
     build_path="cts/tests/tests/provider"
     package="com.android.cts.provider"
-    runner="android.test.InstrumentationCtsTestRunner"
+    runner="android.support.test.runner.AndroidJUnitRunner"
     coverage_target="framework"
     suite="cts" />
 
 <test name="cts-text"
     build_path="cts/tests/tests/text"
     package="com.android.cts.text"
-    runner="android.test.InstrumentationCtsTestRunner"
+    runner="android.support.test.runner.AndroidJUnitRunner"
     coverage_target="framework"
     suite="cts" />
 
 <test name="cts-telephony"
     build_path="cts/tests/tests/telephony"
     package="com.android.cts.telephony"
-    runner="android.test.InstrumentationCtsTestRunner"
+    runner="android.support.test.runner.AndroidJUnitRunner"
     coverage_target="framework"
     suite="cts" />
 
 <test name="cts-util"
     build_path="cts/tests/tests/util"
     package="com.android.cts.util"
-    runner="android.test.InstrumentationCtsTestRunner"
+    runner="android.support.test.runner.AndroidJUnitRunner"
     coverage_target="framework"
     suite="cts" />
 
 <test name="cts-view"
     build_path="cts/tests/tests/view"
     package="com.android.cts.view"
-    runner="android.test.InstrumentationCtsTestRunner"
+    runner="android.support.test.runner.AndroidJUnitRunner"
     coverage_target="framework"
     suite="cts" />
 
 <test name="cts-webkit"
     build_path="cts/tests/tests/webkit"
     package="com.android.cts.webkit"
-    runner="android.test.InstrumentationCtsTestRunner"
+    runner="android.support.test.runner.AndroidJUnitRunner"
     coverage_target="framework"
     suite="cts" />
 
 <test name="cts-widget"
     build_path="cts/tests/tests/widget"
     package="com.android.cts.widget"
-    runner="android.test.InstrumentationCtsTestRunner"
+    runner="android.support.test.runner.AndroidJUnitRunner"
     coverage_target="framework"
     suite="cts" />