8 files changed, 15 insertions, 9 deletions
diff --git a/test/end-to-end/execution-service/tree_inputs.sh b/test/end-to-end/execution-service/tree_inputs.sh
index f6491f50..f8780bfb 100755
--- a/test/end-to-end/execution-service/tree_inputs.sh
+++ b/test/end-to-end/execution-service/tree_inputs.sh
@@ -40,7 +40,8 @@ EOF
 
 REMOTE_EXECUTION_ARGS="-r ${REMOTE_EXECUTION_ADDRESS}"
 if [ "${REMOTE_EXECUTION_PROPERTIES:-}" != "" ]; then
-  REMOTE_EXECUTION_ARGS="${REMOTE_EXECUTION_ARGS} --remote-execution-property ${REMOTE_EXECUTION_PROPERTIES}"
+  REMOTE_EXECUTION_PROPS="$(printf " --remote-execution-property %s" ${REMOTE_EXECUTION_PROPERTIES})"
+  REMOTE_EXECUTION_ARGS="${REMOTE_EXECUTION_ARGS} ${REMOTE_EXECUTION_PROPS}"
 fi
 if [ -n "${COMPATIBLE:-}" ]; then
   REMOTE_EXECUTION_ARGS="${REMOTE_EXECUTION_ARGS} --compatible"
diff --git a/test/end-to-end/remote-execution/install-cas.sh b/test/end-to-end/remote-execution/install-cas.sh
index d8e53f7d..1cadb54c 100644
--- a/test/end-to-end/remote-execution/install-cas.sh
+++ b/test/end-to-end/remote-execution/install-cas.sh
@@ -25,7 +25,7 @@ REMOTE_ARGS="${LOCAL_ARGS} -r ${REMOTE_EXECUTION_ADDRESS}"
 REMOTE_PROPS=""
 if [ "${REMOTE_EXECUTION_PROPERTIES:-}" != "" ]
 then
-   REMOTE_PROPS="--remote-execution-property ${REMOTE_EXECUTION_PROPERTIES}"
+   REMOTE_PROPS="$(printf " --remote-execution-property %s" ${REMOTE_EXECUTION_PROPERTIES})"
 fi
 if [ -n "${COMPATIBLE:-}" ]
 then
diff --git a/test/end-to-end/remote-execution/install.sh b/test/end-to-end/remote-execution/install.sh
index 4f50a724..d51999d4 100644
--- a/test/end-to-end/remote-execution/install.sh
+++ b/test/end-to-end/remote-execution/install.sh
@@ -32,7 +32,7 @@ REMOTE_EXECUTION_PROPS=""
 LOCAL_ARGS=""
 if [ "${REMOTE_EXECUTION_PROPERTIES:-}" != "" ]
 then
-   REMOTE_EXECUTION_PROPS="--remote-execution-property ${REMOTE_EXECUTION_PROPERTIES}"
+   REMOTE_EXECUTION_PROPS="$(printf " --remote-execution-property %s" ${REMOTE_EXECUTION_PROPERTIES})"
 fi
 if [ -n "${COMPATIBLE:-}" ]
 then
