diff --git a/.ansible-lint b/.ansible-lint
index b8f7f54bd..2bd18414c 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -12,5 +12,4 @@ skip_list:
   - '404'
   - '502'
   - '503'
-  - '504'
   - '701'
diff --git a/tests/cloud_playbooks/create-aws.yml b/tests/cloud_playbooks/create-aws.yml
index d797a573b..7dbf3d6c3 100644
--- a/tests/cloud_playbooks/create-aws.yml
+++ b/tests/cloud_playbooks/create-aws.yml
@@ -24,10 +24,10 @@
       dest: "{{ inventory_path }}"
 
   - name: Wait until SSH is available
-    local_action:
-      module: wait_for
+    wait_for:
       host: "{{ item.public_ip }}"
       port: 22
       timeout: 300
       state: started
+    delegate_to: localhost
     with_items: "{{ec2.instances}}"
diff --git a/tests/cloud_playbooks/create-gce.yml b/tests/cloud_playbooks/create-gce.yml
index 616c15439..3e7093bb9 100644
--- a/tests/cloud_playbooks/create-gce.yml
+++ b/tests/cloud_playbooks/create-gce.yml
@@ -77,4 +77,10 @@
   gather_facts: false
   tasks:
     - name: Wait for SSH to come up.
-      local_action: wait_for host={{inventory_hostname}} port=22 delay=60 timeout=240 state=started
+      wait_for:
+        host: "{{ inventory_hostname }}"
+        port: 22
+        delay: 60
+        timeout: 240
+        state: started
+      delegate_to: localhost
diff --git a/tests/cloud_playbooks/delete-aws.yml b/tests/cloud_playbooks/delete-aws.yml
index e1114b117..bffb8c60f 100644
--- a/tests/cloud_playbooks/delete-aws.yml
+++ b/tests/cloud_playbooks/delete-aws.yml
@@ -7,11 +7,11 @@
     action: ec2_facts
 
   - name: Terminate EC2 instances
-    local_action:
-      module: ec2
+    ec2:
       aws_access_key: "{{ aws_access_key }}"
       aws_secret_key: "{{ aws_secret_key }}"
       state: absent
       instance_ids: "{{ ansible_ec2_instance_id }}"
       region: "{{ ansible_ec2_placement_region }}"
       wait: True
+    delegate_to: localhost