diff --git a/tox.ini b/tox.ini
index 38b27190c..ae7ff7b30 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,15 @@
 [tox]
-envlist = linters, py27, py3
+envlist = linters, py{27,36,37}-ansible{27,28,dev}
 
 [testenv]
+pip_pre = true
 deps = pipenv
        mock
-       ansible
+       ansibledev: git+https://github.com/ansible/ansible.git
+       ansible27: ansible<2.8
+       ansible28: ansible<2.9
 commands=
+    pipenv --python {basepython}
     pipenv install --dev #--ignore-pipfile --dev
     pipenv run py.test -v test
 
@@ -15,13 +19,3 @@ commands=
     pipenv install --dev
     pipenv run flake8 --version
     pipenv run flake8 setup.py docs ansible_runner test
-
-[testenv:py27]
-commands =
-    pipenv --python 2.7
-    {[testenv]commands}
-
-[testenv:py3]
-commands =
-    pipenv --python 3
-    {[testenv]commands}