diff --git a/.travis.yml b/.travis.yml
index 7a25026e..676f105b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,21 @@
 language: python
-python:
-  - "2.6"
-  - "2.7"
 addons:
   apt:
     packages:
     - time
+
+matrix:
+  include:
+    - python: "2.7"
+      env: FEATURES=openstack,ec2,daemon
+    - python: "2.6"
+      env: FEATURES=
+
 install:
   - "pip install --upgrade setuptools pip"
   - "pip install 'pytest==3.2.5' mock"
-  - "pip install -e .[openstack,ec2,daemon]"
+  - "pip install -e .[$FEATURES]"
+
 script:
   - export BOTO_CONFIG=/dev/null
   - pytest -v