diff --git a/tests/Enable16KbTests/Android.bp b/tests/Enable16KbTests/Android.bp
index 57c6ef6..ecb0357 100644
--- a/tests/Enable16KbTests/Android.bp
+++ b/tests/Enable16KbTests/Android.bp
@@ -17,7 +17,7 @@
     default_team: "trendy_team_android_kernel",
 }
 
-android_test_helper_app {
+android_test {
     name: "test_16kb_app",
     srcs: ["test_16kb_app/src/**/*.java"],
     manifest: "test_16kb_app/test_16kb_app.xml",
diff --git a/tests/Enable16KbTests/TEST_MAPPING b/tests/Enable16KbTests/TEST_MAPPING
new file mode 100644
index 0000000..fbe6fe1
--- /dev/null
+++ b/tests/Enable16KbTests/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+  "postsubmit": [
+    {
+      "name": "Enable16KbTest"
+    }
+  ]
+}
+
diff --git a/tests/Enable16KbTests/test_16kb_app/test_16kb_app.xml b/tests/Enable16KbTests/test_16kb_app/test_16kb_app.xml
index 8fe9ad5..3ca786a 100644
--- a/tests/Enable16KbTests/test_16kb_app/test_16kb_app.xml
+++ b/tests/Enable16KbTests/test_16kb_app/test_16kb_app.xml
@@ -16,8 +16,8 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.settings.development.test"
-          android:sharedUserId="android.uid.systemui">
+          android:installLocation="internalOnly"
+          package="com.android.settings.development.test">
     <application>
         <uses-library android:name="android.test.runner"/>
     </application>