diff --git a/openfeature/openfeature_test.go b/openfeature/openfeature_test.go
index d2308473..b29ea31e 100644
--- a/openfeature/openfeature_test.go
+++ b/openfeature/openfeature_test.go
@@ -721,6 +721,7 @@ func TestDefaultClientUsage(t *testing.T) {
 }
 
 func TestLateBindingOfDefaultProvider(t *testing.T) {
+	defer t.Cleanup(initSingleton)
 	// we are expecting
 	expectedResultUnboundProvider := "default-value-from-unbound-provider"
 	expectedResultFromLateDefaultProvider := "value-from-late-default-provider"
diff --git a/openfeature/testing/testprovider_test.go b/openfeature/testing/testprovider_test.go
index f2c2f07e..4a54fe07 100644
--- a/openfeature/testing/testprovider_test.go
+++ b/openfeature/testing/testprovider_test.go
@@ -12,7 +12,7 @@ func TestParallelSingletonUsage(t *testing.T) {
 	t.Parallel()
 
 	testProvider := NewTestProvider()
-	err := openfeature.GetApiInstance().SetProvider(testProvider)
+	err := openfeature.GetApiInstance().SetProviderAndWait(testProvider)
 	if err != nil {
 		t.Errorf("unable to set provider")
 	}