diff --git a/runner/rules/javatests/androidx/test/rule/BUILD b/runner/rules/javatests/androidx/test/rule/BUILD
index b69b9be7d..d985e20d0 100644
--- a/runner/rules/javatests/androidx/test/rule/BUILD
+++ b/runner/rules/javatests/androidx/test/rule/BUILD
@@ -57,7 +57,7 @@ axt_android_library_test(
     name = "GrantPermissionRuleTest",
     srcs = ["GrantPermissionRuleTest.java"],
     # runtime permissions only a thing from api 23+
-    device_list = devices(apis(min_api = 23)),
+    device_list = devices(apis(min_api = 24)),
     deps = [
         "//core",
         "//ext/junit",
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest.xml b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest.xml
index 943286b49..3b9d8d388 100644
--- a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest.xml
+++ b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest.xml
@@ -23,7 +23,8 @@
 
   <instrumentation
     android:name="androidx.test.runner.AndroidJUnitRunner"
-    android:targetPackage="androidx.test.multiprocess.app">
+    android:targetPackage="androidx.test.multiprocess.app"
+    android:targetProcesses="*">
     <meta-data
       android:name="remoteMethod"
       android:value="androidx.test.espresso.remote.EspressoRemote#remoteInit"/>
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_global.xml b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_global.xml
index 7b5d08c3f..f0999d273 100644
--- a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_global.xml
+++ b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_global.xml
@@ -24,16 +24,12 @@
 
   <instrumentation
     android:name="androidx.test.runner.AndroidJUnitRunner"
-    android:targetPackage="androidx.test.multiprocess.app">
+    android:targetPackage="androidx.test.multiprocess.app"
+    android:targetProcesses="*">
 
-    <!-- explicitly instrument global process: -->
     <meta-data
-      android:name="targetProcess"
-      android:value="foo.bar.global"/>
-
-    <!-- TODO: change to the syntax after next emulator image update -->
-    <!--android:targetProcess="foo.bar"-->
-
+      android:name="remoteMethod"
+      android:value="androidx.test.espresso.remote.EspressoRemote#remoteInit"/>
   </instrumentation>
 
 </manifest>
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_idling.xml b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_idling.xml
index e2b484ee2..ad67e5849 100644
--- a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_idling.xml
+++ b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_idling.xml
@@ -24,16 +24,12 @@
 
   <instrumentation
     android:name="androidx.test.runner.AndroidJUnitRunner"
-    android:targetPackage="androidx.test.multiprocess.app">
+    android:targetPackage="androidx.test.multiprocess.app"
+    android:targetProcesses="*">
 
-    <!-- explicitly instrument idling process: -->
     <meta-data
-      android:name="targetProcess"
-      android:value="androidx.test.multiprocess.app:idling"/>
-
-    <!-- TODO: change to the syntax after next emulator image update -->
-    <!--android:targetProcess=":idling"-->
-
+      android:name="remoteMethod"
+      android:value="androidx.test.espresso.remote.EspressoRemote#remoteInit"/>
   </instrumentation>
 
 </manifest>
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_private.xml b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_private.xml
index ba17e3dd3..f0999d273 100644
--- a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_private.xml
+++ b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_private.xml
@@ -24,15 +24,12 @@
 
   <instrumentation
     android:name="androidx.test.runner.AndroidJUnitRunner"
-    android:targetPackage="androidx.test.multiprocess.app">
+    android:targetPackage="androidx.test.multiprocess.app"
+    android:targetProcesses="*">
 
-    <!-- explicitly instrument private process: -->
     <meta-data
-      android:name="targetProcess"
-      android:value="androidx.test.multiprocess.app:PID2"/>
-
-    <!-- TODO: change to the syntax after next emulator image update -->
-    <!--android:targetProcess=":PID2"-->
+      android:name="remoteMethod"
+      android:value="androidx.test.espresso.remote.EspressoRemote#remoteInit"/>
   </instrumentation>
 
 </manifest>
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/BUILD b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/BUILD
index cd0a71807..ea1115d0b 100644
--- a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/BUILD
+++ b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/BUILD
@@ -17,7 +17,7 @@ licenses(["notice"])
 # Tests
 # =========================================================
 
-DEVICES = devices([23])
+DEVICES = devices([28])
 
 axt_android_application_test(
     name = "DefaultProcessActivityTest",
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/GlobalProcessActivityTest.java b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/GlobalProcessActivityTest.java
index 7d1d30ec4..801bf6e8a 100644
--- a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/GlobalProcessActivityTest.java
+++ b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/GlobalProcessActivityTest.java
@@ -19,6 +19,9 @@
 package androidx.test.multiprocess.app;
 
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static org.junit.Assert.assertNotNull;
 
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
@@ -31,11 +34,11 @@
 public class GlobalProcessActivityTest {
 
   @Rule
-  public ActivityScenarioRule<GlobalProcessActivity> rule =
-      new ActivityScenarioRule<>(GlobalProcessActivity.class);
+  public ActivityScenarioRule<MainActivity> rule = new ActivityScenarioRule<>(MainActivity.class);
 
   @Test
   public void sanityTest() {
+    onView(withText("GlobalProcessActivity")).perform(click());
     assertNotNull(getApplicationContext());
   }
 }
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/IdlingActivityTest.java b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/IdlingActivityTest.java
index 73e0cab7d..00d42e4f7 100644
--- a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/IdlingActivityTest.java
+++ b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/IdlingActivityTest.java
@@ -40,11 +40,12 @@ public class IdlingActivityTest {
   private static final String IDLING_PROC_NAME = "androidx.test.multiprocess.app:idling";
 
   @Rule
-  public ActivityScenarioRule<IdlingActivity> activityRule =
-      new ActivityScenarioRule<>(IdlingActivity.class);
+  public ActivityScenarioRule<MainActivity> activityRule =
+      new ActivityScenarioRule<>(MainActivity.class);
 
   @Test
   public void verifyChangingTextAsynchronously() {
+    onView(withText("IdlingActivity")).perform(click());
     // Type text and then press the button.
     onView(withId(R.id.editTextUserInput))
         .perform(typeText(STRING_TO_BE_TYPED), closeSoftKeyboard());
@@ -61,6 +62,7 @@ public void verifyChangingTextAsynchronously() {
 
   @Test
   public void verifyRunningInIdlingProcess() {
+    onView(withText("IdlingActivity")).perform(click());
     onView(withId(R.id.textIdlingProcessName)).check(matches(withText(IDLING_PROC_NAME)));
   }
 }
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/PrivateProcessActivityTest.java b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/PrivateProcessActivityTest.java
index a91177ea2..946ebb5d3 100644
--- a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/PrivateProcessActivityTest.java
+++ b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/PrivateProcessActivityTest.java
@@ -17,6 +17,7 @@
 package androidx.test.multiprocess.app;
 
 import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.assertion.ViewAssertions.matches;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
@@ -33,11 +34,11 @@ public class PrivateProcessActivityTest {
   private static final String PRIVATE_PROC_NAME = "androidx.test.multiprocess.app:PID2";
 
   @Rule
-  public ActivityScenarioRule<PrivateProcessActivity> rule =
-      new ActivityScenarioRule<>(PrivateProcessActivity.class);
+  public ActivityScenarioRule<MainActivity> rule = new ActivityScenarioRule<>(MainActivity.class);
 
   @Test
   public void verifyRunningInPrivateProcess() {
+    onView(withText("PrivateProcessActivity")).perform(click());
     onView(withId(R.id.textPrivateProcessName)).check(matches(withText(PRIVATE_PROC_NAME)));
   }
 }