diff --git a/python/test.go b/python/test.go
index 5781df7..b9b3465 100644
--- a/python/test.go
+++ b/python/test.go
@@ -67,14 +67,9 @@
 }
 
 func (test *testDecorator) install(ctx android.ModuleContext, file android.Path) {
-	test.testConfig = tradefed.NewMaybeAutoGenTestConfigBuilder(ctx).
-		SetTestConfigProp(test.testProperties.Test_config).
-		SetTestTemplateConfigProp(test.testProperties.Test_config_template).
-		SetTestSuites(test.binaryDecorator.binaryProperties.Test_suites).
-		SetAutoGenConfig(test.binaryDecorator.binaryProperties.Auto_gen_config).
-		SetDeviceTemplate("${PythonBinaryHostTestConfigTemplate}").
-		SetHostTemplate("${PythonBinaryHostTestConfigTemplate}").
-		Build()
+	test.testConfig = tradefed.AutoGenPythonBinaryHostTestConfig(ctx, test.testProperties.Test_config,
+		test.testProperties.Test_config_template, test.binaryDecorator.binaryProperties.Test_suites,
+		test.binaryDecorator.binaryProperties.Auto_gen_config)
 
 	test.binaryDecorator.pythonInstaller.dir = "nativetest"
 	test.binaryDecorator.pythonInstaller.dir64 = "nativetest64"