diff --git a/build-all.go b/build-all.go
index 08ebf5687..607937718 100755
--- a/build-all.go
+++ b/build-all.go
@@ -109,19 +109,23 @@ func main() {
 	if !*doGoPtr {
 		log.Printf("    ...  Not building/testing GO code")
 	} else {
-		log.Printf("    ...  Building of GO code not implemented yet.")
+		log.Printf("    ...  Building and testing go code.")
+		goscript.AssertSuccesfulRun("go build ./...")
+		goscript.AssertSuccesfulRun("go test ./...")
+		goscript.AssertSuccesfulRun("~/go/bin/staticcheck ./...")
 	}
 
 	if !*doJvmPtr {
 		log.Printf("    ...  Not building/testing JVM based code.")
 
 	} else {
+		log.Printf("    ... Building/testing JVM based code.")
 		//
 		// Ensure that  all preconditions for building and testing are met, if not
 		// fail and terminate execution.
 		//
 
-		goscript.AssertThatScriptCommandsAreAvailable("docker-compose", "./gradlew", "docker", "cmp")
+		goscript.AssertThatScriptCommandsAreAvailable("docker-compose", "./gradlew", "docker", "cmp", "go")
 
 		projectProfile := parseServiceAccountFile("prime-service-account.json")
 
diff --git a/github.com/ostelco-core/goscript/goscript.go b/github.com/ostelco-core/goscript/goscript.go
index c0ec2fc1d..f22369089 100644
--- a/github.com/ostelco-core/goscript/goscript.go
+++ b/github.com/ostelco-core/goscript/goscript.go
@@ -260,7 +260,7 @@ func checkIfDockerIsRunning() bool {
 	out, err := exec.Command("bash", "-c", cmd).Output()
 	ostring := string(out)
 
-	if "Docker not running" == ostring && err == nil {
+	if ostring == "Docker not running" && err == nil {
 		return false
 	}