diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1a1687c..13b023b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -19,9 +19,9 @@ if ENABLE_REISERFS
 TESTS += reiserfs.test
 endif
 
-#if ENABLE_REISER4
-#TESTS += reiser4.test
-#endif
+if ENABLE_REISER4
+TESTS += reiser4.test
+endif
 
 if ENABLE_HFSP
 TESTS += hfsplus.test
diff --git a/tests/_common b/tests/_common
index e882dcd..5633ac6 100755
--- a/tests/_common
+++ b/tests/_common
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+export PATH=/sbin:/usr/sbin:/bin:/usr/bin
+
 break_debug=0
 logfile='test.log'
 img='floppy.img'
@@ -65,11 +67,12 @@ _ptlbreak(){
     fi
 
 }
+
 _test_size(){
     fs=$1
     case "$fs" in
 	fat12)
-	    normal_size=$((1024*8))
+	    normal_size=360
 	;;
 	fat16)
 	    normal_size=$((1024*32))
@@ -77,33 +80,37 @@ _test_size(){
 	fat32|fat|vfat)
 	    normal_size=$((1024*128))
 	;;
+	xfs)
+	    normal_size=$((1024*310))
+	;;
     esac
 
-    echo $normal_size
+    echo "$normal_size"
 }
 
-
 _findmkfs(){
     fs=$1
     case "$fs" in
-	fat12|fat16|fat32|fat|vfat)
+	fat12|fat16|fat32|fat)
 	    fs="vfat"
 	;;
     esac
 
-    locate_path=$(type -P locate)
-    if [ -n $locate_path ]; then
-        mkfs_path=$($locate_path mkfs.$fs|grep sbin| sort -n -r |head -n 1)
+    locate_path="$(type -P locate)"
+    if [ -n "$locate_path" ]; then
+        mkfs_path="$($locate_path mkfs.$fs|grep sbin| sort -n -r |head -n 1)"
+    fi
+    if [ -z "$mkfs_path" ] && [ "$fs" = "vfat" ]; then
+	mkfs_path="$($locate_path mkfs.fat|grep sbin| sort -n -r |head -n 1)"
     fi
-    if [ -z $mkfs_path ]; then
-        mkfs_path=$(which mkfs.$fs)
+    if [ -z "$mkfs_path" ]; then
+        mkfs_path="$(which mkfs.$fs)"
     fi
-    if [ -z $mkfs_path ]; then
-	echo  >&2 "can't find mkfs.$fs"
+    if [ -z "$mkfs_path" ]; then
+	echo "can't find mkfs.$fs" >&2
 	exit 1
     fi
-    echo $mkfs_path
-
+    echo "$mkfs_path"
 }
 
 _ptlname(){
@@ -163,5 +170,5 @@ _convert_to_bytes(){
 	    bytes=$((str))
 	;;
     esac
-    echo $bytes
+    echo "$bytes"
 }
diff --git a/tests/btrfs.test b/tests/btrfs.test
index 510a3f8..7f1dd2a 100755
--- a/tests/btrfs.test
+++ b/tests/btrfs.test
@@ -1,2 +1,3 @@
 #!/bin/bash
+vm-run --mem=1240M \
 "$(dirname "$0")"/mini_clone_restore_test -f 115000000 btrfs