diff --git a/.circleci/config.yml b/.circleci/config.yml
index 59fd052996..f236b29457 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -35,7 +35,7 @@ jobs:
     - checkout
     - run:
         name: Run tests
-        command: tox -e py27,py34,py35,py36,py37,pypy3 -- -p no:sugar
+        command: tox -e py27-circleci,py34-circleci,py35-circleci,py36-circleci,py37-circleci,pypy3-circleci -- -p no:sugar
         # Environment variables for py-cryptography library
         environment:
           LDFLAGS: "-L/usr/local/opt/openssl/lib"
diff --git a/tox.ini b/tox.ini
index 00d45940bc..9200882789 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,11 +6,10 @@ minversion = 3.13.2
 deps =
     setuptools>=31.0.1
 whitelist_externals =
-    bash
     test
 commands =
-    bash -c "if [[ '{env:CIRCLECI:disabled}' == 'disabled' ]]; then pytest --testmon-off {posargs}; fi"
-    bash -c "if [[ '{env:CIRCLECI:disabled}' != 'disabled' ]]; then circleci tests glob **/test/**.py | circleci tests split --split-by=timings | grep -v '__init__.py' | xargs pytest --testmon-off {posargs}; fi"
+    !circleci: pytest --testmon-off {posargs}
+    circleci: circleci tests glob **/test/**.py | circleci tests split --split-by=timings | grep -v '__init__.py' | xargs pytest --testmon-off {posargs}
     codecov -f coverage.xml -X gcov
 usedevelop = True
 extras = testing