diff --git a/DeploymentTest/p1.test.user.bash b/DeploymentTest/p1.test.user.bash
index 11c57dcb1ff1bd8fbd803df5785bdc6d8024bd2a..2531c229d580dc5f1dcb4c39bf085724c569b435 100755
--- a/DeploymentTest/p1.test.user.bash
+++ b/DeploymentTest/p1.test.user.bash
@@ -9,16 +9,13 @@ function usage {
   echo "                (uses /eos/ctaatlaspps/daqtest)"
 }
 
-EXECNAME=$0
-shift
-
+EXECNAME=`basename $0`
 TESTHOST=""
-
 ISERS_ENABLED="false"
 MIG_ENABLED="false"
 
 while [[ $# -gt 0 ]]; do
-  case $0 in
+  case $1 in
     --isers)
     ISERS_ENABLED="true"
     shift
@@ -32,7 +29,7 @@ while [[ $# -gt 0 ]]; do
     exit 1
     ;;
     *)
-    TESTHOST=$0
+    TESTHOST=$1
     shift
     ;;
   esac