diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2ae03c9..b13f2ea 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -45,7 +45,7 @@
 ENV PACKAGES_FOLDER=/robot-systest/osm-packages
 
 # Folder where test results should be exported
-ENV ROBOT_REPORT_FOLDER=/robot-systest/results
+ENV ROBOT_REPORT_FOLDER=/robot-systest/reports
 
 # Kubeconfig file
 ENV K8S_CREDENTIALS=/root/.kube/config
diff --git a/robot-systest/run_test.sh b/robot-systest/run_test.sh
index ac2e330..f5753cc 100755
--- a/robot-systest/run_test.sh
+++ b/robot-systest/run_test.sh
@@ -70,7 +70,7 @@
             -o <osmclient_version> \\
             -p <package_branch> \\
             -t <testing_tags>
-            
+
 Options:
         --env-file: It is the environmental file where is described the OSM target and VIM
         -o <osmclient_version> [OPTIONAL]: It is used to specify a particular osmclient version. Default: latest
@@ -98,13 +98,16 @@
 
 eval set -- "$PARAMS"
 
-if [[ -z $TEST ]]; then
+if [[ -n "$stackName" ]]; then
+    export OSM_HOSTNAME=osm${stackName}_nbi
+fi
+
+if [[ -z "${TEST}" ]]; then
     printf "Test not provided. \nRunning default test: sanity\n"
     TEST="sanity"
 fi
 
-
-if [[ -n "$TEST" ]]; then
+if [[ -n "${TEST}" ]]; then
     robot -d ${ROBOT_DEVOPS_FOLDER}/reports -i ${TEST} ${ROBOT_DEVOPS_FOLDER}/testsuite/
     exit 0
 else