diff --git a/core/tests/ConnectivityManagerTest/Android.bp b/core/tests/ConnectivityManagerTest/Android.bp
index a33d219f53d27..6b828ccda1983 100644
--- a/core/tests/ConnectivityManagerTest/Android.bp
+++ b/core/tests/ConnectivityManagerTest/Android.bp
@@ -21,6 +21,6 @@ android_test {
     static_libs: ["junit"],
     // Include all test java files.
     srcs: ["src/**/*.java"],
-    platform_apis: true,
+    defaults: ["framework-wifi-test-defaults"],
     certificate: "platform",
 }
diff --git a/wifi/Android.bp b/wifi/Android.bp
index d7a85c5f75cc6..80703b8bf8410 100644
--- a/wifi/Android.bp
+++ b/wifi/Android.bp
@@ -47,6 +47,8 @@ filegroup {
 test_access_hidden_api_whitelist = [
     "//frameworks/base/wifi/tests",
     "//frameworks/opt/net/wifi/tests/wifitests:__subpackages__",
+
+    "//frameworks/base/core/tests/ConnectivityManagerTest",
 ]
 
 java_library {