diff --git a/bootstrap.sh b/bootstrap.sh
index 214234b28..79f34cff6 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -21,7 +21,7 @@ cp src/main/org/apache/tools/ant/parser.properties ${CLASSDIR}/org/apache/tools/
 java org.apache.tools.ant.Main main
 java org.apache.tools.ant.Main clean 
 
-if ! test -e bin; then mkdir bin; fi
+if test ! -d bin; then mkdir bin; fi
 cp src/bin/antRun bin
 chmod +x bin/antRun
 
diff --git a/src/bin/antRun b/src/bin/antRun
index efc1dc8f9..4c38b1803 100644
--- a/src/bin/antRun
+++ b/src/bin/antRun
@@ -6,7 +6,7 @@ CMD=$2
 shift
 shift
 
-if test -e $CMD.sh; then
+if test -f $CMD.sh; then
   CMD="sh $CMD.sh"
 fi