diff --git a/Makefile b/Makefile
index fb736f5..b8d5dd3 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,6 @@
 include setup.mk
 
 VENVDIR := venv-$(shell uname -s | tr '[:upper:]' '[:lower:]')
-DOCKER_CMD := docker pull consul
 
 .PHONY: $(DIRS) $(DIRS_CLEAN) $(DIRS_FLAKE8) flake8
 
@@ -125,27 +124,35 @@
 	        uname -s > ${VENVDIR}/.built; \
 	    fi
 
+test: venv protos run-as-root-tests
+	@ echo "Executing all tests"
+	. ${VENVDIR}/bin/activate && \
+	nosetests -s tests \
+	--exclude-dir=./tests/itests/run_as_root/
+
 utest: venv protos
 	@ echo "Executing all unit tests"
 	. ${VENVDIR}/bin/activate && \
 	    nosetests tests --exclude-dir=./tests/itests/
 
-itest: venv frameio
-	@ echo "Executing sanity integration tests"
+itest: venv run-as-root-tests 
+	@ echo "Executing all integration tests"
+	. ${VENVDIR}/bin/activate && \
+	nosetests -s  \
+	tests/itests/docutests/build_md_test.py \
+	--exclude-dir=./tests/utests/ \
+	--exclude-dir=./tests/itests/run_as_root/
+
+smoke-test: venv run-as-root-tests 
+	@ echo "Executing smoke tests"
 	. ${VENVDIR}/bin/activate && \
 	nosetests -s  \
 	tests/itests/docutests/build_md_test.py:BuildMdTests.test_07_start_all_containers \
-	--exclude-dir=./tests/itests/frameio_tests/run_as_root/
+	--exclude-dir=./tests/itests/run_as_root/
 
-itest-all: venv frameio
-	@ echo "Executing all integration tests"
-	. ${VENVDIR}/bin/activate && \
-	    nosetests -s  \
-	    tests/itests/docutests/build_md_test.py \
-        --exclude-dir=./tests/itests/frameio_tests/run_as_root/
 
-frameio:
-	docker run -ti --rm -v /voltha:/voltha  --privileged cord/voltha-base     env PYTHONPATH=/voltha python /voltha/tests/itests/frameio_tests/run_as_root/test_frameio.py
+run-as-root-tests:
+	docker run -ti --rm -v /voltha:/voltha --privileged cord/voltha-base env PYTHONPATH=/voltha python /voltha/tests/itests/run_as_root/test_frameio.py
 
 flake8: $(DIRS_FLAKE8)