diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000..d5980e0
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,22 @@
+name: Go Tests
+
+on:
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+          cache: true
+
+      - name: Run tests
+        run: make test
+      - name: Run race checks
+        run: make race
diff --git a/Makefile b/Makefile
index 007b02f..bd80471 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
-clean: 
-	sudo rm -rf /usr/local/bin/envm-server
-	sudo rm -rf /etc/systemd/system/EnvManagerServer.service
\ No newline at end of file
+test:
+	go test ./... -v
+race:
+	go test -race ./... -v
\ No newline at end of file
diff --git a/internal/server-cli/utils_test.go b/internal/server-cli/utils_test.go
index 1297fb0..3954e40 100644
--- a/internal/server-cli/utils_test.go
+++ b/internal/server-cli/utils_test.go
@@ -1,9 +1,6 @@
 package servercli
 
 import (
-	"os"
-	"path/filepath"
-	"strings"
 	"testing"
 	"time"
 )