diff --git a/wifi/TEST_MAPPING b/wifi/TEST_MAPPING
new file mode 100644
index 0000000000000..a1787f84e57da
--- /dev/null
+++ b/wifi/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+  "mainline-presubmit": [
+    {
+        // Install com.google.android.wifi.apex and run FrameworksWifiApiTests.
+        "name": "FrameworksWifiApiTests[com.google.android.wifi.apex]"
+    }
+  ]
+}
diff --git a/wifi/tests/Android.bp b/wifi/tests/Android.bp
index 6a39959e8cfd5..cb9693d3869e0 100644
--- a/wifi/tests/Android.bp
+++ b/wifi/tests/Android.bp
@@ -44,7 +44,7 @@ android_test {
     ],
 
     test_suites: [
-        "device-tests",
+        "general-tests",
         "mts",
     ],
 }
diff --git a/wifi/tests/AndroidTest.xml b/wifi/tests/AndroidTest.xml
index 34e2e3af9cdac..5d0839b83dc67 100644
--- a/wifi/tests/AndroidTest.xml
+++ b/wifi/tests/AndroidTest.xml
@@ -20,6 +20,8 @@
 
     <option name="test-suite-tag" value="apct" />
     <option name="test-tag" value="FrameworksWifiApiTests" />
+    <option name="config-descriptor:metadata" key="mainline-param"
+        value="com.google.android.wifi.apex" />
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.net.wifi.test" />
         <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />