diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index e187e66..1f312a6 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -334,16 +334,14 @@
     hostdex: true,
     srcs: ["support/src/test/java/**/*.java"],
 
-    no_standard_libs: true,
+    sdk_version: "core_platform_current",
     libs: [
-        "core-all",
         "junit",
-        "bouncycastle",
     ],
-    system_modules: "core-all-system-modules",
     static_libs: [
-        "bouncycastle-bcpkix",
-        "bouncycastle-ocsp",
+        "bouncycastle-unbundled",
+        "bouncycastle-bcpkix-unbundled",
+        "bouncycastle-ocsp-unbundled",
     ],
 }