diff --git a/digitalocean/resource_digitalocean_certificate_test.go b/digitalocean/resource_digitalocean_certificate_test.go
index 1567efe6..3885bbb6 100644
--- a/digitalocean/resource_digitalocean_certificate_test.go
+++ b/digitalocean/resource_digitalocean_certificate_test.go
@@ -35,7 +35,7 @@ func testSweepCertificate(region string) error {
 		return err
 	}
 
-	client := meta.(*godo.Client)
+	client := meta.(*CombinedConfig).godoClient()
 
 	opt := &godo.ListOptions{PerPage: 200}
 	certs, _, err := client.Certificates.List(context.Background(), opt)
diff --git a/digitalocean/resource_digitalocean_domain_test.go b/digitalocean/resource_digitalocean_domain_test.go
index a64b3223..76fdc52f 100644
--- a/digitalocean/resource_digitalocean_domain_test.go
+++ b/digitalocean/resource_digitalocean_domain_test.go
@@ -27,7 +27,7 @@ func testSweepDomain(region string) error {
 		return err
 	}
 
-	client := meta.(*godo.Client)
+	client := meta.(*CombinedConfig).godoClient()
 
 	opt := &godo.ListOptions{PerPage: 200}
 	domains, _, err := client.Domains.List(context.Background(), opt)
diff --git a/digitalocean/resource_digitalocean_firewall_test.go b/digitalocean/resource_digitalocean_firewall_test.go
index 3c6a17fd..a5f02631 100644
--- a/digitalocean/resource_digitalocean_firewall_test.go
+++ b/digitalocean/resource_digitalocean_firewall_test.go
@@ -27,7 +27,7 @@ func testSweepFirewall(region string) error {
 		return err
 	}
 
-	client := meta.(*godo.Client)
+	client := meta.(*CombinedConfig).godoClient()
 
 	opt := &godo.ListOptions{PerPage: 200}
 	fws, _, err := client.Firewalls.List(context.Background(), opt)