diff --git a/check b/check
index 42b25b56..195c25d1 100755
--- a/check
+++ b/check
@@ -36,9 +36,8 @@ here=`pwd`
 FSTYP=xfs
 
 SUPPORTED_TESTS="[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]"
-TEST_GROUP_DIR="tests"
-GENERIC_GROUP_DIR="$TEST_GROUP_DIR/generic"
-XFS_GROUP_DIR="$TEST_GROUP_DIR/xfs"
+SRC_DIR="tests"
+SRC_GROUPS="generic shared"
 
 # generic initialization
 iam=check
@@ -87,13 +86,12 @@ _setenvironment()
 get_group_list()
 {
 	grp=$1
-	dirs=". $GENERIC_GROUP_DIR $XFS_GROUP_DIR"
 
-	for d in $dirs; do
-		l=$(sed -n < $d/group \
+	for d in $SRC_GROUPS $FSTYP; do
+		l=$(sed -n < $SRC_DIR/$d/group \
 			-e 's/#.*//' \
 			-e 's/$/ /' \
-			-e "s;\(^[0-9][0-9][0-9]\).* $grp .*;$d/\1;p")
+			-e "s;\(^[0-9][0-9][0-9]\).* $grp .*;$SRC_DIR/$d/\1;p")
 		grpl="$grpl $l"
 	done
 	echo $grpl
@@ -297,7 +295,7 @@ END	{ if (NR > 0) {
 
 	echo "" >>check.log
 	date >>check.log
-	echo $list | fmt | sed -e 's/^/    /' -e 's;tests/;;g' >>check.log
+	echo $list | fmt | sed -e 's/^/    /' -e "s;$SRC_DIR/;;g" >>check.log
 	$interrupt && echo "Interrupted!" >>check.log
         
         if [ ! -z "$n_try" -a $n_try != 0 ]
@@ -378,7 +376,7 @@ do
 
     # the filename for the test and the name output are different.
     # we don't include the tests/ directory in the name output.
-    seqnum=`echo $seq | sed -e 's;tests/;;'`
+    seqnum=`echo $seq | sed -e "s;$SRC_DIR/;;"`
 
     echo -n "$seqnum"
 
diff --git a/group b/group
index d1469709..4e01f0c1 100644
--- a/group
+++ b/group
@@ -3,29 +3,3 @@
 # - do not start group names with a digit
 # - comment line before each group is "new" description
 #
-# test-group association ... one line per test
-#
-032 mkfs auto quick
-040 other auto
-051 acl udf auto quick
-098 udf auto
-101 udf
-102 udf
-177 rw other auto
-218 auto fsr quick
-243 auto quick prealloc
-254 auto quick
-264 auto
-265 auto
-271 auto rw quick
-272 auto enospc rw
-276 auto rw metadata
-284 auto
-289 auto quick
-298 auto trim
-301 aio dangerous ioctl rw stress
-302 aio dangerous ioctl rw stress
-303 aio dangerous ioctl rw stress
-304 aio dangerous ioctl rw stress
-305 aio dangerous enospc rw stress
-307 auto quick
diff --git a/254 b/tests/btrfs/254
similarity index 100%
rename from 254
rename to tests/btrfs/254
diff --git a/254.out b/tests/btrfs/254.out
similarity index 100%
rename from 254.out
rename to tests/btrfs/254.out
diff --git a/264 b/tests/btrfs/264
similarity index 100%
rename from 264
rename to tests/btrfs/264
diff --git a/264.out b/tests/btrfs/264.out
similarity index 100%
rename from 264.out
rename to tests/btrfs/264.out
diff --git a/265 b/tests/btrfs/265
similarity index 100%
rename from 265
rename to tests/btrfs/265
diff --git a/265.out b/tests/btrfs/265.out
similarity index 100%
rename from 265.out
rename to tests/btrfs/265.out
diff --git a/276 b/tests/btrfs/276
similarity index 100%
rename from 276
rename to tests/btrfs/276
diff --git a/276.out b/tests/btrfs/276.out
similarity index 100%
rename from 276.out
rename to tests/btrfs/276.out
diff --git a/284 b/tests/btrfs/284
similarity index 100%
rename from 284
rename to tests/btrfs/284
diff --git a/284.out b/tests/btrfs/284.out
similarity index 100%
rename from 284.out
rename to tests/btrfs/284.out
diff --git a/307 b/tests/btrfs/307
similarity index 100%
rename from 307
rename to tests/btrfs/307
diff --git a/307.out b/tests/btrfs/307.out
similarity index 100%
rename from 307.out
rename to tests/btrfs/307.out
diff --git a/tests/btrfs/group b/tests/btrfs/group
new file mode 100644
index 00000000..bc6c256c
--- /dev/null
+++ b/tests/btrfs/group
@@ -0,0 +1,11 @@
+# QA groups control file
+# Defines test groups and nominal group owners
+# - do not start group names with a digit
+# - comment line before each group is "new" description
+#
+254 auto quick
+264 auto
+265 auto
+276 auto rw metadata
+284 auto
+307 auto quick
diff --git a/271 b/tests/ext4/271
similarity index 100%
rename from 271
rename to tests/ext4/271
diff --git a/271.out b/tests/ext4/271.out
similarity index 100%
rename from 271.out
rename to tests/ext4/271.out
diff --git a/301 b/tests/ext4/301
similarity index 100%
rename from 301
rename to tests/ext4/301
diff --git a/301.out b/tests/ext4/301.out
similarity index 100%
rename from 301.out
rename to tests/ext4/301.out
diff --git a/302 b/tests/ext4/302
similarity index 100%
rename from 302
rename to tests/ext4/302
diff --git a/302.out b/tests/ext4/302.out
similarity index 100%
rename from 302.out
rename to tests/ext4/302.out
diff --git a/303 b/tests/ext4/303
similarity index 100%
rename from 303
rename to tests/ext4/303
diff --git a/303.out b/tests/ext4/303.out
similarity index 100%
rename from 303.out
rename to tests/ext4/303.out
diff --git a/304 b/tests/ext4/304
similarity index 100%
rename from 304
rename to tests/ext4/304
diff --git a/304.out b/tests/ext4/304.out
similarity index 100%
rename from 304.out
rename to tests/ext4/304.out
diff --git a/tests/ext4/group b/tests/ext4/group
new file mode 100644
index 00000000..6a44db30
--- /dev/null
+++ b/tests/ext4/group
@@ -0,0 +1,11 @@
+# QA groups control file
+# Defines test groups and nominal group owners
+# - do not start group names with a digit
+# - comment line before each group is "new" description
+#
+271 auto rw quick
+301 aio dangerous ioctl rw stress
+302 aio dangerous ioctl rw stress
+303 aio dangerous ioctl rw stress
+304 aio dangerous ioctl rw stress
+
diff --git a/032 b/tests/shared/032
similarity index 100%
rename from 032
rename to tests/shared/032
diff --git a/032.out b/tests/shared/032.out
similarity index 100%
rename from 032.out
rename to tests/shared/032.out
diff --git a/051 b/tests/shared/051
similarity index 100%
rename from 051
rename to tests/shared/051
diff --git a/051.out b/tests/shared/051.out
similarity index 100%
rename from 051.out
rename to tests/shared/051.out
diff --git a/218 b/tests/shared/218
similarity index 100%
rename from 218
rename to tests/shared/218
diff --git a/218.out b/tests/shared/218.out
similarity index 100%
rename from 218.out
rename to tests/shared/218.out
diff --git a/243 b/tests/shared/243
similarity index 100%
rename from 243
rename to tests/shared/243
diff --git a/243.out b/tests/shared/243.out
similarity index 100%
rename from 243.out
rename to tests/shared/243.out
diff --git a/272 b/tests/shared/272
similarity index 100%
rename from 272
rename to tests/shared/272
diff --git a/272.out b/tests/shared/272.out
similarity index 100%
rename from 272.out
rename to tests/shared/272.out
diff --git a/289 b/tests/shared/289
similarity index 100%
rename from 289
rename to tests/shared/289
diff --git a/289.out b/tests/shared/289.out
similarity index 100%
rename from 289.out
rename to tests/shared/289.out
diff --git a/298 b/tests/shared/298
similarity index 100%
rename from 298
rename to tests/shared/298
diff --git a/298.out b/tests/shared/298.out
similarity index 100%
rename from 298.out
rename to tests/shared/298.out
diff --git a/305 b/tests/shared/305
similarity index 100%
rename from 305
rename to tests/shared/305
diff --git a/305.out b/tests/shared/305.out
similarity index 100%
rename from 305.out
rename to tests/shared/305.out
diff --git a/tests/shared/group b/tests/shared/group
new file mode 100644
index 00000000..0ad640b3
--- /dev/null
+++ b/tests/shared/group
@@ -0,0 +1,14 @@
+# QA groups control file
+# Defines test groups and nominal group owners
+# - do not start group names with a digit
+# - comment line before each group is "new" description
+#
+032 mkfs auto quick
+051 acl udf auto quick
+218 auto fsr quick
+243 auto quick prealloc
+272 auto enospc rw
+289 auto quick
+298 auto trim
+305 aio dangerous enospc rw stress
+
diff --git a/098 b/tests/udf/098
similarity index 100%
rename from 098
rename to tests/udf/098
diff --git a/098.out b/tests/udf/098.out
similarity index 100%
rename from 098.out
rename to tests/udf/098.out
diff --git a/101 b/tests/udf/101
similarity index 100%
rename from 101
rename to tests/udf/101
diff --git a/101.out b/tests/udf/101.out
similarity index 100%
rename from 101.out
rename to tests/udf/101.out
diff --git a/102 b/tests/udf/102
similarity index 100%
rename from 102
rename to tests/udf/102
diff --git a/102.out b/tests/udf/102.out
similarity index 100%
rename from 102.out
rename to tests/udf/102.out
diff --git a/tests/udf/group b/tests/udf/group
new file mode 100644
index 00000000..24f682cc
--- /dev/null
+++ b/tests/udf/group
@@ -0,0 +1,8 @@
+# QA groups control file
+# Defines test groups and nominal group owners
+# - do not start group names with a digit
+# - comment line before each group is "new" description
+#
+098 udf auto
+101 udf
+102 udf
diff --git a/040 b/tests/xfs/040
similarity index 100%
rename from 040
rename to tests/xfs/040
diff --git a/040.good b/tests/xfs/040.good
similarity index 100%
rename from 040.good
rename to tests/xfs/040.good
diff --git a/040.out b/tests/xfs/040.out
similarity index 100%
rename from 040.out
rename to tests/xfs/040.out
diff --git a/177 b/tests/xfs/177
similarity index 100%
rename from 177
rename to tests/xfs/177
diff --git a/177.out b/tests/xfs/177.out
similarity index 100%
rename from 177.out
rename to tests/xfs/177.out
diff --git a/252 b/tests/xfs/252
similarity index 100%
rename from 252
rename to tests/xfs/252
diff --git a/252.out b/tests/xfs/252.out
similarity index 100%
rename from 252.out
rename to tests/xfs/252.out
diff --git a/tests/xfs/group b/tests/xfs/group
index 4d7f06f3..425bc0a7 100644
--- a/tests/xfs/group
+++ b/tests/xfs/group
@@ -25,6 +25,7 @@
 037 dump ioctl remote tape
 038 dump ioctl remote tape
 039 dump ioctl remote tape
+040 other auto
 041 growfs ioctl auto
 042 fsr ioctl auto
 043 dump ioctl tape
@@ -120,6 +121,7 @@
 174 rw filestreams auto
 175 dmapi auto
 176 dmapi auto
+177 rw other auto
 178 mkfs other auto
 179 metadata rw auto
 180 metadata rw auto
@@ -154,6 +156,7 @@
 242 auto quick prealloc
 244 auto quota quick
 250 auto quick rw prealloc metadata
+252 auto quick prealloc
 253 auto quick
 259 auto quick
 261 auto quick quota