diff --git a/Makefile b/Makefile
index 0af41cc0..e7889d6f 100644
--- a/Makefile
+++ b/Makefile
@@ -33,11 +33,16 @@ images: build_pegleg
 .PHONY: run_images
 run_images: run_pegleg
 
-# Run the drydock container and exercise simple tests
+# Run the Pegleg container and exercise simple tests
 .PHONY: run_pegleg
 run_pegleg: build_pegleg
 	tools/pegleg.sh --help
 
+# Run all unit tests under src/bin/pegleg
+.PHONY: run_tests
+run_tests:
+	tox -c src/bin/pegleg/tox.ini -e py35
+
 # Perform Linting
 .PHONY: lint
 lint: py_lint
diff --git a/src/bin/pegleg/tests/unit/test_selectable_linitng.py b/src/bin/pegleg/tests/unit/test_selectable_linitng.py
index d18d734e..ad5071c8 100644
--- a/src/bin/pegleg/tests/unit/test_selectable_linitng.py
+++ b/src/bin/pegleg/tests/unit/test_selectable_linitng.py
@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import click
 import mock
 import pytest
diff --git a/src/bin/pegleg/tox.ini b/src/bin/pegleg/tox.ini
index 568834a6..8422e89c 100644
--- a/src/bin/pegleg/tox.ini
+++ b/src/bin/pegleg/tox.ini
@@ -1,11 +1,15 @@
 [tox]
-envlist = lint
+envlist = py35, lint
 
 [testenv]
-deps = -r{toxinidir}/test-requirements.txt
-
+deps =
+  -r{toxinidir}/requirements.txt
+  -r{toxinidir}/test-requirements.txt
 basepython=python3
-commands=
+whitelist_externals =
+  find
+commands =
+  find . -type f -name "*.pyc" -delete
   pytest \
     {posargs}
 
diff --git a/tox.ini b/tox.ini
index 479657a5..968c3704 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = docs
+envlist = py35, docs
 # Allows docs to be built without setup.py having to exist. Requires that
 # usedevelop be False as well (which it is by default).
 skipsdist = True
@@ -9,6 +9,12 @@ setenv = VIRTUAL_ENV={envdir}
          LANGUAGE=en_US
          LC_ALL=en_US.utf-8
 
+[testenv:py35]
+commands =
+    # Run all unit tests under src/bin/pegleg
+    tox -c src/bin/pegleg/tox.ini -e py35
+whitelist_externals = tox
+
 [testenv:docs]
 deps = -r{toxinidir}/docs/requirements.txt
 commands =