diff --git a/cmd/kubeadm/app/phases/addons/proxy/proxy.go b/cmd/kubeadm/app/phases/addons/proxy/proxy.go
index ba6d932016c..cbff5de92be 100644
--- a/cmd/kubeadm/app/phases/addons/proxy/proxy.go
+++ b/cmd/kubeadm/app/phases/addons/proxy/proxy.go
@@ -43,12 +43,12 @@ const (
 	// TODO: This k8s-generic, well-known constant should be fetchable from another source, not be in this package
 	KubeProxyClusterRoleName = "system:node-proxier"
 
+	// KubeProxyClusterRoleBindingName sets the name for the kube-proxy CluterRoleBinding
+	KubeProxyClusterRoleBindingName = "kubeadm:node-proxier"
+
 	// KubeProxyServiceAccountName describes the name of the ServiceAccount for the kube-proxy addon
 	KubeProxyServiceAccountName = "kube-proxy"
 
-	// KubeProxyClusterRoleBindingName sets the name for the kube-proxy CluterRoleBinding
-	KubeProxyClusterRoleBindingName = "kubeam:node-proxier"
-
 	// KubeProxyConfigMapRoleName sets the name of ClusterRole for ConfigMap
 	KubeProxyConfigMapRoleName = "kube-proxy"
 )
diff --git a/test/e2e_kubeadm/kubelet_config_test.go b/test/e2e_kubeadm/kubelet_config_test.go
index 4fb94ccac8f..c699a549c83 100644
--- a/test/e2e_kubeadm/kubelet_config_test.go
+++ b/test/e2e_kubeadm/kubelet_config_test.go
@@ -84,11 +84,15 @@ var _ = Describe("kubelet-config ConfigMap", func() {
 		// https://github.com/kubernetes/kubeadm/issues/1582
 		var UnversionedKubeletConfigMap bool
 		if _, ok := m["featureGates"]; ok {
-			if featureGates, ok := m["featureGates"].(map[string]bool); ok {
+			if featureGates, ok := m["featureGates"].(map[interface{}]interface{}); ok {
 				// TODO: update the default to true once this graduates to Beta.
 				UnversionedKubeletConfigMap = false
 				if val, ok := featureGates["UnversionedKubeletConfigMap"]; ok {
-					UnversionedKubeletConfigMap = val
+					if valBool, ok := val.(bool); ok {
+						UnversionedKubeletConfigMap = valBool
+					} else {
+						framework.Failf("unable to cast the value of feature gate UnversionedKubeletConfigMap to bool")
+					}
 				}
 			} else {
 				framework.Failf("unable to cast the featureGates field in the %s ConfigMap", kubeadmConfigName)