diff --git a/build-aux/test-c.sh b/build-aux/test-c.sh
index 9a84f6c4..1e8340b1 100755
--- a/build-aux/test-c.sh
+++ b/build-aux/test-c.sh
@@ -63,7 +63,7 @@ $CC -c $CPPFLAGS $CFLAGS -o "$o".o "$t"
 $CC $CFLAGS $LDFLAGS -L . -o "$o" $crt1 "$o".o $LIBS
 
 set +e
-timeout 10 "$o" -s --long file0 file1 > "$o".1 2> "$o".2
+timeout 20 "$o" -s --long file0 file1 > "$o".1 2> "$o".2
 r=$?
 set -e
 if [ -f "$b".exit ]; then
diff --git a/lib/tests/io/90-stat.c b/lib/tests/io/90-stat.c
index b7f400b3..cad5e38d 100644
--- a/lib/tests/io/90-stat.c
+++ b/lib/tests/io/90-stat.c
@@ -26,7 +26,7 @@
 #include <sys/stat.h>
 
 
-#if __i386__
+#if __i386__ || __arm__
 #define stat xstat
 
 struct stat