diff --git a/.travis.yml b/.travis.yml
index 6fb5198dc9..d030e014f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,12 +5,14 @@ env:
   - TOXENV=py26
   - TOXENV=py27
   - TOXENV=py34
+  - TOXENV=py35
 addons:
   apt:
     sources:
       - deadsnakes
     packages:
       - python2.4
+      - python3.5-dev
 install:
   - pip install tox PyYAML Jinja2 sphinx
 script:
diff --git a/tox.ini b/tox.ini
index 02a3d71f2b..ec700764ff 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,33 +1,13 @@
 [tox]
-envlist = {py26,py27,py34}
+envlist = py26,py27,py34,py35
 
 [testenv]
-commands = make tests
 deps = -r{toxinidir}/test-requirements.txt
 whitelist_externals = make
-
-[testenv:py26]
 commands =
     python --version
-    python -m compileall -fq -x 'test|samples|contrib/inventory/vagrant.py' lib test contrib
-    make tests
-deps = -r{toxinidir}/test-requirements.txt
-whitelist_externals =
-    make
-
-[testenv:py27]
-commands =
-    python --version
-    python -m compileall -fq -x 'test|samples' lib test contrib
-    make tests
-deps = -r{toxinidir}/test-requirements.txt
-whitelist_externals = make
-
-[testenv:py34]
-commands =
-    python --version
-    python -m compileall -fq -x 'lib/ansible/module_utils|lib/ansible/modules' lib test contrib
+    py26: python -m compileall -fq -x 'test|samples|contrib/inventory/vagrant.py' lib test contrib
+    py27: python -m compileall -fq -x 'test|samples' lib test contrib
+    py{34,35}: python -m compileall -fq -x 'lib/ansible/module_utils|lib/ansible/modules' lib test contrib
     # Unittests need lots of work to make code python3 compatible
-    #make tests
-deps = -r{toxinidir}/test-requirements.txt
-whitelist_externals = make
+    py{26,27}: make tests