diff --git a/Android.bp b/Android.bp
index 38ed917..470736d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -139,6 +139,7 @@
     visibility: [
         "//packages/modules/NetworkStack/tests/unit",
         "//packages/modules/NetworkStack/tests/integration",
+        "//frameworks/base/packages/Tethering/tests/integration",
     ]
 }
 
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index 565a5cb..98351cd 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -59,7 +59,10 @@
     min_sdk_version: "29",
     defaults: ["NetworkStackTestsDefaults"],
     static_libs: ["NetworkStackApiStableLib"],
-    visibility: ["//packages/modules/NetworkStack/tests/integration"]
+    visibility: [
+        "//packages/modules/NetworkStack/tests/integration",
+        "//frameworks/base/packages/Tethering/tests/integration",
+    ]
 }
 
 android_test {
@@ -77,7 +80,6 @@
 java_defaults {
     name: "libnetworkstackutilsjni_deps",
     jni_libs: [
-        "libartbase",
         "libbacktrace",
         "libbase",
         "libbinder",