diff --git a/android/test_suites.go b/android/test_suites.go
index b6ca0e6f0..7b2d7dcd1 100644
--- a/android/test_suites.go
+++ b/android/test_suites.go
@@ -47,10 +47,12 @@ func (t *testSuiteFiles) GenerateBuildActions(ctx SingletonContext) {
 	})
 
 	t.robolectric = robolectricTestSuite(ctx, files["robolectric-tests"])
+
+	ctx.Phony("robolectric-tests", t.robolectric)
 }
 
 func (t *testSuiteFiles) MakeVars(ctx MakeVarsContext) {
-	ctx.Strict("ROBOLECTRIC_TEST_SUITE", t.robolectric.String())
+	ctx.DistForGoal("robolectric-tests", t.robolectric)
 }
 
 func robolectricTestSuite(ctx SingletonContext, files map[string]InstallPaths) WritablePath {
diff --git a/java/robolectric.go b/java/robolectric.go
index 85d1befbe..4d68fd9c8 100644
--- a/java/robolectric.go
+++ b/java/robolectric.go
@@ -366,7 +366,6 @@ func (r *robolectricRuntimes) GenerateAndroidBuildActions(ctx android.ModuleCont
 	files := android.PathsForModuleSrc(ctx, r.props.Jars)
 
 	androidAllDir := android.PathForModuleInstall(ctx, "android-all")
-	fmt.Println(androidAllDir.String())
 	for _, from := range files {
 		installedRuntime := ctx.InstallFile(androidAllDir, from.Base(), from)
 		r.runtimes = append(r.runtimes, installedRuntime)