diff --git a/sh/sh_binary.go b/sh/sh_binary.go
index 37e8253..9276a62 100644
--- a/sh/sh_binary.go
+++ b/sh/sh_binary.go
@@ -107,8 +107,6 @@
 
 	testProperties TestProperties
 
-	installDir android.InstallPath
-
 	data       android.Paths
 	testConfig android.Path
 }
@@ -203,8 +201,8 @@
 	} else if !ctx.Host() && ctx.Config().HasMultilibConflict(ctx.Arch().ArchType) {
 		testDir = filepath.Join(testDir, ctx.Arch().ArchType.String())
 	}
-	s.installDir = android.PathForModuleInstall(ctx, testDir, proptools.String(s.properties.Sub_dir), s.Name())
-	s.installedFile = ctx.InstallExecutable(s.installDir, s.outputFilePath.Base(), s.outputFilePath)
+	installDir := android.PathForModuleInstall(ctx, testDir, proptools.String(s.properties.Sub_dir))
+	s.installedFile = ctx.InstallExecutable(installDir, s.outputFilePath.Base(), s.outputFilePath)
 
 	s.data = android.PathsForModuleSrc(ctx, s.testProperties.Data)
 
@@ -232,7 +230,6 @@
 			func(entries *android.AndroidMkEntries) {
 				s.customAndroidMkEntries(entries)
 
-				entries.SetPath("LOCAL_MODULE_PATH", s.installDir.ToMakePath())
 				entries.AddStrings("LOCAL_COMPATIBILITY_SUITE", s.testProperties.Test_suites...)
 				if s.testProperties.Test_config != nil {
 					entries.SetString("LOCAL_TEST_CONFIG", proptools.String(s.testProperties.Test_config))
