diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index ad94b45..1bf41e7 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -196,10 +196,9 @@
 // because binaries have different multilib classes and 'multilib: {}' isn't
 // supported by target: { ... }.
 // See b/120617876 for more information.
-art_apex {
+art_apex_test {
     name: "com.android.runtime.host",
     compile_multilib: "both",
-    installable: false,
     payload_type: "zip",
     host_supported: true,
     device_supported: false,
diff --git a/build/art.go b/build/art.go
index 5236e31..4b63829 100644
--- a/build/art.go
+++ b/build/art.go
@@ -298,11 +298,11 @@
 	// changes this to 'prefer32' on all host binaries. Since HOST_PREFER_32_BIT is
 	// only used for testing we can just disable the module.
 	// See b/120617876 for more information.
-	android.RegisterModuleType("art_apex", artApexBundleFactory)
+	android.RegisterModuleType("art_apex_test", artTestApexBundleFactory)
 }
 
-func artApexBundleFactory() android.Module {
-	module := apex.ApexBundleFactory()
+func artTestApexBundleFactory() android.Module {
+	module := apex.ApexBundleFactory( /*testApex*/ true)
 	android.AddLoadHook(module, func(ctx android.LoadHookContext) {
 		if envTrue(ctx, "HOST_PREFER_32_BIT") {
 			type props struct {
@@ -356,7 +356,7 @@
 func libartStaticDefaultsFactory() android.Module {
 	c := &codegenProperties{}
 	module := cc.DefaultsFactory(c)
-	android.AddLoadHook(module, func(ctx android.LoadHookContext) {	codegen(ctx, c, true) })
+	android.AddLoadHook(module, func(ctx android.LoadHookContext) { codegen(ctx, c, true) })
 
 	return module
 }