diff --git a/build/Android.oat.mk b/build/Android.oat.mk
index b1acfb3..5468e73 100644
--- a/build/Android.oat.mk
+++ b/build/Android.oat.mk
@@ -36,8 +36,8 @@
 
 ########################################################################
 # A smaller libcore only oat file
-HOST_CORE_JARS := core-hostdex
-TARGET_CORE_JARS := core
+TARGET_CORE_JARS := core core-junit bouncycastle
+HOST_CORE_JARS := $(addsuffix -hostdex,$(TARGET_CORE_JARS))
 
 HOST_CORE_DEX_LOCATIONS   := $(foreach jar,$(HOST_CORE_JARS),  $(HOST_OUT_JAVA_LIBRARIES)/$(jar).jar)
 TARGET_CORE_DEX_LOCATIONS := $(foreach jar,$(TARGET_CORE_JARS),/$(DEXPREOPT_BOOT_JAR_DIR)/$(jar).jar)