diff --git a/integration_cli_test.go b/integration_cli_test.go
index 2149cbfe..bc7d1c1e 100644
--- a/integration_cli_test.go
+++ b/integration_cli_test.go
@@ -1,5 +1,4 @@
-//go:build integration
-// +build integration
+//go:build integration_cli
 
 package headscale
 
diff --git a/integration_common_test.go b/integration_common_test.go
index db2aa17a..14359612 100644
--- a/integration_common_test.go
+++ b/integration_common_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package headscale
 
@@ -20,6 +19,7 @@ import (
 )
 
 const (
+	headscaleHostname      = "headscale-derp"
 	DOCKER_EXECUTE_TIMEOUT = 10 * time.Second
 )
 
diff --git a/integration_embedded_derp_test.go b/integration_embedded_derp_test.go
index 3f694433..da323d88 100644
--- a/integration_embedded_derp_test.go
+++ b/integration_embedded_derp_test.go
@@ -1,4 +1,4 @@
-//go:build integration
+//go:build integration_derp
 
 package headscale
 
@@ -28,9 +28,8 @@ import (
 )
 
 const (
-	headscaleHostname = "headscale-derp"
-	namespaceName     = "derpnamespace"
-	totalContainers   = 3
+	namespaceName   = "derpnamespace"
+	totalContainers = 3
 )
 
 type IntegrationDERPTestSuite struct {
diff --git a/integration_test.go b/integration_general_test.go
similarity index 99%
rename from integration_test.go
rename to integration_general_test.go
index dca015d0..864b2230 100644
--- a/integration_test.go
+++ b/integration_general_test.go
@@ -1,5 +1,4 @@
-//go:build integration
-// +build integration
+//go:build integration_general
 
 package headscale