diff --git a/tests/java_api/ImageProcessing/Android.bp b/tests/java_api/ImageProcessing/Android.bp
index 109917a..6390af6 100644
--- a/tests/java_api/ImageProcessing/Android.bp
+++ b/tests/java_api/ImageProcessing/Android.bp
@@ -25,7 +25,10 @@
         "android.test.runner.stubs",
         "android.test.base.stubs",
     ],
-    static_libs: ["junit"],
+    static_libs: [
+        "junit",
+        "androidx.test.rules",
+    ],
     srcs: [
         "src/**/*.java",
         ":ImageProcessing-rscript{ImageProcessing.srcjar}",
diff --git a/tests/java_api/ImageProcessing/AndroidManifest.xml b/tests/java_api/ImageProcessing/AndroidManifest.xml
index 48f7196..7f10edb 100644
--- a/tests/java_api/ImageProcessing/AndroidManifest.xml
+++ b/tests/java_api/ImageProcessing/AndroidManifest.xml
@@ -7,7 +7,7 @@
     <application android:label="Image Processing"
                  android:hardwareAccelerated="true">
         <uses-library android:name="android.test.runner" />
-        <activity android:name="ImageProcessingActivity">
+        <activity android:name="ImageProcessingActivity" android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/ImageProcessingTest.java b/tests/java_api/ImageProcessing/src/com/android/rs/image/ImageProcessingTest.java
index 7c8ce63..330c07a 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/ImageProcessingTest.java
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/ImageProcessingTest.java
@@ -16,15 +16,15 @@
 
 package com.android.rs.image;
 
-import com.android.rs.image.ImageProcessingTestRunner;
 
 import android.os.Bundle;
-import com.android.rs.image.ImageProcessingActivity.TestName;
-
 import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.LargeTest;
 import android.util.Log;
 
+import androidx.test.filters.LargeTest;
+
+import com.android.rs.image.ImageProcessingActivity.TestName;
+
 /**
  * ImageProcessing benchmark test.
  * To run the test, please use command
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/ImageProcessingTest.java b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/ImageProcessingTest.java
index 2577d05..fb337e0 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/ImageProcessingTest.java
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/ImageProcessingTest.java
@@ -21,9 +21,10 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
 import android.util.Log;
 
+import androidx.test.filters.MediumTest;
+
 import com.android.rs.imagejb.IPTestListJB.TestName;
 
 import java.io.BufferedWriter;
diff --git a/tests/java_api/RsBLAS_Benchmark/src/com/example/android/rs/blasbenchmark/BlasTest.java b/tests/java_api/RsBLAS_Benchmark/src/com/example/android/rs/blasbenchmark/BlasTest.java
index e12aca4..e4deb89 100644
--- a/tests/java_api/RsBLAS_Benchmark/src/com/example/android/rs/blasbenchmark/BlasTest.java
+++ b/tests/java_api/RsBLAS_Benchmark/src/com/example/android/rs/blasbenchmark/BlasTest.java
@@ -20,9 +20,10 @@
 import android.app.Activity;
 import android.os.Bundle;
 import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
 import android.util.Log;
 
+import androidx.test.filters.MediumTest;
+
 import com.example.android.rs.blasbenchmark.BlasTestList.TestName;
 
 /**