diff --git a/tests/Enable16KbTests/Android.bp b/tests/Enable16KbTests/Android.bp
index ecb0357ea9e..781ea8f7667 100644
--- a/tests/Enable16KbTests/Android.bp
+++ b/tests/Enable16KbTests/Android.bp
@@ -33,7 +33,7 @@ android_test {
     ],
     platform_apis: true,
     certificate: "platform",
-    test_suites: ["general-tests"],
+    test_suites: ["device-tests"],
     libs: [
         "android.test.runner",
         "android.test.base",
@@ -57,6 +57,6 @@ java_test_host {
     data: [
         ":test_16kb_app",
     ],
-    test_suites: ["general-tests"],
+    test_suites: ["device-tests"],
     test_config: "AndroidTest.xml",
 }