diff --git a/.travis.yml b/.travis.yml
index 4c8f91c4e402c618db49c3e947d970b369cda970..41e860460aada34cebe5912b5054664f0470dbba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,25 @@
 # TODO: test condor
 language: python
-python: 2.7
-sudo: required
-env:
-  - TOX_ENV=py27-lint
-  - TOX_ENV=py34-lint
-  - TOX_ENV=py27-lint-readme
-  - TOX_ENV=lint-docs
-  - TOX_ENV=py27 SETUP=true
-  - TOX_ENV=py34 SETUP=true
-  - TOX_ENV=py34-unit SETUP=true
-  - TOX_ENV=py27-install-wheel
+matrix:
+  include:
+  - python: 2.7
+    env: TOX_ENV=py27-lint
+  - python: 2.7
+    env: TOX_ENV=py27-lint-readme
+  - python: 2.7
+    env: TOX_ENV=lint-docs
+  - python: 2.7
+    env: TOX_ENV=py27 SETUP=true
+  - python: 2.7
+    env:  TOX_ENV=py27-install-wheel
+  - python: 3.5
+    env: TOX_ENV=py35-lint
+  - python: 3.5
+    env: TOX_ENV=py35 SETUP=true
+  - python: 3.5
+    env: TOX_ENV=py35-unit SETUP=true
+  allow_failures:
+    - env: TOX_ENV=py35 SETUP=true
 
 install:
   - pip install tox
@@ -18,9 +27,5 @@ install:
 
 script: export PULSAR_TEST_KEY=test_data/testkey; export TEST_WEBAPP_POST_SHUTDOWN_SLEEP=1; . local_env.sh; tox -e $TOX_ENV
 
-matrix:
-  allow_failures:
-    - env: TOX_ENV=py34 SETUP=true
-
 after_success:
   - coveralls
diff --git a/tox.ini b/tox.ini
index d550a99f9ace8823185ae3e327a107b00345800d..d4561361e6115111e05c54677dfeb38cb538d6be 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27-lint, py27-lint-readme, lint-docs, py34-lint,  py27, py34, py27-unit, py34-unit
+envlist = py27-lint, py27-lint-readme, lint-docs, py35-lint,  py27, py34, py27-unit, py34-unit
 toxworkdir={env:TOX_WORK_DIR:.tox}
 
 [testenv]
@@ -13,13 +13,13 @@ passenv = DRMAA_LIBRARY_PATH
 [testenv:py27-unit]
 commands = nosetests --exclude '.*integration.*' []
 
-[testenv:py34]
+[testenv:py35]
 deps =
     -rrequirements3.txt
     -rdev-requirements.txt
     drmaa
 
-[testenv:py34-unit]
+[testenv:py35-unit]
 commands = nosetests --verbose --exclude '.*integration.*' []
 deps =
     -rrequirements3.txt
@@ -32,7 +32,7 @@ commands = flake8 pulsar test
 skip_install = True
 deps = flake8
 
-[testenv:py34-lint]
+[testenv:py35-lint]
 commands = flake8 pulsar test
 skip_install = True
 deps = flake8