2 files changed, 9 insertions, 5 deletions
diff --git a/test/end-to-end/remote-execution/install-cas.sh b/test/end-to-end/remote-execution/install-cas.sh
index 32e34624..d8e53f7d 100644
--- a/test/end-to-end/remote-execution/install-cas.sh
+++ b/test/end-to-end/remote-execution/install-cas.sh
@@ -22,9 +22,10 @@ readonly OUTDIR="${PWD}/out"
 
 LOCAL_ARGS="--local-build-root ${LBRDIR}"
 REMOTE_ARGS="${LOCAL_ARGS} -r ${REMOTE_EXECUTION_ADDRESS}"
+REMOTE_PROPS=""
 if [ "${REMOTE_EXECUTION_PROPERTIES:-}" != "" ]
 then
-   REMOTE_ARGS="${REMOTE_ARGS} --remote-execution-property ${REMOTE_EXECUTION_PROPERTIES}"
+   REMOTE_PROPS="--remote-execution-property ${REMOTE_EXECUTION_PROPERTIES}"
 fi
 if [ -n "${COMPATIBLE:-}" ]
 then
@@ -48,7 +49,7 @@ cat > TARGETS <<'EOF'
 }
 EOF
 
-"${JUST}" build ${REMOTE_ARGS} --dump-artifacts artifacts.json 2>&1
+"${JUST}" build ${REMOTE_ARGS} ${REMOTE_PROPS} --dump-artifacts artifacts.json 2>&1
 echo
 cat artifacts.json
 OUT="$(jq -r '.out.id' artifacts.json)::t"
diff --git a/test/end-to-end/remote-execution/install.sh b/test/end-to-end/remote-execution/install.sh
index 11eac6c5..4f50a724 100644
--- a/test/end-to-end/remote-execution/install.sh
+++ b/test/end-to-end/remote-execution/install.sh
@@ -28,10 +28,11 @@ readonly OUTDIR_B="${TEST_TMPDIR}/out/instance-B"
 readonly OUTDIR_C="${TEST_TMPDIR}/out/instance-C"
 
 REMOTE_EXECUTION_ARGS="-r ${REMOTE_EXECUTION_ADDRESS}"
+REMOTE_EXECUTION_PROPS=""
 LOCAL_ARGS=""
 if [ "${REMOTE_EXECUTION_PROPERTIES:-}" != "" ]
 then
-   REMOTE_EXECUTION_ARGS="${REMOTE_EXECUTION_ARGS} --remote-execution-property ${REMOTE_EXECUTION_PROPERTIES}"
+   REMOTE_EXECUTION_PROPS="--remote-execution-property ${REMOTE_EXECUTION_PROPERTIES}"
 fi
 if [ -n "${COMPATIBLE:-}" ]
 then
@@ -57,7 +58,8 @@ cat > TARGETS <<'EOF'
 EOF
 
 "${JUST}" build --local-build-root "${LBRDIR_A}" \
-          --dump-artifacts "${WRKDIR}/tree.json" ${REMOTE_EXECUTION_ARGS} 2>&1
+          --dump-artifacts "${WRKDIR}/tree.json" \
+          ${REMOTE_EXECUTION_ARGS} ${REMOTE_EXECUTION_PROPS} 2>&1
 
 ## instance B should be able to fetch
 
@@ -164,7 +166,8 @@ EOF
 
 "${JUST}" install --local-build-root "${LBRDIR_C}" \
           --remember -o "${OUTDIR_C}/remote" \
-          --dump-artifacts "${WRKDIR}/tree.json" ${REMOTE_EXECUTION_ARGS} 2>&1
+          --dump-artifacts "${WRKDIR}/tree.json" \
+          ${REMOTE_EXECUTION_ARGS} ${REMOTE_EXECUTION_PROPS} 2>&1
 
 ## now it should also be available for local installation