diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go
index 842f392..0f4bd9b 100644
--- a/java/dexpreopt_config.go
+++ b/java/dexpreopt_config.go
@@ -58,8 +58,7 @@
 	return ctx.Config().Once(bootImageConfigRawKey, func() interface{} {
 		global := dexpreopt.GetGlobalConfig(ctx)
 
-		artBootImageName := "art" // Keep this local to avoid accidental references.
-		artModules := global.ArtApexJars
+		artBootImageName := "art"           // Keep this local to avoid accidental references.
 		frameworkModules := global.BootJars // This includes `global.ArtApexJars`.
 		mainlineBcpModules := global.ApexBootJars
 		frameworkSubdir := "system/framework"
@@ -72,7 +71,7 @@
 			enabledIfExists:      "art-bootclasspath-fragment",
 			stem:                 bootImageStem,
 			installDir:           "apex/art_boot_images/javalib",
-			modules:              artModules,
+			modules:              global.TestOnlyArtBootImageJars,
 			preloadedClassesFile: "art/build/boot/preloaded-classes",
 			compilerFilter:       "speed-profile",
 			singleImage:          false,