diff --git a/docs/etcd3-migration.md b/docs/etcd3-migration.md
index 1c245c06c5..17043be0f6 100644
--- a/docs/etcd3-migration.md
+++ b/docs/etcd3-migration.md
@@ -79,7 +79,7 @@ If you don't already have TLS enabled with etcd, you can adopt etcd-manager befo
 kOps 1.12 & kubernetes 1.12 by running:
 
 ```bash
-kops set cluster cluster.spec.etcdClusters[*].provider=manager
+kops edit cluster --set=cluster.spec.etcdClusters[*].provider=manager
 ```
 
 Then you can proceed to update to kOps 1.12 & kubernetes 1.12, as this becomes the default.
@@ -89,7 +89,7 @@ Then you can proceed to update to kOps 1.12 & kubernetes 1.12, as this becomes t
 To delay adopting etcd-manager with kOps 1.12, specify the provider as type `legacy`:
 
 ```bash
-kops set cluster cluster.spec.etcdClusters[*].provider=legacy
+kops edit cluster --set=cluster.spec.etcdClusters[*].provider=legacy
 ```
 
 To remove, `kops edit` your cluster and delete the `provider: Legacy` lines from both etcdCluster blocks.
@@ -99,7 +99,7 @@ To remove, `kops edit` your cluster and delete the `provider: Legacy` lines from
 To delay adopting etcd3 with kOps 1.12, specify the etcd version as 2.2.1
 
 ```bash
-kops set cluster cluster.spec.etcdClusters[*].version=2.2.1
+kops edit cluster --set=cluster.spec.etcdClusters[*].version=2.2.1
 ```
 
 To remove, `kops edit` your cluster and delete the `version: 2.2.1` lines from both etcdCluster blocks.
diff --git a/tests/e2e/scenarios/addon-resource-tracking/run-test.sh b/tests/e2e/scenarios/addon-resource-tracking/run-test.sh
index 6ffc00a059..c9b369fdbc 100755
--- a/tests/e2e/scenarios/addon-resource-tracking/run-test.sh
+++ b/tests/e2e/scenarios/addon-resource-tracking/run-test.sh
@@ -47,7 +47,7 @@ KOPS=$(kops-acquire-latest)
 cp "${KOPS}" "${WORKSPACE}/kops"
 
 # Switch to queue mode. This should remove the DS and install a Deployment instead
-kops set cluster "${CLUSTER_NAME}" "cluster.spec.nodeTerminationHandler.enableSQSTerminationDraining=true"
+kops edit cluster "${CLUSTER_NAME}" "--set=cluster.spec.nodeTerminationHandler.enableSQSTerminationDraining=true"
 
 # allow downgrade is a bug where the version written to VFS is not the same as the running version.
 kops update cluster --allow-kops-downgrade
diff --git a/tests/e2e/scenarios/upgrade-ab/run-test.sh b/tests/e2e/scenarios/upgrade-ab/run-test.sh
index 0b0c92aed0..5409d6b5ee 100755
--- a/tests/e2e/scenarios/upgrade-ab/run-test.sh
+++ b/tests/e2e/scenarios/upgrade-ab/run-test.sh
@@ -52,7 +52,7 @@ KOPS_B=$(kops-download-from-base)
 
 KOPS="${KOPS_B}"
 
-"${KOPS_B}" set cluster "${CLUSTER_NAME}" "cluster.spec.kubernetesVersion=${K8S_VERSION_B}"
+"${KOPS_B}" edit cluster "${CLUSTER_NAME}" "--set=cluster.spec.kubernetesVersion=${K8S_VERSION_B}"
 
 "${KOPS_B}" update cluster
 "${KOPS_B}" update cluster --admin --yes