diff --git a/Jenkinsfile-voltha-test b/Jenkinsfile-voltha-test
index 3aa6c99..4ac8c7a 100644
--- a/Jenkinsfile-voltha-test
+++ b/Jenkinsfile-voltha-test
@@ -39,7 +39,7 @@
                     screen -dmS voltha-ssh kubectl port-forward -n voltha service/voltha-cli 5022:5022
                     export VOLTCONFIG=/home/cord/.volt/config
                     cd $WORKSPACE/voltha-system-tests/tests
-                    robot --removekeywords wuks -d Log -V $WORKSPACE/${configBaseDir}/${configDeploymentDir}/${configFileName}.yaml -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} Voltha_PODTests.robot || true
+                    robot --removekeywords wuks -d Log -V $WORKSPACE/${configBaseDir}/${configDeploymentDir}/${configFileName}.yaml -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} functional/Voltha_PODTests.robot || true
                     """
                 }
             }
@@ -47,7 +47,7 @@
                 sh returnStdout: true, script: """
                 if [ -d RobotLogs ]; then rm -r RobotLogs; fi; mkdir RobotLogs;
                 mkdir RobotLogs/TestDoc || true
-                cp -r $WORKSPACE/voltha-system-tests/tests/Log/* $WORKSPACE/RobotLogs || true
+                cp -r $WORKSPACE/voltha-system-tests/tests/functional/Log/* $WORKSPACE/RobotLogs || true
                 export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
                 ## get default pod logs
                 for pod in \$(kubectl get pods --no-headers | awk '{print \$1}');
diff --git a/tests/Voltha_PODTests.robot b/tests/functional/Voltha_PODTests.robot
similarity index 92%
rename from tests/Voltha_PODTests.robot
rename to tests/functional/Voltha_PODTests.robot
index 56b3ebe..612bb18 100644
--- a/tests/Voltha_PODTests.robot
+++ b/tests/functional/Voltha_PODTests.robot
@@ -24,15 +24,15 @@
 Library           OperatingSystem
 Library           XML
 Library           RequestsLibrary
-Library           ../../voltha/tests/atests/common/testCaseUtils.py
-Resource          ../../cord-tester/src/test/cord-api/Framework/Subscriber.robot
-Resource          ../../cord-tester/src/test/cord-api/Framework/OLT.robot
-Resource          ../../cord-tester/src/test/cord-api/Framework/DHCP.robot
-Resource          ../../cord-tester/src/test/cord-api/Framework/Kubernetes.robot
-Resource          ../libraries/onos.robot
-Resource          ../libraries/voltctl.robot
-Resource          ../libraries/utils.robot
-Resource          ../variables/variables.robot
+Library           ../../../voltha/tests/atests/common/testCaseUtils.py
+Resource          ../../../cord-tester/src/test/cord-api/Framework/Subscriber.robot
+Resource          ../../../cord-tester/src/test/cord-api/Framework/OLT.robot
+Resource          ../../../cord-tester/src/test/cord-api/Framework/DHCP.robot
+Resource          ../../../cord-tester/src/test/cord-api/Framework/Kubernetes.robot
+Resource          ../../libraries/onos.robot
+Resource          ../../libraries/voltctl.robot
+Resource          ../../libraries/utils.robot
+Resource          ../../variables/variables.robot
 
 *** Variables ***
 ${POD_NAME}       flex-ocp-cord