diff --git a/Android.bp b/Android.bp
index 87b7dc10d31aa..191b8bc862af7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -581,6 +581,7 @@ java_library {
         "//frameworks/base/apex/blobstore/framework",
         "//frameworks/base/apex/jobscheduler/framework",
         "//frameworks/base/packages/Tethering/tests/unit",
+        "//packages/modules/Connectivity/Tethering/tests/unit",
     ],
 }
 
diff --git a/core/java/android/net/TEST_MAPPING b/core/java/android/net/TEST_MAPPING
index abac81117deb0..8c13ef98bedb0 100644
--- a/core/java/android/net/TEST_MAPPING
+++ b/core/java/android/net/TEST_MAPPING
@@ -17,4 +17,4 @@
       "path": "frameworks/opt/net/wifi"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/packages/Tethering/common/TetheringLib/Android.bp b/packages/Tethering/common/TetheringLib/Android.bp
index bf643cdcecc5c..ddb6880753b4d 100644
--- a/packages/Tethering/common/TetheringLib/Android.bp
+++ b/packages/Tethering/common/TetheringLib/Android.bp
@@ -16,7 +16,10 @@
 java_sdk_library {
     name: "framework-tethering",
     defaults: ["framework-module-defaults"],
-    impl_library_visibility: ["//frameworks/base/packages/Tethering:__subpackages__"],
+    impl_library_visibility: [
+        "//frameworks/base/packages/Tethering:__subpackages__",
+        "//packages/modules/Connectivity/Tethering:__subpackages__",
+    ],
 
     srcs: [":framework-tethering-srcs"],
 
diff --git a/packages/Tethering/tests/Android.bp b/packages/Tethering/tests/Android.bp
index cb0a20bdf0e82..731144cee0fb0 100644
--- a/packages/Tethering/tests/Android.bp
+++ b/packages/Tethering/tests/Android.bp
@@ -19,5 +19,6 @@ filegroup {
     srcs: ["jarjar-rules.txt"],
     visibility: [
         "//frameworks/base/packages/Tethering/tests:__subpackages__",
+        "//packages/modules/Connectivity/Tethering/tests:__subpackages__",
     ]
 }
diff --git a/packages/Tethering/tests/unit/Android.bp b/packages/Tethering/tests/unit/Android.bp
index 3589725dcf506..956e2e832589f 100644
--- a/packages/Tethering/tests/unit/Android.bp
+++ b/packages/Tethering/tests/unit/Android.bp
@@ -77,6 +77,7 @@ android_library {
     defaults: ["TetheringTestsDefaults"],
     visibility: [
         "//frameworks/base/packages/Tethering/tests/integration",
+        "//packages/modules/Connectivity/Tethering/tests/integration",
     ]
 }
 
diff --git a/services/net/Android.bp b/services/net/Android.bp
index afea1a073caba..72ad36677c238 100644
--- a/services/net/Android.bp
+++ b/services/net/Android.bp
@@ -66,5 +66,8 @@ filegroup {
         ":framework-annotations",
         "java/android/net/util/NetworkConstants.java",
     ],
-    visibility: ["//frameworks/base/packages/Tethering"],
+    visibility: [
+        "//frameworks/base/packages/Tethering",
+        "//packages/modules/Connectivity/Tethering"
+    ],
 }