diff --git a/google/resource_container_cluster_test.go b/google/resource_container_cluster_test.go
index e634c2dc..c65a76d2 100644
--- a/google/resource_container_cluster_test.go
+++ b/google/resource_container_cluster_test.go
@@ -1057,7 +1057,7 @@ resource "google_container_cluster" "with_master_auth" {
 
 	master_auth {
 		username = "mr.yoda"
-		password = "adoy.rm"
+		password = "adoy.rm.123456789"
 	}
 }`, acctest.RandString(10))
 }
@@ -1122,11 +1122,6 @@ resource "google_container_cluster" "with_additional_zones" {
 		"us-central1-b",
 		"us-central1-c"
 	]
-
-	master_auth {
-		username = "mr.yoda"
-		password = "adoy.rm"
-	}
 }`, clusterName)
 }
 
@@ -1142,11 +1137,6 @@ resource "google_container_cluster" "with_additional_zones" {
 		"us-central1-b",
 		"us-central1-c",
 	]
-
-	master_auth {
-		username = "mr.yoda"
-		password = "adoy.rm"
-	}
 }`, clusterName)
 }
 
@@ -1194,11 +1184,6 @@ resource "google_container_cluster" "with_version" {
 	zone = "us-central1-a"
 	min_master_version = "${data.google_container_engine_versions.central1a.latest_master_version}"
 	initial_node_count = 1
-
-	master_auth {
-		username = "mr.yoda"
-		password = "adoy.rm"
-	}
 }`, clusterName)
 }
 
@@ -1213,11 +1198,6 @@ resource "google_container_cluster" "with_version" {
 	zone = "us-central1-a"
 	min_master_version = "${data.google_container_engine_versions.central1a.valid_master_versions.2}"
 	initial_node_count = 1
-
-	master_auth {
-		username = "mr.yoda"
-		password = "adoy.rm"
-	}
 }`, clusterName)
 }
 
@@ -1233,11 +1213,6 @@ resource "google_container_cluster" "with_version" {
 	min_master_version = "${data.google_container_engine_versions.central1a.valid_master_versions.1}"
 	node_version = "${data.google_container_engine_versions.central1a.valid_node_versions.1}"
 	initial_node_count = 1
-
-	master_auth {
-		username = "mr.yoda"
-		password = "adoy.rm"
-	}
 }`, clusterName)
 }
 
