diff --git a/lustre/tests/local.sh b/lustre/tests/local.sh
index 86dd40919347e7875e01e9970c57394ffc32a942..549e59e4b30203e1576428b30ec00bbe8258ba1c 100755
--- a/lustre/tests/local.sh
+++ b/lustre/tests/local.sh
@@ -10,7 +10,8 @@ TMP=${TMP:-/tmp}
 MDSDEV=${MDSDEV:-$TMP/mds1-`hostname`}
 
 MDSSIZE=${MDSSIZE:-400000}
-FSTYPE=${FSTYPE:-ext3}
+DEF_FSTYPE=`test "x$(uname -r | grep -o '2.6')" = "x2.6" && echo "ldiskfs" || echo "ext3"`
+FSTYPE=${FSTYPE:-$DEF_FSTYPE}
 OST_FSTYPE=${OST_FSTYPE:-$FSTYPE}
 MOUNT=${MOUNT:-/mnt/lustre}
 MOUNT2=${MOUNT2:-${MOUNT}2}
diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 33ad8e5f7b669214478778b2b18410878fce164e..27c466ff7b2bff91b87e391b6ee2507dfe08e51f 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -14,7 +14,7 @@ ONLY=${ONLY:-"$*"}
 # - 65h (default stripe inheritance) is not implemented for LMV 
 #   configurations. Will be done in second phase of collibri.
 
-ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"51b 51c 65h"}
+ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"48a 51b 51c 65h"}
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
 [ "$ALWAYS_EXCEPT$EXCEPT" ] && echo "Skipping tests: $ALWAYS_EXCEPT $EXCEPT"
@@ -24,7 +24,8 @@ export PATH=$PWD/$SRCDIR:$SRCDIR:$SRCDIR/../utils:$PATH
 export SECURITY=${SECURITY:-"null"}
 
 TMP=${TMP:-/tmp}
-FSTYPE=${FSTYPE:-ext3}
+DEF_FSTYPE=`test "x$(uname -r | grep -o '2.6')" = "x2.6" && echo "ldiskfs" || echo "ext3"`
+FSTYPE=${FSTYPE:-$DEF_FSTYPE}
 
 CHECKSTAT=${CHECKSTAT:-"checkstat -v"}
 CREATETEST=${CREATETEST:-createtest}
@@ -1951,7 +1952,7 @@ check_fstype() {
         test "x$FSTYPE" = "x$(grep $FSTYPE /proc/filesystems)" && return 0
         modprobe $FSTYPE > /dev/null 2>&1
         test "x$FSTYPE" = "x$(grep $FSTYPE /proc/filesystems)" && return 0
-	test "x$(uname -r | grep -o "2.6")" = "x2.6" && MODEXT="ko" || MODEXT="o"
+	test "x$(uname -r | grep -o '2.6')" = "x2.6" && MODEXT="ko" || MODEXT="o"
         insmod ../$FSTYPE/$FSTYPE.$MODEXT > /dev/null 2>&1
         test "x$FSTYPE" = "x$(grep $FSTYPE /proc/filesystems)" && return 0
         return 1