diff --git a/tfsdk/serve.go b/tfsdk/serve.go
index b647eb682..0ea51166f 100644
--- a/tfsdk/serve.go
+++ b/tfsdk/serve.go
@@ -63,11 +63,9 @@ func NewProtocol6ProviderServer(p Provider) func() tfprotov6.ProviderServer {
 // acceptance testing helper/resource.TestCase.ProtoV6ProviderFactories.
 //
 // The error return is not currently used, but it may be in the future.
-func NewProtocol6ProviderServerWithError(p Provider) (func() tfprotov6.ProviderServer, error) {
-	return func() tfprotov6.ProviderServer {
-		return &server{
-			p: p,
-		}
+func NewProtocol6ProviderServerWithError(p Provider) (tfprotov6.ProviderServer, error) {
+	return &server{
+		p: p,
 	}, nil
 }
 
diff --git a/tfsdk/serve_test.go b/tfsdk/serve_test.go
index 71add9ffe..e1b6549ab 100644
--- a/tfsdk/serve_test.go
+++ b/tfsdk/serve_test.go
@@ -33,14 +33,12 @@ func TestNewProtocol6ProviderServer(t *testing.T) {
 func TestNewProtocol6ProviderServerWithError(t *testing.T) {
 	provider := &testServeProvider{}
 
-	providerServerFunc, err := NewProtocol6ProviderServerWithError(provider)
+	providerServer, err := NewProtocol6ProviderServerWithError(provider)
 
 	if err != nil {
 		t.Fatalf("unexpected error creating ProviderServer: %s", err)
 	}
 
-	providerServer := providerServerFunc()
-
 	// Simple verification
 	_, err = providerServer.GetProviderSchema(context.Background(), &tfprotov6.GetProviderSchemaRequest{})