diff --git a/seba-in-a-box/Makefile b/seba-in-a-box/Makefile
index f5899fa..85a2555 100644
--- a/seba-in-a-box/Makefile
+++ b/seba-in-a-box/Makefile
@@ -269,16 +269,17 @@
 	mkdir -p $(WORKSPACE)/cord/test
 	cd $(WORKSPACE)/cord/test && git clone https://gerrit.opencord.org/cord-tester
 
-$(WORKSPACE)/voltha: | $(M)/setup
-	cd $(WORKSPACE) && git clone https://gerrit.opencord.org/voltha
+$(WORKSPACE)/cord/incubator/voltha: | $(M)/setup
+	mkdir -p $(WORKSPACE)/cord/incubator
+	cd $(WORKSPACE)/cord/incubator && git clone https://gerrit.opencord.org/voltha
 
 PYBOT_ARGS ?=
-$(M)/qatests: | $(M)/siab $(M)/qatests-prereqs $(WORKSPACE)/cord/test/cord-tester $(WORKSPACE)/voltha
+$(M)/qatests: | $(M)/siab $(M)/qatests-prereqs $(WORKSPACE)/cord/test/cord-tester $(WORKSPACE)/cord/incubator/voltha
 	cd $(WORKSPACE)/cord/test/cord-tester/src/test/cord-api/ && \
-		WORKSPACE=$(VIRTUALENV) bash ./setup_venv.sh && \
-		source $(VIRTUALENV)/venv-cord-tester/bin/activate && \
-		cd Tests/WorkflowValidations/ && \
-		robot $(PYBOT_ARGS) --removekeywords wuks -e notready -i $(TESTTAGS) -v WORKSPACE_DIR:$(HOME) SIAB.robot
+	WORKSPACE=$(VIRTUALENV) bash ./setup_venv.sh && \
+	source $(VIRTUALENV)/venv-cord-tester/bin/activate && \
+	cd Tests/WorkflowValidations/ && \
+	robot $(PYBOT_ARGS) --removekeywords wuks -e notready -i $(TESTTAGS) -v VOLTHA_DIR:$(WORKSPACE)/cord/incubator/voltha SIAB.robot
 	touch $@
 
 remove-chart-milestones: