diff --git a/android/config.go b/android/config.go
index e14f42e..642fa72 100644
--- a/android/config.go
+++ b/android/config.go
@@ -69,6 +69,9 @@
 	FileConfigurableOptions
 	ProductVariables productVariables
 
+	// Only available on configs created by TestConfig
+	TestProductVariables *productVariables
+
 	PrimaryBuilder           string
 	ConfigFileName           string
 	ProductVariablesFileName string
@@ -197,6 +200,7 @@
 	config.deviceConfig = &deviceConfig{
 		config: config,
 	}
+	config.TestProductVariables = &config.ProductVariables
 
 	if err := config.fromEnv(); err != nil {
 		panic(err)