diff --git a/ChangeLog b/ChangeLog
index 79d4abd10..1133d8ddd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-07-28 Paulo Andrade <pcpa@gnu.org>
+
+	* check/check.arm.sh, check/check.sh, check/check.swf.sh,
+	check/check.x87.sh: Properly check test programs output,
+	not just rely on the test program self testing the results
+	and not crashing.
+
 2013-07-28 Paulo Andrade <pcpa@gnu.org>
 
 	* lib/jit_aarch64.c: Remove unused macros left from cut&paste
diff --git a/check/check.arm.sh b/check/check.arm.sh
index 0b1d369f5..2f576bea8 100755
--- a/check/check.arm.sh
+++ b/check/check.arm.sh
@@ -1,2 +1,15 @@
 #!/bin/sh
-./lightning -mthumb=0 $srcdir/`basename $0 | sed -e 's|\.arm$||'`.tst
+test=`basename $0 | sed -e 's|\.arm$||'`
+./lightning -mthumb=0 $srcdir/$test.tst | tr -d \\r > $test.out
+if test $? != 0; then
+  exit $?
+fi
+
+cmp -s $srcdir/$test.ok $test.out
+result=$?
+if test $result != 0; then
+    diff $srcdir/$test.ok $test.out
+    rm $test.out
+    exit 1
+fi
+rm $test.out
diff --git a/check/check.sh b/check/check.sh
index edf1f21ff..e0267a261 100755
--- a/check/check.sh
+++ b/check/check.sh
@@ -1,2 +1,15 @@
 #!/bin/sh
-./lightning $srcdir/`basename $0`.tst
+test=`basename $0`
+./lightning $srcdir/$test.tst | tr -d \\r > $test.out
+if test $? != 0; then
+  exit $?
+fi
+
+cmp -s $srcdir/$test.ok $test.out
+result=$?
+if test $result != 0; then
+    diff $srcdir/$test.ok $test.out
+    rm $test.out
+    exit 1
+fi
+rm $test.out
diff --git a/check/check.swf.sh b/check/check.swf.sh
index 24b1741fb..9494eef78 100755
--- a/check/check.swf.sh
+++ b/check/check.swf.sh
@@ -1,2 +1,15 @@
 #!/bin/sh
-./lightning -mvfp=0 $srcdir/`basename $0 | sed -e 's|\.swf$||'`.tst
+test=`basename $0 | sed -e 's|\.swf$||'`
+./lightning -mvfp=0 $srcdir/$test.tst | tr -d \\r > $test.out
+if test $? != 0; then
+  exit $?
+fi
+
+cmp -s $srcdir/$test.ok $test.out
+result=$?
+if test $result != 0; then
+    diff $srcdir/$test.ok $test.out
+    rm $test.out
+    exit 1
+fi
+rm $test.out
diff --git a/check/check.x87.sh b/check/check.x87.sh
index 87cab8e9f..c0245e1aa 100755
--- a/check/check.x87.sh
+++ b/check/check.x87.sh
@@ -1,2 +1,15 @@
 #!/bin/sh
-./lightning -mx87=1 $srcdir/`basename $0 | sed -e 's|\.x87$||'`.tst
+test=`basename $0 | sed -e 's|\.x87$||'`
+./lightning -mx87=1 $srcdir/$test.tst | tr -d \\r > $test.out
+if test $? != 0; then
+  exit $?
+fi
+
+cmp -s $srcdir/$test.ok $test.out
+result=$?
+if test $result != 0; then
+    diff $srcdir/$test.ok $test.out
+    rm $test.out
+    exit 1
+fi
+rm $test.out