diff --git a/tests/jank/AndroidTest.xml b/tests/jank/AndroidTest.xml
index 1a08f4f..c7e476a 100644
--- a/tests/jank/AndroidTest.xml
+++ b/tests/jank/AndroidTest.xml
@@ -13,12 +13,13 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="Config for CTS Jank Test Cases">
-    <include name="common-config" />
-    <option name="apk-installer:test-file-name" value="CtsUiDeviceTestCases.apk" />
-    <option name="apk-installer:test-file-name" value="CtsJankDeviceTestCases.apk" />
-    <test class="com.android.tradefed.testtype.InstrumentationTest" >
+<configuration description="Config for CTS Jank test cases">
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsUiDeviceTestCases.apk" />
+        <option name="test-file-name" value="CtsJankDeviceTestCases.apk" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.jank.cts" />
-        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
     </test>
-</configuration>
+</configuration>
\ No newline at end of file