diff --git a/Jenkinsfile b/Jenkinsfile
index ea9709a..ab3fc30 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@
             sh 'vagrant ssh -c "cd /voltha && source env.sh && docker-compose -f compose/docker-compose-system-test.yml up -d" voltha'
 
             stage 'Run Integration Tests'
-            sh 'vagrant ssh -c "cd /voltha && source env.sh && make itest" voltha'
+            sh 'vagrant ssh -c "cd /voltha && source env.sh && make smoke-test" voltha'
 
             currentBuild.result = 'SUCCESS'
             slackSend channel: '#voltha', color: 'good', message: "${env.JOB_NAME} (${env.BUILD_NUMBER}) Build success.\n${env.BUILD_URL}"
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)
 
diff --git a/compose/docker-compose-system-test.yml b/compose/docker-compose-system-test.yml
index 8026e54..e35d006 100644
--- a/compose/docker-compose-system-test.yml
+++ b/compose/docker-compose-system-test.yml
@@ -20,6 +20,7 @@
       KAFKA_ADVERTISED_HOST_NAME: ${DOCKER_HOST_IP}
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
       KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true'
+      KAFKA_HEAP_OPTS: "-Xmx256M -Xms128M"
       SERVICE_9092_NAME: "kafka"
     depends_on:
     - consul
diff --git a/tests/itests/docutests/build_md_test.py b/tests/itests/docutests/build_md_test.py
index cdaeb3f..d887075 100644
--- a/tests/itests/docutests/build_md_test.py
+++ b/tests/itests/docutests/build_md_test.py
@@ -736,7 +736,7 @@
             "(.*)consul_1(.*)agent: Synced service(.*)kafka(.*):9092"
         ]
         pattern_found = []
-        max_wait_time = 120  # wait 2 mins as a maximum
+        max_wait_time = 60  # wait 2 mins as a maximum
 
         def _stop_process(proc):
             try:
diff --git a/tests/itests/frameio_tests/__init__.py b/tests/itests/frameio_tests/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/tests/itests/frameio_tests/__init__.py
+++ /dev/null
diff --git a/tests/itests/frameio_tests/run_as_root/__init__.py b/tests/itests/run_as_root/__init__.py
similarity index 100%
rename from tests/itests/frameio_tests/run_as_root/__init__.py
rename to tests/itests/run_as_root/__init__.py
diff --git a/tests/itests/frameio_tests/run_as_root/test_frameio.py b/tests/itests/run_as_root/test_frameio.py
similarity index 100%
rename from tests/itests/frameio_tests/run_as_root/test_frameio.py
rename to tests/itests/run_as_root/test_frameio.py