diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index f451667ce3be869aebc378adccf0b73f34c1ea65..2a6a84f8ef79e7f98d112c9de31648702ebbf4c0 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1094,6 +1094,9 @@ test_32a() {
         #       there appears to be a lot of assumption here about loopback
         #       devices
         # or maybe this test is just totally useless on a client-only system
+	[ "$mds_HOST" = "`hostname`" ] || { skip "remote MDS" && return 0; }
+	[ "$ost1_HOST" = "`hostname`" ] || { skip "remote OST" && return 0; }
+
         [ -z "$TUNEFS" ] && skip "No tunefs" && return
 	local DISK1_4=$LUSTRE/tests/disk1_4.zip
         [ ! -r $DISK1_4 ] && skip "Cant find $DISK1_4, skipping" && return
@@ -1154,6 +1157,9 @@ test_32b() {
         #       there appears to be a lot of assumption here about loopback
         #       devices
         # or maybe this test is just totally useless on a client-only system
+        [ "$mds_HOST" = "`hostname`" ] || { skip "remote MDS" && return 0; }
+        [ "$ost1_HOST" = "`hostname`" ] || { skip "remote OST" && return 0; }
+
         [ -z "$TUNEFS" ] && skip "No tunefs" && return
 	local DISK1_4=$LUSTRE/tests/disk1_4.zip
         [ ! -r $DISK1_4 ] && skip "Cant find $DISK1_4, skipping" && return
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 2cd30491366d6dd9afdde2e8560d27593710f6a0..00dbe7440ae516ed88aac73a1ebadc896b7fa9d9 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -1000,7 +1000,7 @@ equals_msg() {
 
     local suffixlen=$((${#EQUALS} - ${#msg}))
     [ $suffixlen -lt 5 ] && suffixlen=5
-    printf '===== %s %.*s\n' "$msg" $suffixlen $EQUALS
+    log `echo $(printf '===== %s %.*s\n' "$msg" $suffixlen $EQUALS)`
 }
 
 log() {