diff --git a/helper_test.go b/helper_test.go
index d6e866554..6dbdf9f95 100644
--- a/helper_test.go
+++ b/helper_test.go
@@ -393,7 +393,7 @@ func createOAuthToken(t *testing.T, client *Client, org *Organization) (*OAuthTo
 func createOrganization(t *testing.T, client *Client) (*Organization, func()) {
 	ctx := context.Background()
 	org, err := client.Organizations.Create(ctx, OrganizationCreateOptions{
-		Name:  String("tst-" + randomString(t)),
+		Name:  String("org-" + randomString(t)), // Max of 40 chars
 		Email: String(fmt.Sprintf("%s@tfe.local", randomString(t))),
 	})
 	if err != nil {
diff --git a/registry_provider_platform_integration_test.go b/registry_provider_platform_integration_test.go
index 7add01b47..9d8914fe4 100644
--- a/registry_provider_platform_integration_test.go
+++ b/registry_provider_platform_integration_test.go
@@ -19,7 +19,7 @@ func TestRegistryProviderPlatformsCreate(t *testing.T) {
 	provider, providerTestCleanup := createPrivateRegistryProvider(t, client, nil)
 	defer providerTestCleanup()
 
-	version, versionCleanup := createRegistryProviderVersion(t, client, nil)
+	version, versionCleanup := createRegistryProviderVersion(t, client, provider)
 	defer versionCleanup()
 
 	versionID := RegistryProviderVersionID{
@@ -172,7 +172,7 @@ func TestRegistryProviderPlatformsDelete(t *testing.T) {
 	provider, providerCleanup := createPrivateRegistryProvider(t, client, nil)
 	defer providerCleanup()
 
-	version, versionCleanup := createRegistryProviderVersion(t, client, nil)
+	version, versionCleanup := createRegistryProviderVersion(t, client, provider)
 	defer versionCleanup()
 
 	providerID := RegistryProviderID{