diff --git a/.travis.yml b/.travis.yml
index 8401942..6c1dbfe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,23 @@
 language: python
 
-before_install: pip install tox
+python:
+  - 2.7
+  - 3.3
+  - 3.4
+  - 3.5
 
-env:
-  - TOXENV=py27-flask-09
-  - TOXENV=py27-flask-010
-  - TOXENV=py33
-  - TOXENV=py34
+matrix:
+  include:
+    - python: 2.7
+    - FLASK="<0.10"
 
-script: tox -e $TOXENV
+install:
+  - pip install flask$FLASK
+  - pip install pytest coverage coveralls
+  - python setup.py install
+
+script:
+  - coverage run --source=flask_sqlalchemy_cache setup.py test
+
+after_success:
+  - coveralls
diff --git a/setup.py b/setup.py
index 5774edd..4edf344 100644
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,7 @@
         'Flask-Cache',
         'Flask-SQLAlchemy',
     ],
+    test_suite='flask_sqlalchemy_cache.tests',
     classifiers=[
         'Environment :: Web Environment',
         'Intended Audience :: Developers',
diff --git a/tox.ini b/tox.ini
index 0afb4f6..448e073 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27-flask-09, py27-flask-010, py33, py34
+envlist = py27-flask-09, py27-flask-010, py33, py34, py35
 
 [testenv]
 deps=Flask-SQLAlchemy
@@ -24,3 +24,7 @@ deps={[testenv]deps}
 [testenv:py34]
 deps={[testenv]deps}
      Flask
+
+[testenv:py35]
+deps={[testenv]deps}
+     Flask