diff --git a/build-aux/check-mescc.sh b/build-aux/check-mescc.sh
index 3c87e715..ad18e436 100755
--- a/build-aux/check-mescc.sh
+++ b/build-aux/check-mescc.sh
@@ -213,7 +213,6 @@ broken="$broken
 27_sizeof
 28_strings
 
-30_hanoi
 32_led
 34_array_assignment
 37_sprintf
@@ -258,7 +257,7 @@ for t in $tests; do
         echo ' [SKIP]'
         continue;
     fi
-    sh build-aux/test.sh "scaffold/tinycc/$t" arg1 arg2 arg3 arg4 arg5 &> scaffold/tinycc/"$t".log
+    sh build-aux/test.sh "scaffold/tinycc/$t" &> scaffold/tinycc/"$t".log
     r=$?
     total=$((total+1))
     if [ $r = 0 ]; then
diff --git a/scripts/mescc b/scripts/mescc
index 4baf7cc5..2c4c1bd9 100755
--- a/scripts/mescc
+++ b/scripts/mescc
@@ -4,7 +4,7 @@ mes_p=$(command -v mes)
 if [ '(' -z "$mes_p" -a -z "$MES" ')' -o "$MES" = "guile" -o "$MES" = "mes.guile" ]; then
     GODIR=${GODIR-@GODIR@}
     GUILEDIR=${GUILEDIR-@GUILEDIR@}
-    [ "$GODIR" = @"GODIR"@ ] && GODIR=$(dirname $0)
+    [ "$GODIR" = @"GODIR"@ ] && GODIR=$(dirname $0)/../guile
     [ "$GUILEDIR" = @"GUILEDIR"@ ] && GUILEDIR=$(dirname $0)/../guile
     export GUILE_AUTO_COMPILE=${GUILE_AUTO_COMPILE-0}
     GUILE_LOAD_COMPILED_PATH=$GODIR:$GUILE_LOAD_COMPILED_PATH
@@ -21,7 +21,7 @@ else
     fi
     MES_MODULEDIR=${MES_MODULEDIR-$MES_PREFIX/"module"}
     export MES_MODULEDIR
-    $MES -s $0 "$@"
+    exec ${MES-mes} -e '(mescc)' -s $0 "$@"
     exit $?
 fi
 !#
@@ -204,6 +204,4 @@ Environment variables:
                                           (objects (map info->object infos)))
                                      (if compile? (objects->M1 file-name objects)
                                          (objects->elf file objects))))))))))
-
-(main (command-line))
 'done