diff --git a/nearby/tests/cts/fastpair/Android.bp b/nearby/tests/cts/fastpair/Android.bp
index e28df1b..60626f1 100644
--- a/nearby/tests/cts/fastpair/Android.bp
+++ b/nearby/tests/cts/fastpair/Android.bp
@@ -25,11 +25,11 @@
         "androidx.test.rules",
         "compatibility-device-util-axt",
         "ctstestrunner-axt",
-        "framework-nearby-pre-jarjar",
         "truth-prebuilt",
     ],
     libs: [
         "android.test.base",
+        "framework-connectivity-tiramisu.impl",
     ],
     srcs: ["src/**/*.java"],
     test_suites: [
diff --git a/nearby/tests/unit/Android.bp b/nearby/tests/unit/Android.bp
index 64ef292..53d9fb6 100644
--- a/nearby/tests/unit/Android.bp
+++ b/nearby/tests/unit/Android.bp
@@ -37,7 +37,7 @@
         "androidx.test.ext.junit",
         "androidx.test.rules",
         "compatibility-device-util-axt",
-        "framework-nearby-pre-jarjar",
+        "framework-nearby-static",
         "guava",
         "junit",
         "libprotobuf-java-lite",