diff --git a/.travis.yml b/.travis.yml
index ba2b28b..89746c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: c
 addons:
   apt:
-    packages:
+    packages: &common_apt_packages
       # graphical environment
       - scrot
       - fluxbox
@@ -22,181 +22,62 @@ addons:
 
 matrix:
   include:
-    # Thanks to https://keyholesoftware.com/2012/12/05/building_vagrant_boxes_with_veewee_on_travis/ for making me realize that VirtualBox will actually work with sudo
-    - env: MODE=qemu-system-i386
-      sudo: false
-      addons:
-        apt:
-          packages:
-            - qemu
-            - qemu-system-x86
-            # common:
-            # graphical environment
-            - scrot
-            - fluxbox
-            # automated GUI testing
-            - sikuli-ide
-            # Missing dependencies for sikuli-ide
-            #- libantlr3-runtime-java # on 16.04
-            - antlr3 # on 14.04
-            #- jaffl-java # unavailable on Travis
-            - libjna-java
-            - libcommons-cli-java
-            - libjson-simple-java
-            - libdc1394-22
-            - libdc1394-22-dev
-            - wmctrl
-            # example-os build dependencies:
-            - nasm
-    - env: MODE=qemu-system-arm
-      sudo: false
-      addons:
-        apt:
-          packages:
-            - qemu
-            - qemu-system-arm
-            # common:
-            # graphical environment
-            - scrot
-            - fluxbox
-            # automated GUI testing
-            - sikuli-ide
-            # Missing dependencies for sikuli-ide
-            #- libantlr3-runtime-java # on 16.04
-            - antlr3 # on 14.04
-            #- jaffl-java # unavailable on Travis
-            - libjna-java
-            - libcommons-cli-java
-            - libjson-simple-java
-            - libdc1394-22
-            - libdc1394-22-dev
-            - wmctrl
-            # example-os build dependencies:
-            - nasm
-    - env: MODE=virtualbox
-      sudo: true
-      addons:
-        apt:
-          packages:
-            #- virtualbox
-            # common:
-            # graphical environment
-            - scrot
-            - fluxbox
-            # automated GUI testing
-            - sikuli-ide
-            # Missing dependencies for sikuli-ide
-            #- libantlr3-runtime-java # on 16.04
-            - antlr3 # on 14.04
-            #- jaffl-java # unavailable on Travis
-            - libjna-java
-            - libcommons-cli-java
-            - libjson-simple-java
-            - libdc1394-22
-            - libdc1394-22-dev
-            - wmctrl
-            # example-os build dependencies:
-            - nasm
-    - env: MODE=bochs
-      sudo: false
-      addons:
-        apt:
-          packages:
-            - bochs-sdl
-            # common:
-            # graphical environment
-            - scrot
-            - fluxbox
-            # automated GUI testing
-            - sikuli-ide
-            # Missing dependencies for sikuli-ide
-            #- libantlr3-runtime-java # on 16.04
-            - antlr3 # on 14.04
-            #- jaffl-java # unavailable on Travis
-            - libjna-java
-            - libcommons-cli-java
-            - libjson-simple-java
-            - libdc1394-22
-            - libdc1394-22-dev
-            - wmctrl
-            # example-os build dependencies:
-            - nasm
-    - env: MODE=gui-sh
-      sudo: false
-      addons:
-        apt:
-          packages:
-            # common:
-            # graphical environment
-            - scrot
-            - fluxbox
-            # automated GUI testing
-            - sikuli-ide
-            # Missing dependencies for sikuli-ide
-            #- libantlr3-runtime-java # on 16.04
-            - antlr3 # on 14.04
-            #- jaffl-java # unavailable on Travis
-            - libjna-java
-            - libcommons-cli-java
-            - libjson-simple-java
-            - libdc1394-22
-            - libdc1394-22-dev
-            - wmctrl
-            # example-os build dependencies:
-            - nasm
-    - env: MODE=dosbox
-      sudo: false
-      addons:
-        apt:
-          packages:
-            - dosbox
-            # common:
-            # graphical environment
-            - scrot
-            - fluxbox
-            # automated GUI testing
-            - sikuli-ide
-            # Missing dependencies for sikuli-ide
-            #- libantlr3-runtime-java # on 16.04
-            - antlr3 # on 14.04
-            #- jaffl-java # unavailable on Travis
-            - libjna-java
-            - libcommons-cli-java
-            - libjson-simple-java
-            - libdc1394-22
-            - libdc1394-22-dev
-            - wmctrl
-            # example-os build dependencies:
-            - nasm
     - env: MODE=self-test # Ensure that the Makefile works, especially with parallel builds.
       script: (cd example-os && make -j 10)
       sudo: true
       addons:
         apt:
           packages:
+            - *common_apt_packages
             - qemu
             - qemu-system-x86
             - qemu-system-arm
             - bochs-sdl
             - dosbox
-            # common:
-            # graphical environment
-            - scrot
-            - fluxbox
-            # automated GUI testing
-            - sikuli-ide
-            # Missing dependencies for sikuli-ide
-            #- libantlr3-runtime-java # on 16.04
-            - antlr3 # on 14.04
-            #- jaffl-java # unavailable on Travis
-            - libjna-java
-            - libcommons-cli-java
-            - libjson-simple-java
-            - libdc1394-22
-            - libdc1394-22-dev
-            - wmctrl
-            # example-os build dependencies:
-            - nasm
+    - env: MODE=qemu-system-i386
+      sudo: false
+      addons:
+        apt:
+          packages:
+            - *common_apt_packages
+            - qemu
+            - qemu-system-x86
+    - env: MODE=qemu-system-arm
+      sudo: false
+      addons:
+        apt:
+          packages:
+            - *common_apt_packages
+            - qemu
+            - qemu-system-arm
+    # Thanks to https://keyholesoftware.com/2012/12/05/building_vagrant_boxes_with_veewee_on_travis/ for making me realize that VirtualBox will actually work with sudo
+    - env: MODE=virtualbox
+      sudo: true
+      addons:
+        apt:
+          packages:
+            - *common_apt_packages
+            #- virtualbox
+    - env: MODE=bochs
+      sudo: false
+      addons:
+        apt:
+          packages:
+            - *common_apt_packages
+            - bochs-sdl
+    - env: MODE=gui-sh
+      sudo: false
+      addons:
+        apt:
+          packages:
+            - *common_apt_packages
+    - env: MODE=dosbox
+      sudo: false
+      addons:
+        apt:
+          packages:
+            - *common_apt_packages
+            - dosbox
 
 install:
   - ./utils/install-sikulix.sh