Index: trunk/test/testrun_1.sh
===================================================================
--- trunk/test/testrun_1.sh	(revision 590)
+++ trunk/test/testrun_1.sh	(revision 592)
@@ -1100,7 +1100,7 @@
 	fi
 	#
-	# wtmp may not be readable
-	#
-	tmp=`./samhain -j -L $LOGFILE | grep ERR | grep -v wtmp | wc -l`
+	# wtmp may not be readable -- and utmp may not exist anymore
+	#
+	tmp=`./samhain -j -L $LOGFILE | grep ERR | grep -v wtmp | grep -v utmp | wc -l`
 	if [ $tmp -ne 0 ]; then
 	    [ -z "$verbose" ] || log_msg_fail "errors during check";
Index: trunk/test/testrun_1a.sh
===================================================================
--- trunk/test/testrun_1a.sh	(revision 590)
+++ trunk/test/testrun_1a.sh	(revision 592)
@@ -55,5 +55,5 @@
 	return 1
     fi
-    "$CONVERT" --help | grep  ImageMagick >/dev/null 2>&1
+    "$CONVERT" -version | grep  ImageMagick >/dev/null 2>&1
     if [ $? -ne 0 ]; then
 	[ -z "$verbose" ] || log_msg_fail "Convert utility is not ImageMagick convert";
Index: trunk/test/testrun_1b.sh
===================================================================
--- trunk/test/testrun_1b.sh	(revision 590)
+++ trunk/test/testrun_1b.sh	(revision 592)
@@ -363,5 +363,5 @@
 	    #
 	    PRECONV=`find_path convert`
-	    "${PRECONV}" --help | grep  ImageMagick >/dev/null 2>&1 && \
+	    "${PRECONV}" -version | grep  ImageMagick >/dev/null 2>&1 && \
  		CONVERT="${PRECONV}"
 
Index: trunk/test/testrun_1i.sh
===================================================================
--- trunk/test/testrun_1i.sh	(revision 590)
+++ trunk/test/testrun_1i.sh	(revision 592)
@@ -299,5 +299,5 @@
 	    #
 	    PRECONV=`find_path convert`
-	    "${PRECONV}" --help | grep  ImageMagick >/dev/null 2>&1 && \
+	    "${PRECONV}" -version | grep  ImageMagick >/dev/null 2>&1 && \
  		CONVERT="${PRECONV}"