diff --git a/files/etc/init.d/zuul-launcher b/files/etc/init.d/zuul-launcher
index 2704cd0..0d63924 100644
--- a/files/etc/init.d/zuul-launcher
+++ b/files/etc/init.d/zuul-launcher
@@ -1,6 +1,6 @@
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:          zuul
+# Provides:          zuul-launcher
 # Required-Start:    $remote_fs $syslog
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
diff --git a/files/etc/init.d/zuul-merger b/files/etc/init.d/zuul-merger
index 344bd56..3daf11a 100644
--- a/files/etc/init.d/zuul-merger
+++ b/files/etc/init.d/zuul-merger
@@ -1,6 +1,6 @@
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:          zuul
+# Provides:          zuul-merger
 # Required-Start:    $remote_fs $syslog
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
diff --git a/files/etc/init.d/zuul-server b/files/etc/init.d/zuul-server
index a453a90..d548413 100644
--- a/files/etc/init.d/zuul-server
+++ b/files/etc/init.d/zuul-server
@@ -1,6 +1,6 @@
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:          zuul
+# Provides:          zuul-server
 # Required-Start:    $remote_fs $syslog
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
diff --git a/tests/ansible.cfg b/tests/ansible.cfg
index 2d4c5f9..6c8a344 100644
--- a/tests/ansible.cfg
+++ b/tests/ansible.cfg
@@ -1,2 +1,2 @@
 [defaults]
-roles_path = ..
+roles_path = ../..
diff --git a/tests/test.yaml b/tests/test.yaml
index 29de2fa..6b99b58 100644
--- a/tests/test.yaml
+++ b/tests/test.yaml
@@ -29,13 +29,16 @@
   post_tasks:
     - name: Ensure zuul_user_name is zuul.
       shell: /usr/bin/getent passwd zuul
+      tags: skip_ansible_lint
 
     - name: Ensure zuul_user_group is zuul.
       shell: /usr/bin/getent group zuul
+      tags: skip_ansible_lint
 
     - name: Register zuul_user_home_getent.
       shell: '/usr/bin/getent passwd zuul | cut -d: -f6'
       register: zuul_user_home_getent
+      tags: skip_ansible_lint
 
     - name: Assert zuul_user_home is /var/lib/zuul.
       assert: