diff --git a/Makefile b/Makefile
index 5614efa5..15779bfe 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ deps:
 test: gen
 	GO111MODULE=on $(GOCMD) fmt ./...
 	GO111MODULE=on $(GOCMD) vet ./...
-	GO111MODULE=on $(GOCMD) test -v ./...
+	GO111MODULE=on $(GOCMD) test -v -run '^Test(A[^P].*|[^A].*)' ./...
 
 clean:
 	$(GOCMD) clean
@@ -117,7 +117,7 @@ release-major:
 api-tests: gen
 	GO111MODULE=on $(GOCMD) fmt ./...
 	GO111MODULE=on $(GOCMD) vet ./...
-	GO111MODULE=on $(GOCMD) test -v -run '(TestEnvironmentCommands|TestProjectCommands)' ./...
+	GO111MODULE=on $(GOCMD) test -v -run '^(TestAPI)' ./...
 
 # upstream
 CI_BUILD_TAG ?= lagoon-cli
diff --git a/cmd/environment_test.go b/cmd/environment_test.go
index 9b47bb5e..ce206b6d 100644
--- a/cmd/environment_test.go
+++ b/cmd/environment_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func TestEnvironmentCommands(t *testing.T) {
+func TestAPIEnvironmentCommands(t *testing.T) {
 	tests := []struct {
 		name              string
 		cmdArgs           []string
diff --git a/cmd/project_test.go b/cmd/project_test.go
index b63c4157..cfa46dad 100644
--- a/cmd/project_test.go
+++ b/cmd/project_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func TestProjectCommands(t *testing.T) {
+func TestAPIProjectCommands(t *testing.T) {
 	tests := []struct {
 		name              string
 		cmdArgs           []string