diff --git a/.travis.yml b/.travis.yml
index 9f2a5a3eb..83c627442 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ install:
   - pip install ansible
 
   # Create ansible.cfg with correct roles_path and local_tmp
-  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
+  - "{ echo '[defaults]'; echo 'roles_path = ./roles/'; } >> ansible.cfg"
 
 script:
   #  Basic role syntax check
diff --git a/tests/test.yml b/tests/test.yml
index b1a6d5521..3d858cc75 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -1,61 +1,65 @@
 ---
 - hosts: localhost
   remote_user: root
-  # TODO: Making a anisble-iiab roles for ansible-galaxy
-  #  roles:
-  #      - iiab
-  # For now hardcoding all the roles manually with  ls -l roles/ | cut -d " " -f 10
   roles:
-    - ../roles/1-prep
-    - ../roles/2-common
-    - ../roles/3-base-server
-    - ../roles/4-server-options
-    - ../roles/5-xo-services
-    - ../roles/6-generic-apps
-    - ../roles/7-edu-apps
-    - ../roles/8-mgmt-tools
-    - ../roles/9-local-addons
-    - ../roles/activity-server
-    - ../roles/ajenti
-    - ../roles/authserver
-    - ../roles/awstats
-    - ../roles/calibre
-    - ../roles/cups
-    - ../roles/debian_schooltool
-    - ../roles/docker
-    - ../roles/dokuwiki
-    - ../roles/ejabberd
-    - ../roles/ejabberd_xs
-    - ../roles/elgg
-    # Disabling gateway doesn't contain any tasks?
-    #- ../roles/gateway
-    - ../roles/httpd
-    - ../roles/idmgr
-    - ../roles/iiab-admin
-    - ../roles/kalite
-    - ../roles/kiwix
-    - ../roles/mongodb
-    - ../roles/monit
-    - ../roles/moodle
-    - ../roles/moodle-1.9
-    - ../roles/munin
-    - ../roles/mysql
-    - ../roles/network
-    - ../roles/nextcloud
-    - ../roles/openvpn
-    - ../roles/osm
-    - ../roles/owncloud
-    - ../roles/pathagar
-    - ../roles/phpmyadmin
-    - ../roles/postgresql
-    - ../roles/rachel
-    - ../roles/samba
-    - ../roles/schooltool
-    - ../roles/sshd
-    - ../roles/sugarizer
-    - ../roles/sugar-stats
-    - ../roles/teamviewer
-    - ../roles/usb-lib
-    - ../roles/vnstat
-    - ../roles/wordpress
-    - ../roles/xovis
+    - { role: 0-init }
+    - { role: 1-prep }
+    - { role: 2-common }
+    - { role: 3-base-server }
+    - { role: 4-server-options }
+    - { role: 5-xo-services }
+    - { role: 6-generic-apps }
+    - { role: 7-edu-apps }
+    - { role: 8-mgmt-tools }
+    - { role: 9-local-addons }
+    #- { role: activity-server
+    #- { role: ajenti }
+    #- { role: authserver }
+    - { role: awstats }
+    - { role: calibre }
+    - { role: calibre-web }
+    - { role: cups }
+    #- { role: debian_schooltool }
+    #- { role: docker }
+    - { role: dokuwiki }
+    - { role: ejabberd }
+    #- { role: ejabberd_xs }
+    - { role: elgg }
+    - { role: homepage }
+    - { role: httpd }
+    #- { role: idmgr }
+    - { role: iiab-admin }
+    - { role: kalite }
+    - { role: kiwix }
+    - { role: kolibri }
+    - { role: mediawiki }
+    - { role: mongodb }
+    - { role: monit }
+    - { role: moodle }
+    #- { role: moodle-1.9 }
+    - { role: munin }
+    - { role: mysql }
+    - { role: network }
+    - { role: nextcloud }
+    #- { role: nodogsplash }
+    - { role: openvpn }
+    - { role: osm }
+    #- { role: owncloud }
+    #- { role: pathagar }
+    - { role: phpmyadmin }
+    - { role: postgresql }
+    #- { role: rachel }
+    - { role: samba }
+    #- { role: schooltool }
+    - { role: sshd }
+    - { role: sugarizer }
+    #- { role: sugar-stats }
+    - { role: teamviewer }
+    - { role: transmission }
+    - { role: usb-lib }
+    - { role: vnstat }
+    - { role: wordpress }
+    #- { roles: xovis }
+
+# Let's try to keep the above list synchronized with:
+# https://github.com/iiab/iiab/blob/master/unmaintained-roles.txt