diff --git a/build-aux/test.sh b/build-aux/test.sh
index af01c6c4..5dc8da42 100755
--- a/build-aux/test.sh
+++ b/build-aux/test.sh
@@ -30,18 +30,36 @@ shift
 
 set -e
 
+rm -f "$t".mlibc-out
+if [ -n "$CC32" ]; then
+    sh build-aux/cc-mlibc.sh "$t"
+
+    r=0
+    [ -f "$t".exit ] && r=$(cat "$t".exit)
+    set +e
+    "$t".mlibc-out > "$t".mlibc-stdout
+    m=$?
+    cat "$t".mlibc-stdout
+    set -e
+
+    [ $m = $r ]
+    if [ -f "$t".expect ]; then
+        $DIFF -u "$t".expect "$t".mlibc-stdout;
+    fi
+fi
+
 rm -f "$t".mes-out
 sh build-aux/cc-mes.sh "$t"
 
 r=0
 [ -f "$t".exit ] && r=$(cat "$t".exit)
 set +e
-"$t".mes-out "$@" > "$t".stdout
+"$t".mes-out > "$t".mes-stdout
 m=$?
-cat "$t".stdout
+cat "$t".mes-stdout
 set -e
 
 [ $m = $r ]
 if [ -f "$t".expect ]; then
-    $DIFF -u "$t".expect "$t".stdout;
+    $DIFF -u "$t".expect "$t".mes-stdout;
 fi
diff --git a/check.sh b/check.sh
index 1eecadf9..7c4eb0b3 100755
--- a/check.sh
+++ b/check.sh
@@ -18,7 +18,9 @@
 # You should have received a copy of the GNU General Public License
 # along with Mes.  If not, see <http://www.gnu.org/licenses/>.
 
+export CC32
 export GUILE MES MES_ARENA
+CC32=${CC32-$(command -v i686-unknown-linux-gnu-gcc)}
 GUILE=${GUILE-guile}
 MES=${MES-src/mes}
 MES_ARENA=${MES_ARENA-100000000}