diff --git a/provider-ci/internal/pkg/templates/bridged-provider/Makefile b/provider-ci/internal/pkg/templates/bridged-provider/Makefile
index 1013c95cd..1beedec22 100644
--- a/provider-ci/internal/pkg/templates/bridged-provider/Makefile
+++ b/provider-ci/internal/pkg/templates/bridged-provider/Makefile
@@ -262,7 +262,11 @@ test:
 .PHONY: test
 
 test_provider:
-	cd provider && go test -v -short -coverprofile="coverage.txt" -coverpkg=./... ./... -parallel $(TESTPARALLELISM)
+	go test -v -short \
+		-coverprofile="coverage.txt" \
+		-coverpkg="./...,github.com/hashicorp/terraform-provider-..." \
+		-parallel $(TESTPARALLELISM) \
+		./provider/...
 .PHONY: test_provider
 
 tfgen: schema
diff --git a/provider-ci/test-providers/acme/Makefile b/provider-ci/test-providers/acme/Makefile
index 48678b0ef..4e32aed3a 100644
--- a/provider-ci/test-providers/acme/Makefile
+++ b/provider-ci/test-providers/acme/Makefile
@@ -226,7 +226,11 @@ test:
 .PHONY: test
 
 test_provider:
-	cd provider && go test -v -short -coverprofile="coverage.txt" -coverpkg=./... ./... -parallel $(TESTPARALLELISM)
+	go test -v -short \
+		-coverprofile="coverage.txt" \
+		-coverpkg="./...,github.com/hashicorp/terraform-provider-..." \
+		-parallel $(TESTPARALLELISM) \
+		./provider/...
 .PHONY: test_provider
 
 tfgen: schema
diff --git a/provider-ci/test-providers/aws/Makefile b/provider-ci/test-providers/aws/Makefile
index 8e9bbac3d..d215fd567 100644
--- a/provider-ci/test-providers/aws/Makefile
+++ b/provider-ci/test-providers/aws/Makefile
@@ -236,7 +236,11 @@ test:
 .PHONY: test
 
 test_provider:
-	cd provider && go test -v -short -coverprofile="coverage.txt" -coverpkg=./... ./... -parallel $(TESTPARALLELISM)
+	go test -v -short \
+		-coverprofile="coverage.txt" \
+		-coverpkg="./...,github.com/hashicorp/terraform-provider-..." \
+		-parallel $(TESTPARALLELISM) \
+		./provider/...
 .PHONY: test_provider
 
 tfgen: schema
diff --git a/provider-ci/test-providers/cloudflare/Makefile b/provider-ci/test-providers/cloudflare/Makefile
index 1a12405bb..23535ea45 100644
--- a/provider-ci/test-providers/cloudflare/Makefile
+++ b/provider-ci/test-providers/cloudflare/Makefile
@@ -236,7 +236,11 @@ test:
 .PHONY: test
 
 test_provider:
-	cd provider && go test -v -short -coverprofile="coverage.txt" -coverpkg=./... ./... -parallel $(TESTPARALLELISM)
+	go test -v -short \
+		-coverprofile="coverage.txt" \
+		-coverpkg="./...,github.com/hashicorp/terraform-provider-..." \
+		-parallel $(TESTPARALLELISM) \
+		./provider/...
 .PHONY: test_provider
 
 tfgen: schema
diff --git a/provider-ci/test-providers/docker/Makefile b/provider-ci/test-providers/docker/Makefile
index adfeb9330..47bf46c24 100644
--- a/provider-ci/test-providers/docker/Makefile
+++ b/provider-ci/test-providers/docker/Makefile
@@ -239,7 +239,11 @@ test:
 .PHONY: test
 
 test_provider:
-	cd provider && go test -v -short -coverprofile="coverage.txt" -coverpkg=./... ./... -parallel $(TESTPARALLELISM)
+	go test -v -short \
+		-coverprofile="coverage.txt" \
+		-coverpkg="./...,github.com/hashicorp/terraform-provider-..." \
+		-parallel $(TESTPARALLELISM) \
+		./provider/...
 .PHONY: test_provider
 
 tfgen: schema