diff --git a/tests/test-configure-octavia.yml b/tests/test-configure-octavia.yml
index 3177af02..1fc1e79b 100644
--- a/tests/test-configure-octavia.yml
+++ b/tests/test-configure-octavia.yml
@@ -55,12 +55,15 @@
       git:
         repo: "https://git.openstack.org/openstack/diskimage-builder"
         dest: "{{ octavia_system_home_folder }}/diskimage-builder"
+        version: "2.9.0"
     - name: Create amphora image
       shell: "./diskimage-create.sh -o {{ octavia_system_home_folder }}/amphora-x64-haproxy.qcow2"
       args:
         chdir: "{{ octavia_system_home_folder }}/octavia/diskimage-create"
         creates: "{{ octavia_system_home_folder }}/amphora-x64-haproxy.qcow2"
       when: test_octavia_amphora | bool
+      tags:
+        - skip_ansible_lint
     - name: Change permission
       file:
         path: "{{ octavia_system_home_folder }}/octavia/bin/create_certificates.sh"
@@ -69,6 +72,8 @@
       shell: "{{ octavia_system_home_folder }}/octavia/bin/create_certificates.sh {{ octavia_system_home_folder }}/certs {{ octavia_system_home_folder }}/octavia/etc/certificates/openssl.cnf"
       args:
         creates: "{{ octavia_system_home_folder }}/certs/ca_01.pem"
+      tags:
+        - skip_ansible_lint
     - name: Fix certs/private directory access
       file:
         path: "{{ octavia_system_home_folder }}/certs/private"
diff --git a/tests/test-octavia.yml b/tests/test-octavia.yml
index 744ca975..7d0cd36d 100644
--- a/tests/test-octavia.yml
+++ b/tests/test-octavia.yml
@@ -82,11 +82,15 @@
         creates: "{{ octavia_system_home_folder }}/image"
       environment: "{{ env }}"
       when: test_octavia_amphora | bool
+      tags:
+        - skip_ansible_lint
     - name: Create ssh-key
       shell: >
           cat /dev/zero | ssh-keygen -q -N ""
       args:
         creates: /root/.ssh/id_rsa.pub
+      tags:
+        - skip_ansible_lint
     - name: Upload key to nova
       os_keypair:
         auth:
@@ -106,6 +110,8 @@
       shell: >
          neutron lbaas-loadbalancer-create --name test-lb public-subnet
       environment: "{{ env }}"
+      tags:
+        - skip_ansible_lint
     - name: Wait until LB is up
       shell: >
         neutron lbaas-loadbalancer-show test-lb | grep ONLINE
@@ -114,16 +120,22 @@
       until: lb_up|success
       retries: 100
       delay: 5
+      tags:
+        - skip_ansible_lint
     - name: Create a listener
       shell: >
         neutron lbaas-listener-create  --loadbalancer test-lb --protocol HTTP --protocol-port 80 --name listener
       environment: "{{ env }}"
+      tags:
+        - skip_ansible_lint
     - name: Curl the Listener
       shell: >
         curl -s -o /dev/null -w "%{http_code}" http://`neutron lbaas-loadbalancer-show test-lb | awk '/ vip_address / {print $4}'`
       environment: "{{ env }}"
       register: http_status_code
       when: test_octavia_amphora | bool
+      tags:
+        - skip_ansible_lint
     - name: Check that we got 503
       assert:
         that: