diff --git a/services/run_capif_tests.sh b/services/run_capif_tests.sh
index 5f2840d975cf0b370a77200aa5823416e01ad930..881e4ea79855d754a6bf50c1b4e74cd601e391a2 100755
--- a/services/run_capif_tests.sh
+++ b/services/run_capif_tests.sh
@@ -6,7 +6,7 @@ DOCKER_ROBOT_IMAGE_VERSION=4.0
 cd ..
 REPOSITORY_BASE_FOLDER=${PWD}
 TEST_FOLDER=$REPOSITORY_BASE_FOLDER/tests
-RESULT_FOLDER=$REPOSITORY_BASE_FOLDER/results/$timestamp
+RESULT_FOLDER=$REPOSITORY_BASE_FOLDER/results
 ROBOT_DOCKER_FILE_FOLDER=$REPOSITORY_BASE_FOLDER/tools/robot
 
 # nginx Hostname and http port (80 by default) to reach for tests
diff --git a/tools/robot/entrypoint.sh b/tools/robot/entrypoint.sh
index d889a7aa00c1c94988752e7810b356b24bca3289..75f39b5594aa4dd6953f880d85134aa335094f7e 100644
--- a/tools/robot/entrypoint.sh
+++ b/tools/robot/entrypoint.sh
@@ -8,6 +8,8 @@ TESTS_REQ_FILE=ROBOT_TESTS_DIRECTORY/requirements.txt
 ARGUMENTS=
 OPTIONS=
 
+timestamp=$(date +"%Y%m%d_%H%M%S")
+
 while [ -n "$1" ]; do # while loop starts
 
         case "$1" in
@@ -45,4 +47,4 @@ then
 fi
 
 pip install -r $BASE_REQ_FILE
-robot -d ROBOT_RESULTS_DIRECTORY --xunit xunit.xml $OPTIONS $ARGUMENTS
+robot -d ROBOT_RESULTS_DIRECTORY/$timestamp --xunit xunit.xml $OPTIONS $ARGUMENTS