diff --git a/bp2build/Android.bp b/bp2build/Android.bp
index 64ee01f..c998074 100644
--- a/bp2build/Android.bp
+++ b/bp2build/Android.bp
@@ -6,7 +6,6 @@
     name: "soong-bp2build",
     pkgPath: "android/soong/bp2build",
     srcs: [
-        "aconfig_conversion_test.go",
         "androidbp_to_build_templates.go",
         "bp2build.go",
         "bp2build_product_config.go",
@@ -43,6 +42,7 @@
     testSrcs: [
         "go_conversion_test.go",
         "aar_conversion_test.go",
+        "aconfig_conversion_test.go",
         "aidl_library_conversion_test.go",
         "android_app_certificate_conversion_test.go",
         "android_app_conversion_test.go",
diff --git a/bp2build/aconfig_conversion_test.go b/bp2build/aconfig_conversion_test.go
index d6e20df..ac830c6 100644
--- a/bp2build/aconfig_conversion_test.go
+++ b/bp2build/aconfig_conversion_test.go
@@ -15,6 +15,7 @@
 package bp2build
 
 import (
+	"android/soong/aconfig/codegen"
 	"testing"
 
 	"android/soong/aconfig"
@@ -25,6 +26,7 @@
 
 func registerAconfigModuleTypes(ctx android.RegistrationContext) {
 	aconfig.RegisterBuildComponents(ctx)
+	codegen.RegisterBuildComponents(ctx)
 	ctx.RegisterModuleType("cc_library", cc.LibraryFactory)
 	ctx.RegisterModuleType("java_library", java.LibraryFactory)
 }