diff --git a/Tethering/tests/mts/Android.bp b/Tethering/tests/mts/Android.bp
index edb6356..8c7e101 100644
--- a/Tethering/tests/mts/Android.bp
+++ b/Tethering/tests/mts/Android.bp
@@ -47,7 +47,7 @@
         "libstaticjvmtiagent",
     ],
 
-    platform_apis: true,
+    defaults: ["framework-connectivity-test-defaults"],
 
     // Tag this module as a mts test artifact
     test_suites: [
diff --git a/Tethering/tests/unit/Android.bp b/Tethering/tests/unit/Android.bp
index 41135f2..011b878 100644
--- a/Tethering/tests/unit/Android.bp
+++ b/Tethering/tests/unit/Android.bp
@@ -33,7 +33,7 @@
     sdk_version: "core_platform",
     libs: [
         "framework-minus-apex",
-        "framework-connectivity.stubs.module_lib",
+        "framework-connectivity.impl",
         "framework-tethering.impl",
     ],
     visibility: [