diff --git a/releng/test_hardlinks b/releng/test_hardlinks
index a009e8b6..3e1d34b3 100755
--- a/releng/test_hardlinks
+++ b/releng/test_hardlinks
@@ -92,7 +92,7 @@ do
   elif test x"$i" = x"-keep"
   then
     keep=1
-  elif test x"$i" = x"-clean_up"
+  elif test x"$i" = x"-cleanup"
   then
     keep=0
     clean_up
@@ -101,7 +101,7 @@ do
   then
     next_is_xorriso=1
   else
-    echo "Usage: $0 [-rc FILE] [-keep] [-clean_up] [-xorriso PATH]" >&2
+    echo "Usage: $0 [-rc FILE] [-keep] [-cleanup] [-xorriso PATH]" >&2
     exit 2
   fi
 done
@@ -129,7 +129,7 @@ then
 fi
 if test "$bad" = 1
 then
-  exit 1
+  exit 3
 fi
 
 echo "=== Setting up $on_disk with several hardlinks" >&2
@@ -197,8 +197,11 @@ echo
 if test "$failure" = 1
 then
   echo "======== $prog :" 'FAILED'
+  echo FAIL
+  exit 1
 else
   echo "======== $prog :" "Passed"
+  echo 
 fi
-echo 
 
+exit 0