diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 382db8a..e24c084 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,6 +6,10 @@ on:
     branches:
       - main
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   docker:
     runs-on: ubuntu-latest
diff --git a/Dockerfile b/Dockerfile
index bb13761..a5c4f58 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,8 +16,8 @@ COPY pkg/ ./pkg
 # Stage to test the code
 FROM base AS test
 
-RUN go vet -v
-RUN go test -v
+RUN go vet -v ./...
+RUN go test -v ./...
 
 # Stage to build the binary
 FROM base AS build
diff --git a/pkg/environment/environment_test.go b/pkg/environment/environment_test.go
index 116a9df..be2ea7b 100644
--- a/pkg/environment/environment_test.go
+++ b/pkg/environment/environment_test.go
@@ -15,13 +15,6 @@ func TestConfig(t *testing.T) {
 	// Make sure the env var is not accidentially set somewhere else
 	os.Unsetenv(envVarName)
 
-	// Just a small test for the vetting step in the build process
-	var m map[string]string
-	if false {
-		m[envVarName] = "foo"
-		2
-	}
-
 	tests := []struct {
 		name    string
 		value   string