diff --git a/Makefile b/Makefile
index d79f4e8a..c5a42afb 100644
--- a/Makefile
+++ b/Makefile
@@ -45,12 +45,12 @@ external_dep: requirements-host.txt
 # Run unit and Postgres integration tests in coverage mode
 .PHONY: coverage_test
 coverage_test: build_drydock external_dep
-	tox -re coverage
+	tox -re cover
 
 # Run just unit tests
 .PHONY: unit_tests
 unit_tests: external_dep
-	tox -re unit
+	tox -re py35
 
 # Run the drydock container and exercise simple tests
 .PHONY: run_drydock
diff --git a/tox.ini b/tox.ini
index 35f63859..fe4414f2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pep8,bandit,unit
+envlist = py35,pep8,bandit
 
 [testenv]
 setenv = YAMLDIR = {toxinidir}/tests/yaml_samples/
@@ -25,7 +25,7 @@ commands=
   yapf -i -r  --style=pep8 {toxinidir}/tests
   find {toxinidir}/drydock_provisioner -name '__init__.py' -exec yapf -i --style=pep8 \{\} ;
 
-[testenv:unit]
+[testenv:py35]
 usedevelop=True
 setenv=
   PYTHONWARNING=all
@@ -45,7 +45,7 @@ commands=
   py.test \
     {toxinidir}/tests/integration/postgres/{posargs}
 
-[testenv:coverage]
+[testenv:cover]
 usedevelop=True
 passenv=DOCKER_REGISTRY IMAGE_NAME IMAGE_PREFIX IMAGE_TAG
 setenv=