diff --git a/.yamllint b/.yamllint
index 85528611eb..6e9f06eaa0 100644
--- a/.yamllint
+++ b/.yamllint
@@ -1,3 +1,4 @@
+---
 extends: default
 ignore: |
   .tox/
@@ -8,8 +9,8 @@ rules:
   braces:
     max-spaces-inside: 1
   comments:
-    # Ignore first space in comment because we set default options as:
-    #openstack_version: "pike"
     require-starting-space: true
+    # Ignore comment validation in globals.yml - we break the
+    # require-starting-space rule.
     ignore: |
-      etc/kolla/globals.yml
\ No newline at end of file
+      etc/kolla/globals.yml
diff --git a/tests/pre.yml b/tests/pre.yml
index cbad56d190..53f63088bf 100644
--- a/tests/pre.yml
+++ b/tests/pre.yml
@@ -2,6 +2,9 @@
 - hosts: all
   vars:
     logs_dir: "/tmp/logs"
+  roles:
+    - bindep
+    - multi-node-firewall
   tasks:
     - name: Install dbus for debian system
       apt: name=dbus
@@ -30,5 +33,3 @@
       hostname:
         name: "{{ inventory_hostname }}"
       become: true
-  roles:
-    - multi-node-firewall