diff --git a/lustre/tests/run-llog.sh b/lustre/tests/run-llog.sh
index 64d64038d0dfc66f800b6aefe997f99b3aa2cb83..22434b7d2d03c7ce8d82b78f1432ce6be88085e8 100644
--- a/lustre/tests/run-llog.sh
+++ b/lustre/tests/run-llog.sh
@@ -1,16 +1,24 @@
 #!/bin/bash
-insmod ../obdclass/llog_test.o
-../utils/lctl modules > /r/tmp/ogdb-localhost.localdomain
+PATH=`dirname $0`:`dirname $0`/../utils:$PATH
+insmod ../obdclass/llog_test.o || exit 1
+lctl modules > /r/tmp/ogdb-`hostname`
 echo "NOW reload debugging syms.."
 
-# Using ignore_errors will allow lctl to cleanup even if the test
-# fails.
-../utils/lctl <<EOF
-ignore_errors
+RC=0
+lctl <<EOT || RC=2
 newdev
 attach llog_test llt_name llt_uuid
 setup mds1
+EOT
+
+# Using ignore_errors will allow lctl to cleanup even if the test fails.
+lctl <<EOC
+cfg_device llt_name
+ignore_errors
 cleanup
 detach
-EOF
-rmmod llog_test
+EOC
+rmmod llog_test || RC2=3
+[ $RC -eq 0 -a "$RC2" ] && RC=$RC2
+
+exit $RC