diff --git a/scripts/dashboard/adios_common.cmake b/scripts/dashboard/adios_common.cmake
index 0a6363a84e..d588cb4c01 100644
--- a/scripts/dashboard/adios_common.cmake
+++ b/scripts/dashboard/adios_common.cmake
@@ -91,7 +91,7 @@ endif()
 if((CMAKE_VERSION VERSION_GREATER 3.16.20191201 ) AND
    (ADIOS_TEST_REPEAT GREATER 0) AND
    NOT "REPEAT" IN_LIST CTEST_TEST_ARGS)
-  list(APPEND CTEST_TEST_ARGS REPEAT "UNTIL_PASS:${ADIOS_TEST_REPEAT}")
+  list(APPEND CTEST_TEST_ARGS REPEAT "UNTIL_FAIL:${ADIOS_TEST_REPEAT}")
 endif()
 
 list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
diff --git a/testing/adios2/engine/bp/kill_xrootd.sh b/testing/adios2/engine/bp/kill_xrootd.sh
index 6065ca9af2..c2dfdf52b4 100755
--- a/testing/adios2/engine/bp/kill_xrootd.sh
+++ b/testing/adios2/engine/bp/kill_xrootd.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 kill -2 "$(cat /tmp/xrootd.pid)"
 #rm /tmp/xrootd.pid
+exit 0
diff --git a/testing/adios2/engine/bp/start_xrootd.sh b/testing/adios2/engine/bp/start_xrootd.sh
index 63d293ca2b..7046ef1268 100755
--- a/testing/adios2/engine/bp/start_xrootd.sh
+++ b/testing/adios2/engine/bp/start_xrootd.sh
@@ -8,3 +8,4 @@ if [ "$(id -u)" -eq 0 ]; then
 fi
 
 "$1" -b -l /tmp/xroot.log -c "$2"/xroot/etc/xrootd/xrootd-ssi.cfg "${XROOTD_USER[@]}"
+exit 0