diff --git a/tests/test-ironic-cli.yml b/tests/test-ironic-cli.yml
index 01509725..3992436d 100644
--- a/tests/test-ironic-cli.yml
+++ b/tests/test-ironic-cli.yml
@@ -23,6 +23,9 @@
       shell: >
         . /root/openrc && ironic chassis-list
       register: chassis_table
+      tags:
+        - skip_ansible_lint
+
     - name: Check that the chassis-list command succeeded
       assert:
         that:
@@ -32,6 +35,9 @@
       shell: >
         . /root/openrc && ironic node-list
       register: node_table
+      tags:
+        - skip_ansible_lint
+
     - name: Check that the node-list command succeeded
       assert:
         that:
@@ -41,6 +47,9 @@
       shell: >
         . /root/openrc && ironic driver-list
       register: driver_table
+      tags:
+        - skip_ansible_lint
+
     - name: Check that the driver-list command succeeded
       assert:
         that:
@@ -56,6 +65,9 @@
         -i deploy_kernel="http://example.com/kernel.tgz"
         -n happynode
       register: node_created
+      tags:
+        - skip_ansible_lint
+
     - name: Check that the node was created
       assert:
         that:
@@ -70,6 +82,9 @@
       shell: >
         . /root/openrc && ironic node-validate happynode
       register: node_validated
+      tags:
+        - skip_ansible_lint
+
     - name: Check that node-validate returned something sensible
       assert:
         that:
@@ -79,6 +94,9 @@
       shell: >
         . /root/openrc && ironic port-create -n $(ironic node-list | grep 'happynode' | cut -f 2 -d "|") -a de:ad:be:ef:de:ad
       register: port_created
+      tags:
+        - skip_ansible_lint
+
     - name: Check that the port was created
       assert:
         that:
@@ -88,6 +106,9 @@
       shell: >
         . /root/openrc && ironic node-update happynode replace name=cheerynode
       register: name_changed
+      tags:
+        - skip_ansible_lint
+
     - name: Check that the name was changed
       assert:
         that:
@@ -97,6 +118,9 @@
       shell: >
         . /root/openrc && ironic node-delete cheerynode
       register: node_deleted
+      tags:
+        - skip_ansible_lint
+
     - name: Check that a node was deleted
       assert:
         that:
diff --git a/tests/test-rest-api.yml b/tests/test-rest-api.yml
index 9fdfdbb6..bfdde959 100644
--- a/tests/test-rest-api.yml
+++ b/tests/test-rest-api.yml
@@ -14,18 +14,24 @@
       with_items:
         - httplib2
         - python-openstackclient
+
     - name: Get auth token
       shell: >
         . /root/openrc && openstack token issue --format yaml | awk '/^id\:/ {print $2}'
       register: get_keystone_token
+      tags:
+       - skip_ansible_lint
+
     - name: set token
       set_fact:
         keystone_token: "{{ get_keystone_token.stdout }}"
+
     - name: Check the ironic-api
       uri:
         url: "{{ ironic_service_publicuri }}"
         HEADER_X-Auth-Token: "{{ keystone_token }}"
         status_code: 200
+
     - name: list chassis
       uri:
         url: "{{ ironic_service_publicuri }}/v1/chassis"
@@ -33,8 +39,10 @@
         status_code: 200
         return_content: yes
       register: chassis_list
+
     - name: test chassis list
       assert: that="chassis_list.json.chassis == []"
+
     - name: list drivers
       uri:
         HEADER_X-Auth-Token: "{{ keystone_token }}"
@@ -45,6 +53,7 @@
     # Returning an empty driver list currently as of 20/09/2016
     # - name: test drivers
     #   assert: that="driver_list.json.drivers[0].name == 'agent_ipmitool'"
+
     - name: list nodes
       uri:
         url: "{{ ironic_service_publicuri }}/v1/nodes"
@@ -52,6 +61,7 @@
         status_code: 200
         return_content: yes
       register: node_list
+
     - name: test nodes list is empty
       assert: that="node_list.json.nodes == []"
     # Failing with an HTTP 400 as of 20/09/2016