diff --git a/src/test/groovy/sdkman/specs/PlatformSpec.groovy b/src/test/groovy/sdkman/specs/PlatformSpec.groovy
index 89c101a2..cb04daf4 100644
--- a/src/test/groovy/sdkman/specs/PlatformSpec.groovy
+++ b/src/test/groovy/sdkman/specs/PlatformSpec.groovy
@@ -1,13 +1,9 @@
 package sdkman.specs
 
-import sdkman.stubs.UnameStub
 import sdkman.support.SdkmanEnvSpecification
 
 class PlatformSpec extends SdkmanEnvSpecification {
-	UnameStub unameStub
-
 	def setup() {
-		unameStub = UnameStub.prepareIn(new File(sdkmanBaseDirectory, "bin"))
 		sdkmanBashEnvBuilder.withCandidates(["groovy"])
 	}
 
diff --git a/src/test/groovy/sdkman/stubs/UnameStub.groovy b/src/test/groovy/sdkman/stubs/UnameStub.groovy
index b35efd68..34cf6eab 100644
--- a/src/test/groovy/sdkman/stubs/UnameStub.groovy
+++ b/src/test/groovy/sdkman/stubs/UnameStub.groovy
@@ -12,8 +12,6 @@ class UnameStub {
 
 		def file = new File(folder, "uname")
 		file.createNewFile()
-		file.write "#!/usr/bin/env bash\n"
-		file.executable = true
 
 		new UnameStub(file: file)
 	}
@@ -35,6 +33,7 @@ class UnameStub {
 
 	void build() {
 		file << """
+			|#!/usr/bin/env bash
 			|if [[ "\$1" == '-m' ]]; then
 			|	echo "$machine"
 			|elif [[ "\$1" == '-s' ]]; then
@@ -43,5 +42,6 @@ class UnameStub {
 			|	echo "$platform"
 			|fi
 			""".stripMargin('|')
+		file.executable = true
 	}
 }
diff --git a/src/test/groovy/sdkman/support/SdkmanEnvSpecification.groovy b/src/test/groovy/sdkman/support/SdkmanEnvSpecification.groovy
index ce4fd561..92a13fdb 100644
--- a/src/test/groovy/sdkman/support/SdkmanEnvSpecification.groovy
+++ b/src/test/groovy/sdkman/support/SdkmanEnvSpecification.groovy
@@ -2,6 +2,7 @@ package sdkman.support
 
 import sdkman.env.SdkmanBashEnvBuilder
 import sdkman.stubs.CurlStub
+import sdkman.stubs.UnameStub
 
 import static sdkman.support.FilesystemUtils.prepareBaseDir
 
@@ -10,6 +11,7 @@ abstract class SdkmanEnvSpecification extends BashEnvSpecification {
 	SdkmanBashEnvBuilder sdkmanBashEnvBuilder
 
 	CurlStub curlStub
+	UnameStub unameStub
 
 	File sdkmanBaseDirectory
 	File sdkmanDotDirectory
@@ -20,6 +22,7 @@ abstract class SdkmanEnvSpecification extends BashEnvSpecification {
 	def setup() {
 		sdkmanBaseDirectory = prepareBaseDir()
 		curlStub = CurlStub.prepareIn(new File(sdkmanBaseDirectory, "bin"))
+		unameStub = UnameStub.prepareIn(new File(sdkmanBaseDirectory, "bin"))
 		sdkmanBashEnvBuilder = SdkmanBashEnvBuilder
 				.create(sdkmanBaseDirectory)
 				.withCurlStub(curlStub)