diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index 9386697..ffd072a 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -25,8 +25,12 @@ jobs:
           - tox_env: lint
           - tox_env: py36
             PREFIX: PYTEST_REQPASS=5
+          - tox_env: py36-devel
+            PREFIX: PYTEST_REQPASS=5
           - tox_env: py39
             PREFIX: PYTEST_REQPASS=5
+          - tox_env: py39-devel
+            PREFIX: PYTEST_REQPASS=5
           - tox_env: packaging
 
     steps:
diff --git a/setup.cfg b/setup.cfg
index d69dd3c..5d85d81 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -70,19 +70,7 @@ install_requires =
 
 [options.extras_require]
 test =
-    ansi2html  # soft-dependency of pytest-html
-    coverage>=4.4, < 5  # drop '<5' when we drop py27 as we cannot mix them
-    flake8>=3.6.0, < 4
-
-    mock>=3.0.5, < 4
-    pytest>=4.6.3, < 5
-    pytest-cov>=2.7.1, < 3
-    pytest-helpers-namespace>=2019.1.8, < 2020
-    pytest-html
-    pytest-mock>=1.10.4, < 2
-    pytest-verbose-parametrize>=1.7.0, < 2
-    pytest-xdist>=1.29.0, < 2
-    pytest-dependency
+    molecule[test]
 
 [options.entry_points]
 molecule.driver =
diff --git a/tox.ini b/tox.ini
index 48b6d2b..d57a978 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,11 @@
 # For more information about tox, see https://tox.readthedocs.io/en/latest/
 [tox]
 minversion = 3.9.0
-envlist = lint,packaging,py{36,37,38,39},devel,distros
-skipsdist = True
+envlist =
+    lint
+    packaging
+    py{36,37,38,39}
+    py{36,37,38,39}-{devel}
 skip_missing_interpreters = True
 isolated_build = True
 
@@ -11,6 +14,9 @@ description =
     Unit testing
 usedevelop = True
 extras = test
+deps =
+    py{36,37,38,39}: molecule[test]
+    py{36,37,38,39}-{devel}: git+https://github.com/ansible-community/molecule.git@master#egg=molecule[test]
 commands =
     pytest --collect-only
     # -s is added in order to allow live output on long running functional tests
@@ -74,15 +80,6 @@ commands =
       {toxinidir}
     twine check dist/*
 
-[testenv:devel]
-description= Unit testing using master branches of molecule and ansible
-extras = test
-commands =
-    {[testenv]commands}
-deps =
-    ansible>=2.10.0a2,<2.11
-    git+https://github.com/ansible-community/molecule#egg=molecule
-
 [testenv:lint]
 description = Performs linting, style checks
 skip_install = true
@@ -90,12 +87,3 @@ deps =
     pre-commit
 commands =
     pre-commit run -a
-
-[testenv:upload]
-description = Builds the packages and uploads them to https://pypi.org
-envdir={toxworkdir}/dist
-deps=
-    {[testenv:packaging]deps}
-commands =
-    {[testenv:packaging]commands}
-    twine upload --verbose dist/*