diff --git a/requirements.txt b/requirements.txt
index e6ed20d..9eee6a7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 argparse
-arrow>=0.4.2
+arrow>=0.4.2,<0.15.0
 invoke
 GitPython>=2.1.8
 mock==1.0.1
diff --git a/tox.ini b/tox.ini
index 8bd2364..25b3f2c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py35
+envlist = py27,py36
 [testenv]
 passenv=PWD
 deps=