diff --git a/continuousintegration/orchestration/tests/client_prepare_file.sh b/continuousintegration/orchestration/tests/client_prepare_file.sh
index f39d5c0a7ca4f52e54df254cbaa004118fef2fa3..1c2f41e77cdca3d1d57433bd4bf098b05e5eea44 100755
--- a/continuousintegration/orchestration/tests/client_prepare_file.sh
+++ b/continuousintegration/orchestration/tests/client_prepare_file.sh
@@ -40,7 +40,7 @@ nbFilesToRetrieve=${#FILES_LOCATION[@]}
 
 KRB5CCNAME=/tmp/${EOSPOWER_USER}/krb5cc_0
 
-echo ${FILES_LOCATION[@]} | XrdSecPROTOCOL=krb5 KRB5CCNAME=/tmp/${EOSPOWER_USER}/krb5cc_0 xargs --max-procs=10 -n 40 xrdfs ${EOSINSTANCE} prepare 
+echo ${FILES_LOCATION[@]} | XrdSecPROTOCOL=krb5 KRB5CCNAME=/tmp/${EOSPOWER_USER}/krb5cc_0 xargs --max-procs=10 -n 40 xrdfs ${EOSINSTANCE} prepare -s
 
 nbFilesRetrieved=0
 SECONDS_PASSED=0
diff --git a/continuousintegration/orchestration/tests/repack_systemtest_wrapper.sh b/continuousintegration/orchestration/tests/repack_systemtest_wrapper.sh
index b44b21fef5dd979439c4c801cdac8bf4b842e546..d1e2e7eb9449cf97f37232421f5a116947f3733f 100755
--- a/continuousintegration/orchestration/tests/repack_systemtest_wrapper.sh
+++ b/continuousintegration/orchestration/tests/repack_systemtest_wrapper.sh
@@ -549,7 +549,7 @@ repackTapeRepairNoRecall() {
       echo "retrievedFiles ($retrievedFiles) == totalFilesToRetrieve ($totalFilesToRetrieve), OK"
     fi
 
-    if [[ $archivedFiles != $totalFilesToArchive ]]
+    if [[ $archivedFiles != $totalFilesToArchive || $userProvidedFiles != $archivedFiles ]]
     then
       echo "archivedFiles ($archivedFiles) != totalFilesToArchive ($totalFilesToArchive), test FAILED"
       exit 1