diff --git a/.travis.yml b/.travis.yml
index beba9be..4d87bdb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ python:
   - "2.7"
   - "3.3"
   - "3.4"
+  - "3.5"
   - "pypy"
 
 install:
@@ -12,6 +13,13 @@ install:
   - pip install coverage coveralls
   - "if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install importlib; fi"
 
+addons:
+  apt:
+    sources:
+      - deadsnakes
+    packages:
+      - python3.5
+
 services:
   - mongodb
 
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 3027ffb..20f596d 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,10 +1,9 @@
 Flask-SQLAlchemy>=1.0
 bcrypt>=1.0.2,<2.0.0
-flask-mongoengine>=0.7.0
+flask-mongoengine>=0.7.0,<0.7.3
 flask-peewee>=0.6.5
 pymongo==2.8
 pytest>=2.5.2
-pytest-cache>=1.0
 pytest-cov>=1.6
 pytest-flakes>=0.2
 pytest-pep8>=1.0.5
diff --git a/setup.py b/setup.py
index 072cd5d..b41e026 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ class PyTest(TestCommand):
             '--cov-report', 'term-missing',
             '--pep8',
             '--flakes',
-            '--clearcache'
+            '--cache-clear'
         ]
         self.test_suite = True
 
diff --git a/tox.ini b/tox.ini
index 15fa2e1..67f93ac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py33, py34, pypy
+envlist = py26, py27, py33, py34, py35, pypy
 
 [testenv]
 deps =