diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 2216c8db..7aa39b97 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -38,7 +38,7 @@ jobs:
           args: --timeout=10m -E gofmt
 
     - name: Test lib ssh
-      run: go test -v -race -cover ./...
+      run: go test -v -cover ./...
       working-directory: crypto/ssh
 
     - name: Test sshpiper
diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml
index 06873cf9..deea61e3 100644
--- a/e2e/docker-compose.yml
+++ b/e2e/docker-compose.yml
@@ -12,7 +12,7 @@ services:
 
   piper-fixed:
     environment:
-      - "SSHPIPERD_LOG_LEVEL=trace"
+      - SSHPIPERD_LOG_LEVEL=trace
     build: ../
     command:
       - "/sshpiperd/sshpiperd"
@@ -24,6 +24,8 @@ services:
 
 
   testrunner:
+    environment:
+      - SSHPIPERD_E2E_TEST=1
     build: 
       context: ../
       dockerfile: e2e/Dockerfile_e2e
diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go
index 5af7a980..e0859435 100644
--- a/e2e/e2e_test.go
+++ b/e2e/e2e_test.go
@@ -102,6 +102,13 @@ func checkSharedFileContent(t *testing.T, targetfie string, expected string) {
 }
 
 func TestMain(m *testing.M) {
+
+	if os.Getenv("SSHPIPERD_E2E_TEST") != "1" {
+		log.Printf("skipping e2e test")
+		os.Exit(0)
+		return
+	}
+
 	_, _, _, _ = runCmd("ssh", "-V")
 
 	for _, ep := range []string{