diff --git a/Makefile b/Makefile
index e848246..61119a1 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,11 @@ lint-fix: $(GOLANGCI_LINT)
 
 .PHONY: test
 test:
-	go test ./... -v $(TESTARGS) -timeout 120m
+	go test ./... -v -tags=unit $(TESTARGS) -timeout 120m
+
+.PHONY: acctest
+acctest:
+	TF_ACC=1 go test ./... -v -tags=acceptance $(TESTARGS) -timeout 120m
 
 .PHONY: plugin
 plugin:
diff --git a/internal/api/login_test.go b/internal/api/login_test.go
index 2d8a408..b2db13e 100644
--- a/internal/api/login_test.go
+++ b/internal/api/login_test.go
@@ -4,6 +4,8 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
+//go:build unit
+
 package api_test
 
 import (
diff --git a/internal/api/objectapi_test.go b/internal/api/objectapi_test.go
index e19cb75..f0277ee 100644
--- a/internal/api/objectapi_test.go
+++ b/internal/api/objectapi_test.go
@@ -4,6 +4,8 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
+//go:build unit
+
 package api_test
 
 import (
diff --git a/internal/api/pkce_test.go b/internal/api/pkce_test.go
index 5f724c5..8512237 100644
--- a/internal/api/pkce_test.go
+++ b/internal/api/pkce_test.go
@@ -4,6 +4,8 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
+//go:build unit
+
 package api_test
 
 import (
diff --git a/internal/api/typeapi_test.go b/internal/api/typeapi_test.go
index a13d2c5..fcd18b6 100644
--- a/internal/api/typeapi_test.go
+++ b/internal/api/typeapi_test.go
@@ -4,6 +4,8 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
+//go:build unit
+
 package api_test
 
 import (
diff --git a/internal/provider/datasource_knowledge_type_acc_test.go b/internal/provider/datasource_knowledge_type_acc_test.go
index 036b66c..42532c9 100644
--- a/internal/provider/datasource_knowledge_type_acc_test.go
+++ b/internal/provider/datasource_knowledge_type_acc_test.go
@@ -9,7 +9,6 @@
 package provider
 
 import (
-	"fmt"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -17,7 +16,6 @@ import (
 
 //lint:ignore U1000 Ignore unused function temporarily for debugging
 func TestAccKnowledgeTypeDataSource(t *testing.T) {
-	fmt.Print("DNSAJDANSJDANSJDNAJSDNJASDNJANJSNDJASNDJA")
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
diff --git a/internal/provider/jsonvalidator_test.go b/internal/provider/jsonvalidator_test.go
index 7fa886e..eea6f5b 100644
--- a/internal/provider/jsonvalidator_test.go
+++ b/internal/provider/jsonvalidator_test.go
@@ -4,6 +4,8 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
+//go:build unit
+
 package provider_test
 
 import (