diff --git a/third_party/terraform/tests/data_source_google_container_cluster_test.go b/third_party/terraform/tests/data_source_google_container_cluster_test.go
index 662f39591aa7..c6c4bfb60c9d 100644
--- a/third_party/terraform/tests/data_source_google_container_cluster_test.go
+++ b/third_party/terraform/tests/data_source_google_container_cluster_test.go
@@ -75,7 +75,7 @@ resource "google_container_cluster" "kubes" {
 
 data "google_container_cluster" "kubes" {
 	name     = "${google_container_cluster.kubes.name}"
-	location = "${google_container_cluster.kubes.zone}"
+	location = "${google_container_cluster.kubes.location}"
 }
 `, acctest.RandString(10))
 }
@@ -90,7 +90,7 @@ resource "google_container_cluster" "kubes" {
 
 data "google_container_cluster" "kubes" {
 	name     = "${google_container_cluster.kubes.name}"
-	location = "${google_container_cluster.kubes.region}"
+	location = "${google_container_cluster.kubes.location}"
 }
 `, acctest.RandString(10))
 }
diff --git a/third_party/terraform/tests/resource_compute_backend_service_signed_url_key_test.go b/third_party/terraform/tests/resource_compute_backend_service_signed_url_key_test.go
index baad22edcd6e..ba546e6b036c 100644
--- a/third_party/terraform/tests/resource_compute_backend_service_signed_url_key_test.go
+++ b/third_party/terraform/tests/resource_compute_backend_service_signed_url_key_test.go
@@ -85,7 +85,7 @@ func checkComputeBackendServiceSignedUrlKeyExists(s *terraform.State) (bool, err
 		}
 
 		config := testAccProvider.Meta().(*Config)
-		keyName := rs.Primary.ID
+		keyName := rs.Primary.Attributes["name"]
 
 		url, err := replaceVarsForTest(config, rs, "{{ComputeBasePath}}projects/{{project}}/global/backendServices/{{backend_service}}")
 		if err != nil {
diff --git a/third_party/terraform/tests/resource_compute_instance_group_test.go b/third_party/terraform/tests/resource_compute_instance_group_test.go
index 928ecc50a32a..a7f6c2edf413 100644
--- a/third_party/terraform/tests/resource_compute_instance_group_test.go
+++ b/third_party/terraform/tests/resource_compute_instance_group_test.go
@@ -302,7 +302,7 @@ func testAccComputeInstanceGroup_hasCorrectNetwork(nInstanceGroup string, nNetwo
 			return fmt.Errorf("No ID is set")
 		}
 		network, err := config.clientCompute.Networks.Get(
-			config.Project, rsNetwork.Primary.ID).Do()
+			config.Project, rsNetwork.Primary.Attributes["name"]).Do()
 		if err != nil {
 			return err
 		}
diff --git a/third_party/terraform/tests/resource_compute_target_http_proxy_test.go b/third_party/terraform/tests/resource_compute_target_http_proxy_test.go
index 52c88de7c495..e8be2e57a0e4 100644
--- a/third_party/terraform/tests/resource_compute_target_http_proxy_test.go
+++ b/third_party/terraform/tests/resource_compute_target_http_proxy_test.go
@@ -54,7 +54,7 @@ func testAccCheckComputeTargetHttpProxyExists(n string) resource.TestCheckFunc {
 		}
 
 		config := testAccProvider.Meta().(*Config)
-		name := rs.Attributes["name"]
+		name := rs.Primary.Attributes["name"]
 
 		found, err := config.clientCompute.TargetHttpProxies.Get(
 			config.Project, name).Do()
diff --git a/third_party/terraform/tests/resource_container_cluster_test.go.erb b/third_party/terraform/tests/resource_container_cluster_test.go.erb
index f4e429edcfa9..408e3693175d 100644
--- a/third_party/terraform/tests/resource_container_cluster_test.go.erb
+++ b/third_party/terraform/tests/resource_container_cluster_test.go.erb
@@ -2449,7 +2449,7 @@ func testAccContainerCluster_withNodeConfigShieldedInstanceConfig(clusterName st
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_node_config" {
 	name = "%s"
-	zone = "us-central1-f"
+	location = "us-central1-f"
 	initial_node_count = 1
 
 	node_config {
@@ -2915,7 +2915,7 @@ func testAccContainerCluster_withRecurringMaintenanceWindow(clusterName string,
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_recurring_maintenance_window" {
 	name = "cluster-test-%s"
-	zone = "us-central1-a"
+	location = "us-central1-a"
 	initial_node_count = 1
 
 	%s
@@ -3354,7 +3354,7 @@ func testAccContainerCluster_withBinaryAuthorization(clusterName string, enabled
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_binary_authorization" {
 	name    = "%s"
-	locatin = "us-central1-a"
+	location = "us-central1-a"
 	initial_node_count = 1
 
 	enable_binary_authorization = %v
@@ -3366,7 +3366,7 @@ func testAccContainerCluster_withShieldedNodes(clusterName string, enabled bool)
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_shielded_nodes" {
 	name = "%s"
-	zone = "us-central1-a"
+	location = "us-central1-a"
 	initial_node_count = 1
 
 	enable_shielded_nodes = %v
@@ -3401,7 +3401,7 @@ resource "google_compute_subnetwork" "container_subnetwork" {
 
 resource "google_container_cluster" "with_flexible_cidr" {
 	name    = "%s"
-	locatin = "us-central1-a"
+	location = "us-central1-a"
 	initial_node_count = 3
 
 	network = "${google_compute_network.container_network.name}"
diff --git a/third_party/terraform/tests/resource_container_node_pool_test.go.erb b/third_party/terraform/tests/resource_container_node_pool_test.go.erb
index 8a0e526d52bb..f4cd15744b94 100644
--- a/third_party/terraform/tests/resource_container_node_pool_test.go.erb
+++ b/third_party/terraform/tests/resource_container_node_pool_test.go.erb
@@ -706,7 +706,7 @@ resource "google_compute_subnetwork" "container_subnetwork" {
 	name                     = "${google_compute_network.container_network.name}"
 	network                  = "${google_compute_network.container_network.name}"
 	ip_cidr_range            = "10.0.36.0/24"
-	location                 = "us-central1"
+	region                   = "us-central1"
 	private_ip_google_access = true
 
 	secondary_ip_range {