diff --git a/test/end-to-end/remote-execution/large-blobs.sh b/test/end-to-end/remote-execution/large-blobs.sh
index a338825a..6da146db 100644
--- a/test/end-to-end/remote-execution/large-blobs.sh
+++ b/test/end-to-end/remote-execution/large-blobs.sh
@@ -47,7 +47,7 @@ run_tests() {
     if [ -n "${1:-}" ] && [ -n "${2:-}" ]; then
         TYPE="remote"
         REMOTE_ARGS="-r $1"
-        REMOTE_BUILD_ARGS="--remote-execution-property $2"
+        REMOTE_BUILD_ARGS="$(printf " --remote-execution-property %s" $2)"
     fi
     ARGS="$COMMON_ARGS $REMOTE_ARGS"
     BUILD_ARGS="$ARGS $REMOTE_BUILD_ARGS"
diff --git a/test/end-to-end/remote-execution/native-protocol.sh b/test/end-to-end/remote-execution/native-protocol.sh
index 0737b9ff..00e1dd91 100644
--- a/test/end-to-end/remote-execution/native-protocol.sh
+++ b/test/end-to-end/remote-execution/native-protocol.sh
@@ -88,7 +88,8 @@ test ${TREE_ID} ${EQUAL} ${GIT_TREE_ID}
 
 REMOTE_EXECUTION_ARGS="-r ${REMOTE_EXECUTION_ADDRESS}"
 if [ "${REMOTE_EXECUTION_PROPERTIES:-}" != "" ]; then
-  REMOTE_EXECUTION_ARGS="${REMOTE_EXECUTION_ARGS} --remote-execution-property ${REMOTE_EXECUTION_PROPERTIES}"
+  REMOTE_EXECUTION_PROPS="$(printf " --remote-execution-property %s" ${REMOTE_EXECUTION_PROPERTIES})"
+  REMOTE_EXECUTION_ARGS="${REMOTE_EXECUTION_ARGS} ${REMOTE_EXECUTION_PROPS}"
 fi
 
 echo
diff --git a/test/end-to-end/remote-execution/upload-test.sh b/test/end-to-end/remote-execution/upload-test.sh
index 91f6d069..44df84e3 100644
--- a/test/end-to-end/remote-execution/upload-test.sh
+++ b/test/end-to-end/remote-execution/upload-test.sh
@@ -64,7 +64,8 @@ export CONF="$(realpath repos.json)"
 # Build remotely
 REMOTE_EXECUTION_ARGS="-r ${REMOTE_EXECUTION_ADDRESS}"
 if [ "${REMOTE_EXECUTION_PROPERTIES:-}" != "" ]; then
-  REMOTE_EXECUTION_ARGS="${REMOTE_EXECUTION_ARGS} --remote-execution-property ${REMOTE_EXECUTION_PROPERTIES}"
+  REMOTE_EXECUTION_PROPS="$(printf " --remote-execution-property %s" ${REMOTE_EXECUTION_PROPERTIES})"
+  REMOTE_EXECUTION_ARGS="${REMOTE_EXECUTION_ARGS} ${REMOTE_EXECUTION_PROPS}"
 fi
 
 "${JUST}" build -L '["env", "PATH='"${PATH}"'"]' -C "${CONF}" --local-build-root="${LBRDIR_1}" ${ARGS} ${REMOTE_EXECUTION_ARGS} 2>&1
@@ -89,7 +90,8 @@ export CONF="$(realpath repos.json)"
 # Build remotely
 REMOTE_EXECUTION_ARGS="-r ${REMOTE_EXECUTION_ADDRESS}"
 if [ "${REMOTE_EXECUTION_PROPERTIES:-}" != "" ]; then
-  REMOTE_EXECUTION_ARGS="${REMOTE_EXECUTION_ARGS} --remote-execution-property ${REMOTE_EXECUTION_PROPERTIES}"
+  REMOTE_EXECUTION_PROPS="$(printf " --remote-execution-property %s" ${REMOTE_EXECUTION_PROPERTIES})"
+  REMOTE_EXECUTION_ARGS="${REMOTE_EXECUTION_ARGS} ${REMOTE_EXECUTION_PROPS}"
 fi
 
 "${JUST}" build -L '["env", "PATH='"${PATH}"'"]' -C "${CONF}" --local-build-root="${LBRDIR_2}" ${ARGS} ${REMOTE_EXECUTION_ARGS} 2>&1
diff --git a/test/end-to-end/symlinks/stage-links.sh b/test/end-to-end/symlinks/stage-links.sh
index 9b3bbf63..25c9d15e 100644
--- a/test/end-to-end/symlinks/stage-links.sh
+++ b/test/end-to-end/symlinks/stage-links.sh
@@ -45,7 +45,8 @@ fi
 
 REMOTE_EXECUTION_ARGS="-r ${REMOTE_EXECUTION_ADDRESS}"
 if [ "${REMOTE_EXECUTION_PROPERTIES:-}" != "" ]; then
-  REMOTE_EXECUTION_ARGS="${REMOTE_EXECUTION_ARGS} --remote-execution-property ${REMOTE_EXECUTION_PROPERTIES}"
+  REMOTE_EXECUTION_PROPS="$(printf " --remote-execution-property %s" ${REMOTE_EXECUTION_PROPERTIES})"
+  REMOTE_EXECUTION_ARGS="${REMOTE_EXECUTION_ARGS} ${REMOTE_EXECUTION_PROPS}"
 fi
 
 echo "test staging locally"
diff --git a/test/end-to-end/target-cache/target-cache-hit.sh b/test/end-to-end/target-cache/target-cache-hit.sh
index d2e3381a..929c9b20 100644
--- a/test/end-to-end/target-cache/target-cache-hit.sh
+++ b/test/end-to-end/target-cache/target-cache-hit.sh
@@ -63,7 +63,8 @@ REMOTE_EXECUTION_ARGS=""
 if [ "${REMOTE_EXECUTION_ADDRESS:-}" != "" ]; then
   REMOTE_EXECUTION_ARGS="-r ${REMOTE_EXECUTION_ADDRESS}"
   if [ "${REMOTE_EXECUTION_PROPERTIES:-}" != "" ]; then
-    REMOTE_EXECUTION_ARGS="${REMOTE_EXECUTION_ARGS} --remote-execution-property ${REMOTE_EXECUTION_PROPERTIES}"
+    REMOTE_EXECUTION_PROPS="$(printf " --remote-execution-property %s" ${REMOTE_EXECUTION_PROPERTIES})"
+    REMOTE_EXECUTION_ARGS="${REMOTE_EXECUTION_ARGS} ${REMOTE_EXECUTION_PROPS}"
   fi
 fi