diff --git a/hostsidetests/jvmti/run-tests/test-902/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-902/AndroidTest.xml
index 0431649..ade4fac 100644
--- a/hostsidetests/jvmti/run-tests/test-902/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-902/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest902HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest902DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_902" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-903/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-903/AndroidTest.xml
index b2bd2b4..1390840 100644
--- a/hostsidetests/jvmti/run-tests/test-903/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-903/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest903HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest903DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_903" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-904/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-904/AndroidTest.xml
index 73a69e9..f16ce94 100644
--- a/hostsidetests/jvmti/run-tests/test-904/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-904/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest904HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest904DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_904" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-905/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-905/AndroidTest.xml
index 85ca1bc..c337e82 100644
--- a/hostsidetests/jvmti/run-tests/test-905/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-905/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest905HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest905DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_905" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-906/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-906/AndroidTest.xml
index 89958d6..dbd74f6 100644
--- a/hostsidetests/jvmti/run-tests/test-906/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-906/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest906HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest906DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_906" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-907/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-907/AndroidTest.xml
index 8c94600..99cd40d 100644
--- a/hostsidetests/jvmti/run-tests/test-907/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-907/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest907HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest907DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_907" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-908/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-908/AndroidTest.xml
index 8573c9f..fca6567 100644
--- a/hostsidetests/jvmti/run-tests/test-908/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-908/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest908HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest908DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_908" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-910/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-910/AndroidTest.xml
index 5f847e0..a947621 100644
--- a/hostsidetests/jvmti/run-tests/test-910/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-910/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest910HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest910DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_910" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-911/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-911/AndroidTest.xml
index 6e66255..fb06812 100644
--- a/hostsidetests/jvmti/run-tests/test-911/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-911/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest911HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest911DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_911" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-913/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-913/AndroidTest.xml
index f8d43ce..a019d07 100644
--- a/hostsidetests/jvmti/run-tests/test-913/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-913/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest913HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest913DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_913" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-914/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-914/AndroidTest.xml
index 9fcd7d1..b70869e 100644
--- a/hostsidetests/jvmti/run-tests/test-914/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-914/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest914HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest914DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_914" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-915/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-915/AndroidTest.xml
index 55b835e..35f9903 100644
--- a/hostsidetests/jvmti/run-tests/test-915/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-915/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest915HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest915DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_915" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-917/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-917/AndroidTest.xml
index 39f30fc..ad988af 100644
--- a/hostsidetests/jvmti/run-tests/test-917/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-917/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest917HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest917DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_917" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-918/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-918/AndroidTest.xml
index a78df50..4a3feb1 100644
--- a/hostsidetests/jvmti/run-tests/test-918/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-918/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest918HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest918DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_918" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-919/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-919/AndroidTest.xml
index 3a4de60..3183ad3 100644
--- a/hostsidetests/jvmti/run-tests/test-919/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-919/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest919HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest919DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_919" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-920/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-920/AndroidTest.xml
index d121be3..ba53a64 100644
--- a/hostsidetests/jvmti/run-tests/test-920/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-920/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest920HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest920DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_920" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-922/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-922/AndroidTest.xml
index 9c7c284..2b74f07 100644
--- a/hostsidetests/jvmti/run-tests/test-922/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-922/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest922HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest922DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_922" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-923/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-923/AndroidTest.xml
index 50d4836..9c8aa21 100644
--- a/hostsidetests/jvmti/run-tests/test-923/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-923/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest923HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest923DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_923" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-924/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-924/AndroidTest.xml
index a3e7e4a..5a2b567 100644
--- a/hostsidetests/jvmti/run-tests/test-924/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-924/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest924HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest924DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_924" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-926/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-926/AndroidTest.xml
index a52ad4f..eea4602 100644
--- a/hostsidetests/jvmti/run-tests/test-926/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-926/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest926HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest926DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_926" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-927/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-927/AndroidTest.xml
index 2d2b424..71d452d 100644
--- a/hostsidetests/jvmti/run-tests/test-927/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-927/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest927HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest927DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_927" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-928/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-928/AndroidTest.xml
index b887e19..b7c59de 100644
--- a/hostsidetests/jvmti/run-tests/test-928/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-928/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest928HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest928DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_928" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-930/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-930/AndroidTest.xml
index 82c0535..3b241b2 100644
--- a/hostsidetests/jvmti/run-tests/test-930/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-930/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest930HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest930DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_930" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-931/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-931/AndroidTest.xml
index 9b92a22..4944067 100644
--- a/hostsidetests/jvmti/run-tests/test-931/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-931/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest931HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest931DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_931" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-932/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-932/AndroidTest.xml
index e2aa6a1..b6b1574 100644
--- a/hostsidetests/jvmti/run-tests/test-932/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-932/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest932HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest932DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_932" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-940/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-940/AndroidTest.xml
index d190847..56ebc24 100644
--- a/hostsidetests/jvmti/run-tests/test-940/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-940/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest940HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest940DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_940" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-942/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-942/AndroidTest.xml
index 61949d0..ffe2bf4 100644
--- a/hostsidetests/jvmti/run-tests/test-942/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-942/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest942HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest942DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_942" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-944/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-944/AndroidTest.xml
index 8b2a125..c772bfb 100644
--- a/hostsidetests/jvmti/run-tests/test-944/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-944/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest944HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest944DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_944" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-945/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-945/AndroidTest.xml
index 65bb8f4..431c5e6 100644
--- a/hostsidetests/jvmti/run-tests/test-945/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-945/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest945HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest945DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_945" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-947/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-947/AndroidTest.xml
index 4cefa50..4ab0c9a 100644
--- a/hostsidetests/jvmti/run-tests/test-947/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-947/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest947HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest947DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_947" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-951/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-951/AndroidTest.xml
index 7d75a44..b489635 100644
--- a/hostsidetests/jvmti/run-tests/test-951/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-951/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest951HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest951DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_951" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-981/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-981/AndroidTest.xml
index 9f273e8..3e2bb67 100644
--- a/hostsidetests/jvmti/run-tests/test-981/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-981/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest981HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest981DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_981" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-982/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-982/AndroidTest.xml
index abece67..7c4833f 100644
--- a/hostsidetests/jvmti/run-tests/test-982/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-982/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest982HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest982DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_982" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-984/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-984/AndroidTest.xml
index 1e98ff2..7ba284c 100644
--- a/hostsidetests/jvmti/run-tests/test-984/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-984/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest984HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest984DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_984" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-985/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-985/AndroidTest.xml
index bfd5c97..ba21091 100644
--- a/hostsidetests/jvmti/run-tests/test-985/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-985/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest985HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest985DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_985" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/run-tests/test-986/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-986/AndroidTest.xml
index 7c5475d..4bc581f 100644
--- a/hostsidetests/jvmti/run-tests/test-986/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-986/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest986HostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRunTest986DeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.run_test_986" />
     </test>
 </configuration>