diff --git a/src/Misc/layoutroot/config.sh b/src/Misc/layoutroot/config.sh
index 6aa8890130b..11602459644 100755
--- a/src/Misc/layoutroot/config.sh
+++ b/src/Misc/layoutroot/config.sh
@@ -3,7 +3,7 @@
 user_id=`id -u`
 
 # we want to snapshot the environment of the config user
-if [ $user_id -eq 0 -a -z "$AGENT_ALLOW_RUNASROOT" ]; then
+if [ $user_id -eq 0 -a -z "$RUNNER_ALLOW_RUNASROOT" ]; then
     echo "Must not run with sudo"
     exit 1
 fi
diff --git a/src/Misc/layoutroot/run.sh b/src/Misc/layoutroot/run.sh
index c874d8274b4..0dd186721fe 100755
--- a/src/Misc/layoutroot/run.sh
+++ b/src/Misc/layoutroot/run.sh
@@ -2,7 +2,7 @@
 
 # Validate not sudo
 user_id=`id -u`
-if [ $user_id -eq 0 -a -z "$AGENT_ALLOW_RUNASROOT" ]; then
+if [ $user_id -eq 0 -a -z "$RUNNER_ALLOW_RUNASROOT" ]; then
     echo "Must not run interactively with sudo"
     exit 1
 fi