diff --git a/Makefile b/Makefile
index 357a10e..4343b64 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,10 @@
 ROBOT_SCALE_SINGLE_PON_FILE ?= $(ROOT_DIR)/tests/data/bbsim-kind-16.yaml
 ROBOT_SCALE_MULT_PON_FILE ?= $(ROOT_DIR)/tests/data/bbsim-kind-8x2.yaml
 
+ROBOT_SYSTEM_SETUP_MISC_ARGS ?= -i scaledown -l systemup_log.html -r systemup_report.html -o systemup_output.xml
+ROBOT_SYSTEM_TEARDOWN_MISC_ARGS ?= -i scaleup -l systemdown_log.html -r systemdown_report.html -o sysstemdown_output.xml
+ROBOT_SYSTEM_FILE ?= K8S_SystemTest.robot
+
 .PHONY: gendocs
 
 ## Variables for gendocs
@@ -66,6 +70,11 @@
 bbsim-scale-kind: ROBOT_FILE := Voltha_ScaleFunctionalTests.robot
 bbsim-scale-kind: voltha-test
 
+system-scale-test: ROBOT_FILE := Voltha_PODTests.robot
+system-scale-test: ROBOT_MISC_ARGS += -X -i sanity
+system-scale-test: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_SINGLE_PON_FILE)
+system-scale-test: k8s-system-test
+
 # virtualenv for the robot tools
 vst_venv:
 	virtualenv $@ ;\
@@ -92,6 +101,15 @@
 	cd tests/functional ;\
 	robot -V $(ROBOT_CONFIG_FILE) $(ROBOT_MISC_ARGS) $(ROBOT_FILE)
 
+#bbsim-only
+k8s-system-test: vst_venv
+	source ./vst_venv/bin/activate ;\
+	set -u ;\
+	cd tests/functional ;\
+	robot $(ROBOT_SYSTEM_SETUP_MISC_ARGS) $(ROBOT_MISC_ARGS) $(ROBOT_SYSTEM_FILE) && \
+	robot -V $(ROBOT_CONFIG_FILE) $(ROBOT_MISC_ARGS) $(ROBOT_FILE) && \
+	robot $(ROBOT_SYSTEM_TEARDOWN_MISC_ARGS) $(ROBOT_MISC_ARGS) $(ROBOT_SYSTEM_FILE)
+
 gendocs: vst_venv
 	source ./vst_venv/bin/activate ;\
 	set -u ;\