diff --git a/google/resource_storage_bucket_acl_test.go b/google/resource_storage_bucket_acl_test.go
index 61fc761d..73f5bc98 100644
--- a/google/resource_storage_bucket_acl_test.go
+++ b/google/resource_storage_bucket_acl_test.go
@@ -47,17 +47,13 @@ func testBucketName() string {
 
 func TestAccGoogleStorageBucketAcl_basic(t *testing.T) {
 	bucketName := testBucketName()
-	entities, err := defaultRoleEntities()
-	if err != nil {
-		t.Fatal(err)
-	}
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccGoogleStorageBucketAclDestroy,
 		Steps: []resource.TestStep{
 			resource.TestStep{
-				Config: testGoogleStorageBucketsAclBasic1(bucketName, entities),
+				Config: testGoogleStorageBucketsAclBasic1(bucketName, t),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic1),
 					testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic2),
@@ -69,17 +65,13 @@ func TestAccGoogleStorageBucketAcl_basic(t *testing.T) {
 
 func TestAccGoogleStorageBucketAcl_upgrade(t *testing.T) {
 	bucketName := testBucketName()
-	entities, err := defaultRoleEntities()
-	if err != nil {
-		t.Fatal(err)
-	}
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccGoogleStorageBucketAclDestroy,
 		Steps: []resource.TestStep{
 			resource.TestStep{
-				Config: testGoogleStorageBucketsAclBasic1(bucketName, entities),
+				Config: testGoogleStorageBucketsAclBasic1(bucketName, t),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic1),
 					testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic2),
@@ -87,7 +79,7 @@ func TestAccGoogleStorageBucketAcl_upgrade(t *testing.T) {
 			},
 
 			resource.TestStep{
-				Config: testGoogleStorageBucketsAclBasic2(bucketName, entities),
+				Config: testGoogleStorageBucketsAclBasic2(bucketName, t),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic2),
 					testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic3_owner),
@@ -108,17 +100,13 @@ func TestAccGoogleStorageBucketAcl_upgrade(t *testing.T) {
 
 func TestAccGoogleStorageBucketAcl_downgrade(t *testing.T) {
 	bucketName := testBucketName()
-	entities, err := defaultRoleEntities()
-	if err != nil {
-		t.Fatal(err)
-	}
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccGoogleStorageBucketAclDestroy,
 		Steps: []resource.TestStep{
 			resource.TestStep{
-				Config: testGoogleStorageBucketsAclBasic2(bucketName, entities),
+				Config: testGoogleStorageBucketsAclBasic2(bucketName, t),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic2),
 					testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic3_owner),
@@ -126,7 +114,7 @@ func TestAccGoogleStorageBucketAcl_downgrade(t *testing.T) {
 			},
 
 			resource.TestStep{
-				Config: testGoogleStorageBucketsAclBasic3(bucketName, entities),
+				Config: testGoogleStorageBucketsAclBasic3(bucketName, t),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic2),
 					testAccCheckGoogleStorageBucketAcl(bucketName, roleEntityBasic3_reader),
@@ -213,7 +201,11 @@ func testAccGoogleStorageBucketAclDestroy(s *terraform.State) error {
 	return nil
 }
 
-func testGoogleStorageBucketsAclBasic1(bucketName string, entities []string) string {
+func testGoogleStorageBucketsAclBasic1(bucketName string, t *testing.T) string {
+	entities, err := defaultRoleEntities()
+	if err != nil {
+		t.Fatal(err)
+	}
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
 	name = "%s"
@@ -226,7 +218,11 @@ resource "google_storage_bucket_acl" "acl" {
 `, bucketName, entities[0], entities[1], entities[2], roleEntityBasic1, roleEntityBasic2)
 }
 
-func testGoogleStorageBucketsAclBasic2(bucketName string, entities []string) string {
+func testGoogleStorageBucketsAclBasic2(bucketName string, t *testing.T) string {
+	entities, err := defaultRoleEntities()
+	if err != nil {
+		t.Fatal(err)
+	}
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
 	name = "%s"
@@ -252,7 +248,11 @@ resource "google_storage_bucket_acl" "acl" {
 `, bucketName)
 }
 
-func testGoogleStorageBucketsAclBasic3(bucketName string, entities []string) string {
+func testGoogleStorageBucketsAclBasic3(bucketName string, t *testing.T) string {
+	entities, err := defaultRoleEntities()
+	if err != nil {
+		t.Fatal(err)
+	}
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
 	name = "%s"