diff --git a/test/aws/create_machineset.yml b/test/aws/create_machineset.yml
index 495a21ed7ba..406783d42fa 100644
--- a/test/aws/create_machineset.yml
+++ b/test/aws/create_machineset.yml
@@ -33,7 +33,7 @@
 - name: import machinespec
   oc_obj:
     state: present
-    namespace: "openshift-cluster-api"
+    namespace: "openshift-machine-api"
     kind: machineset
     name: "{{ machineset_name.result }}-centos"
     kubeconfig: "{{ kubeconfig_path }}"
@@ -44,7 +44,7 @@
   oc_obj:
     state: list
     kind: machines.machine.openshift.io
-    namespace: openshift-cluster-api
+    namespace: openshift-machine-api
     selector: "sigs.k8s.io/cluster-api-machineset={{ machineset_name.result }}-centos"
     kubeconfig: "{{ kubeconfig_path }}"
   register: new_machine
diff --git a/test/aws/get_machinesets.yml b/test/aws/get_machinesets.yml
index 081aed1cc8a..ab54ced2d5b 100644
--- a/test/aws/get_machinesets.yml
+++ b/test/aws/get_machinesets.yml
@@ -28,7 +28,7 @@
   oc_obj:
     state: list
     kind: machinesets.machine.openshift.io
-    namespace: openshift-cluster-api
+    namespace: openshift-machine-api
     selector: ""
     kubeconfig: "{{ kubeconfig_path }}"
   register: machineset
diff --git a/test/aws/scaleup.yml b/test/aws/scaleup.yml
index 02531005074..f17191b138a 100644
--- a/test/aws/scaleup.yml
+++ b/test/aws/scaleup.yml
@@ -122,7 +122,7 @@
     oc_obj:
       state: absent
       kind: machinesets.machine.openshift.io
-      namespace: openshift-cluster-api
+      namespace: openshift-machine-api
       name: "{{ item }}"
       kubeconfig: "{{ kubeconfig_path }}"
     with_items: "{{ pre_scaleup_machineset_names }}"