diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
index 89b80dc00..9f8b6d798 100644
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -46,7 +46,7 @@ jobs:
         if: steps.changes.outputs.go == 'true'
         run: |
           cd test/e2e/
-          go test ./... -run '^TestE2E.*$' -tags e2e -v
+          go test ./... -run '^TestE2E.*$' -tags e2e -race -v
         env:
           # DATA_PROXY_DATABASE_URL: ${{ secrets.DATA_PROXY_DATABASE_URL }}
           PRISMA_CLIENT_GO_LOG: info
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4f7d7c710..4839e22bd 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -41,4 +41,4 @@ jobs:
 
       - name: test
         if: steps.changes.outputs.go == 'true'
-        run: go test ./... -v -failfast
+        run: go test ./... -race -v -failfast
diff --git a/.run/test all.run.xml b/.run/test all.run.xml
index 70c8da84a..e7adfa394 100644
--- a/.run/test all.run.xml	
+++ b/.run/test all.run.xml	
@@ -1,33 +1,34 @@
 <component name="ProjectRunConfigurationManager">
-	<configuration default="false" name="test all" type="GoTestRunConfiguration" factoryName="Go Test">
-		<module name="prisma-client-go"/>
-		<working_directory value="$PROJECT_DIR$/"/>
-		<envs>
-			<env name="PRISMA_CLIENT_GO_LOG" value="info"/>
-			<env name="PHOTON_GO_LOG" value="info"/>
-			<env name="LOG_QUERIES" value="y"/>
-			<env name="DBm" value="mysql://root:pw@localhost:3306/testing"/>
-			<env name="DB" value="postgresql://postgres:pw@localhost:5432/testing"/>
-			<env name="PRISMA_CLIENT_GO_WRITE_DMMF_FILE" value="yes"/>
-			<env name="PRISMA_CLIENT_GO_TEST_DEV" value="true"/>
-			<env name="PRISMA_CLIENT_GO_TEST_MIGRATE_LOGS" value="true"/>
-		</envs>
-		<EXTENSION ID="net.ashald.envfile">
-			<option name="IS_ENABLED" value="false"/>
-			<option name="IS_SUBST" value="false"/>
-			<option name="IS_PATH_MACRO_SUPPORTED" value="false"/>
-			<option name="IS_IGNORE_MISSING_FILES" value="false"/>
-			<option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false"/>
-			<ENTRIES>
-				<ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false"/>
-			</ENTRIES>
-		</EXTENSION>
-		<kind value="DIRECTORY"/>
-		<package value="github.com/prisma/photongo"/>
-		<directory value="$PROJECT_DIR$/"/>
-		<filePath value="$PROJECT_DIR$/"/>
-		<framework value="gotest"/>
-		<pattern value="./..."/>
-		<method v="2"/>
-	</configuration>
+  <configuration default="false" name="test all" type="GoTestRunConfiguration" factoryName="Go Test">
+    <module name="prisma-client-go" />
+    <working_directory value="$PROJECT_DIR$/" />
+    <go_parameters value="-race" />
+    <envs>
+      <env name="PRISMA_CLIENT_GO_LOG" value="info" />
+      <env name="PHOTON_GO_LOG" value="info" />
+      <env name="LOG_QUERIES" value="y" />
+      <env name="DBm" value="mysql://root:pw@localhost:3306/testing" />
+      <env name="DB" value="postgresql://postgres:pw@localhost:5432/testing" />
+      <env name="PRISMA_CLIENT_GO_WRITE_DMMF_FILE" value="yes" />
+      <env name="PRISMA_CLIENT_GO_TEST_DEV" value="true" />
+      <env name="PRISMA_CLIENT_GO_TEST_MIGRATE_LOGS" value="true" />
+    </envs>
+    <EXTENSION ID="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </EXTENSION>
+    <kind value="DIRECTORY" />
+    <package value="github.com/prisma/photongo" />
+    <directory value="$PROJECT_DIR$/" />
+    <filePath value="$PROJECT_DIR$/" />
+    <framework value="gotest" />
+    <pattern value="./..." />
+    <method v="2" />
+  </configuration>
 </component>
diff --git a/engine/lifecycle.go b/engine/lifecycle.go
index 013ac7b88..eeb1a8f36 100644
--- a/engine/lifecycle.go
+++ b/engine/lifecycle.go
@@ -286,10 +286,13 @@ func (e *QueryEngine) spawn(file string) error {
 	// send a basic readiness healthcheck and retry if unsuccessful
 	var connectErr error
 	for i := 0; i < 100; i++ {
+		e.mu.Lock()
 		// return an error early if an engine error already happened
 		if e.lastEngineError != "" {
+			e.mu.Unlock()
 			return fmt.Errorf("query engine errored: %w", fmt.Errorf(e.lastEngineError))
 		}
+		e.mu.Unlock()
 
 		body, err := e.Request(context.Background(), "GET", "/status", map[string]interface{}{}, false)
 		if err != nil {
diff --git a/engine/qe.go b/engine/qe.go
index b8259d14f..2f4eae13f 100644
--- a/engine/qe.go
+++ b/engine/qe.go
@@ -3,6 +3,7 @@ package engine
 import (
 	"net/http"
 	"os/exec"
+	"sync"
 )
 
 func NewQueryEngine(schema string, hasBinaryTargets bool, datasources string, datasourceURL string) *QueryEngine {
@@ -52,6 +53,8 @@ type QueryEngine struct {
 
 	// lastEngineError contains the last received error
 	lastEngineError string
+
+	mu sync.Mutex
 }
 
 func (e *QueryEngine) Name() string {
diff --git a/engine/stream.go b/engine/stream.go
index 6a58f3e05..1721f41f5 100644
--- a/engine/stream.go
+++ b/engine/stream.go
@@ -26,7 +26,9 @@ func (e *QueryEngine) streamStderr(cmd *exec.Cmd, onError chan<- string) error {
 		for {
 			select {
 			case v := <-e.onEngineError:
+				e.mu.Lock()
 				e.lastEngineError = v
+				e.mu.Unlock()
 			case <-e.closed:
 				logger.Debug.Printf("query engine closed")
 				break outer