diff --git a/azurerm/azurerm_sweeper_test.go b/azurerm/azurerm_sweeper_test.go
index 849a6912c885..ad2212eab3db 100644
--- a/azurerm/azurerm_sweeper_test.go
+++ b/azurerm/azurerm_sweeper_test.go
@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/authentication"
 )
 
 func TestMain(m *testing.M) {
@@ -29,7 +30,7 @@ func buildConfigForSweepers() (*ArmClient, error) {
 		return nil, fmt.Errorf("ARM_SUBSCRIPTION_ID, ARM_CLIENT_ID, ARM_CLIENT_SECRET and ARM_TENANT_ID must be set for acceptance tests")
 	}
 
-	config := &Config{
+	config := &authentication.Config{
 		SubscriptionID:           subscriptionID,
 		ClientID:                 clientID,
 		ClientSecret:             clientSecret,
@@ -38,7 +39,7 @@ func buildConfigForSweepers() (*ArmClient, error) {
 		SkipProviderRegistration: false,
 	}
 
-	return config.getArmClient()
+	return getArmClient(config)
 }
 
 func shouldSweepAcceptanceTestResource(name string, resourceLocation string, region string) bool {
diff --git a/azurerm/helpers/authentication/config_test.go b/azurerm/helpers/authentication/config_test.go
index 8ccbb0082010..5e22fbf8a814 100644
--- a/azurerm/helpers/authentication/config_test.go
+++ b/azurerm/helpers/authentication/config_test.go
@@ -272,7 +272,7 @@ func TestAzurePopulateFromAccessToken_Exists(t *testing.T) {
 	}
 
 	if config.IsCloudShell != token.IsCloudShell {
-		t.Fatalf("Expected `IsCloudShell` to be %b, got %b", token.IsCloudShell, config.IsCloudShell)
+		t.Fatalf("Expected `IsCloudShell` to be %t, got %t", token.IsCloudShell, config.IsCloudShell)
 	}
 
 	if config.ClientID != token.ClientID {
diff --git a/azurerm/resource_arm_container_registry_migrate_test.go b/azurerm/resource_arm_container_registry_migrate_test.go
index 94d58be2dbf7..f7828e7e4bf6 100644
--- a/azurerm/resource_arm_container_registry_migrate_test.go
+++ b/azurerm/resource_arm_container_registry_migrate_test.go
@@ -17,7 +17,7 @@ func TestAccAzureRMContainerRegistryMigrateState(t *testing.T) {
 		t.SkipNow()
 		return
 	}
-	client, err := config.getArmClient()
+	client, err := getArmClient(config)
 	if err != nil {
 		t.Fatal(fmt.Errorf("Error building ARM Client: %+v", err))
 		return