diff --git a/ravenwood/Android.bp b/ravenwood/Android.bp
index eebe5e9f..8ff99e4 100644
--- a/ravenwood/Android.bp
+++ b/ravenwood/Android.bp
@@ -129,9 +129,9 @@
     ],
     libs: [
         "framework-minus-apex.ravenwood",
-        "ravenwood-junit",
         "ravenwood-helper-libcore-runtime",
     ],
+    sdk_version: "core_current",
     visibility: ["//visibility:private"],
 }
 
@@ -165,6 +165,8 @@
         "services.core.ravenwood",
         "junit",
         "framework-annotations-lib",
+        "ravenwood-helper-framework-runtime",
+        "ravenwood-helper-libcore-runtime",
     ],
     sdk_version: "core_current",
     visibility: ["//frameworks/base"],