diff --git a/.travis.yml b/.travis.yml
index 0fec74b1c..f2dacf6d3 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,17 +5,24 @@ python:
  - "2.7"
 
 env:
-  global:
-    - TYPE=standard MONILITHIC=y DIRECT_INITRC=y
-    - TYPE=standard MONILITHIC=n DIRECT_INITRC=y
-    - TYPE=mcs MONILITHIC=y DIRECT_INITRC=y
-    - TYPE=mcs MONILITHIC=n DIRECT_INITRC=y
-    - TYPE=mls MONILITHIC=y DIRECT_INITRC=y
-    - TYPE=mls MONILITHIC=n DIRECT_INITRC=y
-  matrix:
-    - DISTRO=redhat
-    - DISTRO=debian
-    - DISTRO=gentoo
+  - TYPE=standard DISTRO=redhat DIRECT_INITRC=y MONOLITHIC=y
+  - TYPE=standard DISTRO=redhat DIRECT_INITRC=y MONOLITHIC=n
+  - TYPE=standard DISTRO=debian DIRECT_INITRC=y MONOLITHIC=y
+  - TYPE=standard DISTRO=debian DIRECT_INITRC=y MONOLITHIC=n
+  - TYPE=standard DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=y
+  - TYPE=standard DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n
+  - TYPE=mcs DISTRO=redhat DIRECT_INITRC=y MONOLITHIC=y
+  - TYPE=mcs DISTRO=redhat DIRECT_INITRC=y MONOLITHIC=n
+  - TYPE=mcs DISTRO=debian DIRECT_INITRC=y MONOLITHIC=y
+  - TYPE=mcs DISTRO=debian DIRECT_INITRC=y MONOLITHIC=n
+  - TYPE=mcs DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=y
+  - TYPE=mcs DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n
+  - TYPE=mls DISTRO=redhat DIRECT_INITRC=y MONOLITHIC=y
+  - TYPE=mls DISTRO=redhat DIRECT_INITRC=y MONOLITHIC=n
+  - TYPE=mls DISTRO=debian DIRECT_INITRC=y MONOLITHIC=y
+  - TYPE=mls DISTRO=debian DIRECT_INITRC=y MONOLITHIC=n
+  - TYPE=mls DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=y
+  - TYPE=mls DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n
 
 # Install SELinux userspace utilities dependencies
 before_install: