diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go
index bfc39bda3a..e95316895a 100644
--- a/cmd/minikube/cmd/start_flags.go
+++ b/cmd/minikube/cmd/start_flags.go
@@ -35,6 +35,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/cruntime"
+	"k8s.io/minikube/pkg/minikube/detect"
 	"k8s.io/minikube/pkg/minikube/download"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
@@ -480,6 +481,11 @@ func generateNewConfigFromFlags(cmd *cobra.Command, k8sVersion string, drvName s
 		cc.ContainerVolumeMounts = []string{viper.GetString(mountString)}
 	}
 
+	if detect.IsCloudShell() {
+		cc.KubernetesConfig.ExtraOptions.Set("kubelet.cgroups-per-qos=false")
+		cc.KubernetesConfig.ExtraOptions.Set("kubelet.enforce-node-allocatable=\"\"")
+	}
+
 	return cc
 }
 
diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go
index 8a6da71577..c756965d03 100644
--- a/test/integration/start_stop_delete_test.go
+++ b/test/integration/start_stop_delete_test.go
@@ -83,10 +83,7 @@ func TestStartStop(t *testing.T) {
 				version string
 				args    []string
 			}{
-				{"cloud-shell", constants.DefaultKubernetesVersion, []string{
-					"--extra-config=kubelet.cgroups-per-qos=false",
-					"--extra-config=kubelet.enforce-node-allocatable=\"\"",
-				}},
+				{"cloud-shell", constants.DefaultKubernetesVersion, []string{}},
 			}
 		}