@@ -1248,11 +1223,6 @@ resource "google_container_cluster" "with_node_config" {
 	zone = "us-central1-f"
 	initial_node_count = 1
 
-	master_auth {
-		username = "mr.yoda"
-		password = "adoy.rm"
-	}
-
 	node_config {
 		machine_type = "n1-standard-1"
 		disk_size_gb = 15
@@ -1285,11 +1255,6 @@ resource "google_container_cluster" "with_node_config_scope_alias" {
 	zone = "us-central1-f"
 	initial_node_count = 1
 
-	master_auth {
-		username = "mr.yoda"
-		password = "adoy.rm"
-	}
-
 	node_config {
 		machine_type = "g1-small"
 		disk_size_gb = 15
@@ -1310,11 +1275,6 @@ resource "google_container_cluster" "with_net_ref_by_url" {
 	zone = "us-central1-a"
 	initial_node_count = 1
 
-	master_auth {
-		username = "mr.yoda"
-		password = "adoy.rm"
-	}
-
 	network = "${google_compute_network.container_network.self_link}"
 }
 
@@ -1363,11 +1323,6 @@ resource "google_container_cluster" "primary" {
     "us-central1-c",
   ]
 
-  master_auth {
-    username = "mr.yoda"
-    password = "adoy.rm"
-  }
-
   node_config {
     oauth_scopes = [
       "https://www.googleapis.com/auth/compute",
@@ -1430,11 +1385,6 @@ resource "google_container_cluster" "with_node_pool" {
 	name = "%s"
 	zone = "us-central1-a"
 
-	master_auth {
-		username = "mr.yoda"
-		password = "adoy.rm"
-	}
-
 	node_pool {
 		name               = "%s"
 		initial_node_count = 2
@@ -1484,11 +1434,6 @@ resource "google_container_cluster" "with_node_pool" {
 	name = "%s"
 	zone = "us-central1-a"
 
-	master_auth {
-		username = "mr.yoda"
-		password = "adoy.rm"
-	}
-
 	node_pool {
 		name               = "%s"
 		initial_node_count = 2
@@ -1506,11 +1451,6 @@ resource "google_container_cluster" "with_node_pool" {
 	name = "%s"
 	zone = "us-central1-a"
 
-	master_auth {
-		username = "mr.yoda"
-		password = "adoy.rm"
-	}
-
 	node_pool {
 		name               = "%s"
 		initial_node_count = 2
@@ -1528,11 +1468,6 @@ resource "google_container_cluster" "with_node_pool_name_prefix" {
 	name = "tf-cluster-nodepool-test-%s"
 	zone = "us-central1-a"
 
-	master_auth {
-		username = "mr.yoda"
-		password = "adoy.rm"
-	}
-
 	node_pool {
 		name_prefix = "tf-np-test"
 		node_count  = 2
@@ -1546,11 +1481,6 @@ resource "google_container_cluster" "with_node_pool_multiple" {
 	name = "tf-cluster-nodepool-test-%s"
 	zone = "us-central1-a"
 
-	master_auth {
-		username = "mr.yoda"
-		password = "adoy.rm"
-	}
-
 	node_pool {
 		name       = "tf-cluster-nodepool-test-%s"
 		node_count = 2
@@ -1569,11 +1499,6 @@ resource "google_container_cluster" "with_node_pool_multiple" {
 	name = "tf-cluster-nodepool-test-%s"
 	zone = "us-central1-a"
 
-	master_auth {
-		username = "mr.yoda"
-		password = "adoy.rm"
-	}
-
 	node_pool {
 		# ERROR: name and name_prefix cannot be both specified
 		name        = "tf-cluster-nodepool-test-%s"
diff --git a/google/resource_container_node_pool.go b/google/resource_container_node_pool.go
index 46cdd1a9..458325e9 100644
--- a/google/resource_container_node_pool.go
+++ b/google/resource_container_node_pool.go
@@ -410,7 +410,7 @@ func nodePoolUpdate(d *schema.ResourceData, meta interface{}, clusterName, prefi
 	if err != nil {
 		return err
 	}
-	cluster := d.Get("cluster").(string)
+
 	npName := d.Get(prefix + "name").(string)
 
 	if d.HasChange(prefix + "autoscaling") {
@@ -434,8 +434,8 @@ func nodePoolUpdate(d *schema.ResourceData, meta interface{}, clusterName, prefi
 		req := &container.UpdateClusterRequest{
 			Update: update,
 		}
-		mutexKV.Lock(containerClusterMutexKey(project, zone, cluster))
-		defer mutexKV.Unlock(containerClusterMutexKey(project, zone, cluster))
+		mutexKV.Lock(containerClusterMutexKey(project, zone, clusterName))
+		defer mutexKV.Unlock(containerClusterMutexKey(project, zone, clusterName))
 		op, err := config.clientContainer.Projects.Zones.Clusters.Update(
 			project, zone, clusterName, req).Do()
 		if err != nil {
@@ -460,8 +460,8 @@ func nodePoolUpdate(d *schema.ResourceData, meta interface{}, clusterName, prefi
 		req := &container.SetNodePoolSizeRequest{
 			NodeCount: newSize,
 		}
-		mutexKV.Lock(containerClusterMutexKey(project, zone, cluster))
-		defer mutexKV.Unlock(containerClusterMutexKey(project, zone, cluster))
+		mutexKV.Lock(containerClusterMutexKey(project, zone, clusterName))
+		defer mutexKV.Unlock(containerClusterMutexKey(project, zone, clusterName))
 		op, err := config.clientContainer.Projects.Zones.Clusters.NodePools.SetSize(project, zone, clusterName, npName, req).Do()
 		if err != nil {
 			return err
@@ -491,8 +491,8 @@ func nodePoolUpdate(d *schema.ResourceData, meta interface{}, clusterName, prefi
 		req := &container.SetNodePoolManagementRequest{
 			Management: management,
 		}
-		mutexKV.Lock(containerClusterMutexKey(project, zone, cluster))
-		defer mutexKV.Unlock(containerClusterMutexKey(project, zone, cluster))
+		mutexKV.Lock(containerClusterMutexKey(project, zone, clusterName))
+		defer mutexKV.Unlock(containerClusterMutexKey(project, zone, clusterName))
 		op, err := config.clientContainer.Projects.Zones.Clusters.NodePools.SetManagement(
 			project, zone, clusterName, npName, req).Do()
 
diff --git a/google/resource_container_node_pool_test.go b/google/resource_container_node_pool_test.go
index a878af33..0e8d4fde 100644
--- a/google/resource_container_node_pool_test.go
+++ b/google/resource_container_node_pool_test.go
@@ -325,11 +325,6 @@ resource "google_container_cluster" "cluster" {
 	name = "%s"
 	zone = "us-central1-a"
 	initial_node_count = 3
-
-	master_auth {
-		username = "mr.yoda"
-		password = "adoy.rm"
-	}
 }
 
 resource "google_container_node_pool" "np" {
@@ -377,11 +372,6 @@ resource "google_container_cluster" "cluster" {
 	name = "%s"
 	zone = "us-central1-a"
 	initial_node_count = 3
-
-	master_auth {
-		username = "mr.yoda"
-		password = "adoy.rm"
-	}
 }
 
 resource "google_container_node_pool" "np" {
@@ -402,11 +392,6 @@ resource "google_container_cluster" "cluster" {
 	name = "%s"
 	zone = "us-central1-a"
 	initial_node_count = 3
-
-	master_auth {
-		username = "mr.yoda"
-		password = "adoy.rm"
-	}
 }
 
 resource "google_container_node_pool" "np" {
@@ -577,10 +562,6 @@ resource "google_container_cluster" "cluster" {
 	name = "tf-cluster-nodepool-test-%s"
 	zone = "us-central1-a"
 	initial_node_count = 1
-	master_auth {
-		username = "mr.yoda"
-		password = "adoy.rm"
-	}
 }
 resource "google_container_node_pool" "np_with_node_config" {
 	name = "tf-nodepool-test-%s"
@@ -608,10 +589,6 @@ resource "google_container_cluster" "cluster" {
 	name = "tf-cluster-nodepool-test-%s"
 	zone = "us-central1-a"
 	initial_node_count = 1
-	master_auth {
-		username = "mr.yoda"
-		password = "adoy.rm"
-	}
 }
 resource "google_container_node_pool" "np_with_node_config_scope_alias" {
 	name = "tf-nodepool-test-%s"