diff --git a/.travis.yml b/.travis.yml
index 2b44aa0..9f8dea7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,21 @@
 sudo: false
 language: python
-python:
-  - "pypy"
-  - "2.7"
-  - "3.3"
-  - "3.4"
-cache: pip
-# command to run tests
-script: make travis
+matrix:
+  include:
+    - python: 3.5
+      env: TOXENV=py35
+env:
+  - TOXENV=py27
+  - TOXENV=py33
+  - TOXENV=py34
+  - TOXENV=pypy
+  - TOXENV=flake8
+install: pip install tox
+script: tox
+cache:
+  directories:
+    - .tox
+    - $HOME/.cache/pip
 after_success: make coveralls
 notifications:
   email:
diff --git a/Makefile b/Makefile
index 884648c..ccf8456 100644
--- a/Makefile
+++ b/Makefile
@@ -67,14 +67,6 @@ endif
 	$(pip) install coveralls
 	$(pip) install --allow-all-external -e .
 
-travis: python
-	$(nose) -s --with-coverage --cover-package hy
-ifeq (PyPy,$(findstring PyPy,$(shell python -V 2>&1 | tail -1)))
-	@echo "skipping flake8 on pypy"
-else
-	flake8 hy bin tests
-endif
-
 coveralls:
 	$(coveralls)
 
diff --git a/setup.py b/setup.py
index 6791e52..5a276e2 100755
--- a/setup.py
+++ b/setup.py
@@ -89,6 +89,7 @@ setup(
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
         "Topic :: Software Development :: Code Generators",
         "Topic :: Software Development :: Compilers",
         "Topic :: Software Development :: Libraries",
diff --git a/tox.ini b/tox.ini
index 9789610..2bea02d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,13 @@
 [tox]
-envlist = py27,pypy,py33,flake8
+envlist = py27,pypy,py33,py34,py35,flake8
 skipsdist = True
 
 [testenv]
 commands =
  pip install --allow-all-external -e .
  nosetests
+passenv =
+ TERM
 deps =
  -rrequirements-dev.txt