diff --git a/tests/bcachefs/xfstests-nocow.ktest b/tests/bcachefs/xfstests-nocow.ktest
deleted file mode 100755
index 76819548..00000000
--- a/tests/bcachefs/xfstests-nocow.ktest
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-export MKFS_OPTIONS="--nocow"
-
-. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/xfstests.ktest
diff --git a/tests/blktests.ktest b/tests/block/blktests.ktest
similarity index 100%
rename from tests/blktests.ktest
rename to tests/block/blktests.ktest
diff --git a/tests/block/discard b/tests/block/discard
deleted file mode 100755
index f1d9669a..00000000
--- a/tests/block/discard
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-if [ "$1" = "deps" ]; then
-    cat <<-ZZ
-REQUIRE=../test-libs.sh
-KERNEL_CONFIG_REQUIRE=EXT4_FS
-MEM=2G
-ZZ
-    exit
-fi
-
-. test-libs.sh
-
-modprobe scsi_debug dev_size_mb=1024
-
-stride=8192
-
-for i in `seq 0 $stride 4194304`; do
-    hdparm --please-destroy-my-drive --trim-sector-ranges $i:$stride ${ktest_scratch_dev[0]} > /dev/null 2> /dev/null
-done
-
-echo "TEST SUCCESSFUL"
diff --git a/tests/md.ktest b/tests/block/md.ktest
similarity index 100%
rename from tests/md.ktest
rename to tests/block/md.ktest
diff --git a/tests/fs/bcachefs/.gitignore b/tests/fs/bcachefs/.gitignore
new file mode 100644
index 00000000..00d05b45
--- /dev/null
+++ b/tests/fs/bcachefs/.gitignore
@@ -0,0 +1 @@
+bcachefs-tools
diff --git a/tests/bcachefs/32bit.ktest b/tests/fs/bcachefs/32bit.ktest
similarity index 56%
rename from tests/bcachefs/32bit.ktest
rename to tests/fs/bcachefs/32bit.ktest
index 6a885fd7..1d47afc8 100755
--- a/tests/bcachefs/32bit.ktest
+++ b/tests/fs/bcachefs/32bit.ktest
@@ -2,7 +2,7 @@
 
 ktest_arch=x86
 
-. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/bcachefs-test-libs.sh
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../bcachefs-test-libs.sh
 
 config-timeout 30
 
diff --git a/tests/bcachefs/bcachefs-test-libs.sh b/tests/fs/bcachefs/bcachefs-test-libs.sh
similarity index 99%
rename from tests/bcachefs/bcachefs-test-libs.sh
rename to tests/fs/bcachefs/bcachefs-test-libs.sh
index 1b51e07d..e54e4f4e 100644
--- a/tests/bcachefs/bcachefs-test-libs.sh
+++ b/tests/fs/bcachefs/bcachefs-test-libs.sh
@@ -4,7 +4,7 @@
 # ktest framework.
 #
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../test-libs.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../../test-libs.sh
 
 require-git http://evilpiepirate.org/git/bcachefs-tools.git
 require-make bcachefs-tools
diff --git a/tests/bcachefs/ec.ktest b/tests/fs/bcachefs/ec.ktest
similarity index 100%
rename from tests/bcachefs/ec.ktest
rename to tests/fs/bcachefs/ec.ktest
diff --git a/tests/fs/bcachefs/fstests-nocow.ktest b/tests/fs/bcachefs/fstests-nocow.ktest
new file mode 100755
index 00000000..0a8dbc17
--- /dev/null
+++ b/tests/fs/bcachefs/fstests-nocow.ktest
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+export MKFS_OPTIONS="--nocow"
+
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/fstests.ktest
diff --git a/tests/bcachefs/xfstests.ktest b/tests/fs/bcachefs/fstests.ktest
similarity index 88%
rename from tests/bcachefs/xfstests.ktest
rename to tests/fs/bcachefs/fstests.ktest
index 41644079..3de03411 100755
--- a/tests/bcachefs/xfstests.ktest
+++ b/tests/fs/bcachefs/fstests.ktest
@@ -7,7 +7,7 @@ require-make linuxquota
 
 require-git http://evilpiepirate.org/git/xfstests.git ../xfstests
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../xfstests.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../fstests.sh
 
 require-kernel-config BCACHEFS_POSIX_ACL
 require-kernel-config BCACHEFS_QUOTA
@@ -22,7 +22,7 @@ run_test()
 	bcachefs_antagonist
     fi
 
-    run_xfstests "$@"
+    run_fstests "$@"
 
     check_counters ${ktest_scratch_dev[0]}
     check_counters ${ktest_scratch_dev[1]}
diff --git a/tests/bcachefs/fuse.ktest b/tests/fs/bcachefs/fuse.ktest
similarity index 83%
rename from tests/bcachefs/fuse.ktest
rename to tests/fs/bcachefs/fuse.ktest
index 5b7de2a8..34e2a677 100755
--- a/tests/bcachefs/fuse.ktest
+++ b/tests/fs/bcachefs/fuse.ktest
@@ -7,7 +7,7 @@ require-make linuxquota
 
 require-git http://evilpiepirate.org/git/xfstests.git ../xfstests
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../xfstests.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../fstests.sh
 
 require-kernel-config FUSE_FS
 
@@ -19,7 +19,7 @@ run_tests()
 {
     mv /usr/local/sbin/mount.fuse.bcachefs /sbin
 
-    run_xfstests "$@"
+    run_fstests "$@"
 }
 
 main "$@"
diff --git a/tests/bcachefs/gcov-ec.ktest b/tests/fs/bcachefs/gcov-ec.ktest
similarity index 100%
rename from tests/bcachefs/gcov-ec.ktest
rename to tests/fs/bcachefs/gcov-ec.ktest
diff --git a/tests/bcachefs/gcov-quota.ktest b/tests/fs/bcachefs/gcov-fstests-nocow.ktest
similarity index 100%
rename from tests/bcachefs/gcov-quota.ktest
rename to tests/fs/bcachefs/gcov-fstests-nocow.ktest
diff --git a/tests/bcachefs/gcov-replication.ktest b/tests/fs/bcachefs/gcov-fstests.ktest
similarity index 100%
rename from tests/bcachefs/gcov-replication.ktest
rename to tests/fs/bcachefs/gcov-fstests.ktest
diff --git a/tests/bcachefs/gcov-single_device.ktest b/tests/fs/bcachefs/gcov-quota.ktest
similarity index 100%
rename from tests/bcachefs/gcov-single_device.ktest
rename to tests/fs/bcachefs/gcov-quota.ktest
diff --git a/tests/bcachefs/gcov-subvol.ktest b/tests/fs/bcachefs/gcov-replication.ktest
similarity index 100%
rename from tests/bcachefs/gcov-subvol.ktest
rename to tests/fs/bcachefs/gcov-replication.ktest
diff --git a/tests/bcachefs/gcov-tier.ktest b/tests/fs/bcachefs/gcov-single_device.ktest
similarity index 100%
rename from tests/bcachefs/gcov-tier.ktest
rename to tests/fs/bcachefs/gcov-single_device.ktest
diff --git a/tests/bcachefs/gcov-units.ktest b/tests/fs/bcachefs/gcov-subvol.ktest
similarity index 100%
rename from tests/bcachefs/gcov-units.ktest
rename to tests/fs/bcachefs/gcov-subvol.ktest
diff --git a/tests/bcachefs/gcov-xfstests-nocow.ktest b/tests/fs/bcachefs/gcov-tier.ktest
similarity index 100%
rename from tests/bcachefs/gcov-xfstests-nocow.ktest
rename to tests/fs/bcachefs/gcov-tier.ktest
diff --git a/tests/bcachefs/gcov-xfstests.ktest b/tests/fs/bcachefs/gcov-units.ktest
similarity index 100%
rename from tests/bcachefs/gcov-xfstests.ktest
rename to tests/fs/bcachefs/gcov-units.ktest
diff --git a/tests/bcachefs/kasan-ec.ktest b/tests/fs/bcachefs/kasan-ec.ktest
similarity index 100%
rename from tests/bcachefs/kasan-ec.ktest
rename to tests/fs/bcachefs/kasan-ec.ktest
diff --git a/tests/bcachefs/kasan-quota.ktest b/tests/fs/bcachefs/kasan-fstests-nocow.ktest
similarity index 100%
rename from tests/bcachefs/kasan-quota.ktest
rename to tests/fs/bcachefs/kasan-fstests-nocow.ktest
diff --git a/tests/btrfs/kasan-fstests.ktest b/tests/fs/bcachefs/kasan-fstests.ktest
similarity index 100%
rename from tests/btrfs/kasan-fstests.ktest
rename to tests/fs/bcachefs/kasan-fstests.ktest
diff --git a/tests/bcachefs/kasan-replication.ktest b/tests/fs/bcachefs/kasan-quota.ktest
similarity index 100%
rename from tests/bcachefs/kasan-replication.ktest
rename to tests/fs/bcachefs/kasan-quota.ktest
diff --git a/tests/bcachefs/kasan-single_device.ktest b/tests/fs/bcachefs/kasan-replication.ktest
similarity index 100%
rename from tests/bcachefs/kasan-single_device.ktest
rename to tests/fs/bcachefs/kasan-replication.ktest
diff --git a/tests/bcachefs/kasan-subvol.ktest b/tests/fs/bcachefs/kasan-single_device.ktest
similarity index 100%
rename from tests/bcachefs/kasan-subvol.ktest
rename to tests/fs/bcachefs/kasan-single_device.ktest
diff --git a/tests/bcachefs/kasan-tier.ktest b/tests/fs/bcachefs/kasan-subvol.ktest
similarity index 100%
rename from tests/bcachefs/kasan-tier.ktest
rename to tests/fs/bcachefs/kasan-subvol.ktest
diff --git a/tests/bcachefs/kasan-units.ktest b/tests/fs/bcachefs/kasan-tier.ktest
similarity index 100%
rename from tests/bcachefs/kasan-units.ktest
rename to tests/fs/bcachefs/kasan-tier.ktest
diff --git a/tests/bcachefs/kasan-xfstests-nocow.ktest b/tests/fs/bcachefs/kasan-units.ktest
similarity index 100%
rename from tests/bcachefs/kasan-xfstests-nocow.ktest
rename to tests/fs/bcachefs/kasan-units.ktest
diff --git a/tests/bcachefs/kmsan-ec.ktest b/tests/fs/bcachefs/kmsan-ec.ktest
similarity index 100%
rename from tests/bcachefs/kmsan-ec.ktest
rename to tests/fs/bcachefs/kmsan-ec.ktest
diff --git a/tests/bcachefs/kmsan-quota.ktest b/tests/fs/bcachefs/kmsan-fstests-nocow.ktest
similarity index 100%
rename from tests/bcachefs/kmsan-quota.ktest
rename to tests/fs/bcachefs/kmsan-fstests-nocow.ktest
diff --git a/tests/bcachefs/kmsan-replication.ktest b/tests/fs/bcachefs/kmsan-fstests.ktest
similarity index 100%
rename from tests/bcachefs/kmsan-replication.ktest
rename to tests/fs/bcachefs/kmsan-fstests.ktest
diff --git a/tests/bcachefs/kmsan-single_device.ktest b/tests/fs/bcachefs/kmsan-quota.ktest
similarity index 100%
rename from tests/bcachefs/kmsan-single_device.ktest
rename to tests/fs/bcachefs/kmsan-quota.ktest
diff --git a/tests/bcachefs/kmsan-subvol.ktest b/tests/fs/bcachefs/kmsan-replication.ktest
similarity index 100%
rename from tests/bcachefs/kmsan-subvol.ktest
rename to tests/fs/bcachefs/kmsan-replication.ktest
diff --git a/tests/bcachefs/kmsan-tier.ktest b/tests/fs/bcachefs/kmsan-single_device.ktest
similarity index 100%
rename from tests/bcachefs/kmsan-tier.ktest
rename to tests/fs/bcachefs/kmsan-single_device.ktest
diff --git a/tests/bcachefs/kmsan-units.ktest b/tests/fs/bcachefs/kmsan-subvol.ktest
similarity index 100%
rename from tests/bcachefs/kmsan-units.ktest
rename to tests/fs/bcachefs/kmsan-subvol.ktest
diff --git a/tests/bcachefs/kmsan-xfstests-nocow.ktest b/tests/fs/bcachefs/kmsan-tier.ktest
similarity index 100%
rename from tests/bcachefs/kmsan-xfstests-nocow.ktest
rename to tests/fs/bcachefs/kmsan-tier.ktest
diff --git a/tests/bcachefs/kmsan-xfstests.ktest b/tests/fs/bcachefs/kmsan-units.ktest
similarity index 100%
rename from tests/bcachefs/kmsan-xfstests.ktest
rename to tests/fs/bcachefs/kmsan-units.ktest
diff --git a/tests/bcachefs/lockdep-ec.ktest b/tests/fs/bcachefs/lockdep-ec.ktest
similarity index 100%
rename from tests/bcachefs/lockdep-ec.ktest
rename to tests/fs/bcachefs/lockdep-ec.ktest
diff --git a/tests/bcachefs/lockdep-quota.ktest b/tests/fs/bcachefs/lockdep-fstests-nocow.ktest
similarity index 100%
rename from tests/bcachefs/lockdep-quota.ktest
rename to tests/fs/bcachefs/lockdep-fstests-nocow.ktest
diff --git a/tests/btrfs/lockdep-fstests.ktest b/tests/fs/bcachefs/lockdep-fstests.ktest
similarity index 100%
rename from tests/btrfs/lockdep-fstests.ktest
rename to tests/fs/bcachefs/lockdep-fstests.ktest
diff --git a/tests/bcachefs/lockdep-replication.ktest b/tests/fs/bcachefs/lockdep-quota.ktest
similarity index 100%
rename from tests/bcachefs/lockdep-replication.ktest
rename to tests/fs/bcachefs/lockdep-quota.ktest
diff --git a/tests/bcachefs/lockdep-single_device.ktest b/tests/fs/bcachefs/lockdep-replication.ktest
similarity index 100%
rename from tests/bcachefs/lockdep-single_device.ktest
rename to tests/fs/bcachefs/lockdep-replication.ktest
diff --git a/tests/bcachefs/lockdep-subvol.ktest b/tests/fs/bcachefs/lockdep-single_device.ktest
similarity index 100%
rename from tests/bcachefs/lockdep-subvol.ktest
rename to tests/fs/bcachefs/lockdep-single_device.ktest
diff --git a/tests/bcachefs/lockdep-tier.ktest b/tests/fs/bcachefs/lockdep-subvol.ktest
similarity index 100%
rename from tests/bcachefs/lockdep-tier.ktest
rename to tests/fs/bcachefs/lockdep-subvol.ktest
diff --git a/tests/bcachefs/lockdep-units.ktest b/tests/fs/bcachefs/lockdep-tier.ktest
similarity index 100%
rename from tests/bcachefs/lockdep-units.ktest
rename to tests/fs/bcachefs/lockdep-tier.ktest
diff --git a/tests/bcachefs/lockdep-xfstests-nocow.ktest b/tests/fs/bcachefs/lockdep-units.ktest
similarity index 100%
rename from tests/bcachefs/lockdep-xfstests-nocow.ktest
rename to tests/fs/bcachefs/lockdep-units.ktest
diff --git a/tests/bcachefs/module.ktest b/tests/fs/bcachefs/module.ktest
similarity index 86%
rename from tests/bcachefs/module.ktest
rename to tests/fs/bcachefs/module.ktest
index 4cc07a49..76a9af77 100755
--- a/tests/bcachefs/module.ktest
+++ b/tests/fs/bcachefs/module.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../test-libs.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../../test-libs.sh
 
 require-git http://evilpiepirate.org/git/bcachefs-tools.git
 require-make bcachefs-tools
diff --git a/tests/bcachefs/nas_apps.ktest b/tests/fs/bcachefs/nas_apps.ktest
similarity index 100%
rename from tests/bcachefs/nas_apps.ktest
rename to tests/fs/bcachefs/nas_apps.ktest
diff --git a/tests/bcachefs/nfs.ktest b/tests/fs/bcachefs/nfs.ktest
similarity index 100%
rename from tests/bcachefs/nfs.ktest
rename to tests/fs/bcachefs/nfs.ktest
diff --git a/tests/nodebug-base.sh b/tests/fs/bcachefs/nodebug-base.sh
similarity index 62%
rename from tests/nodebug-base.sh
rename to tests/fs/bcachefs/nodebug-base.sh
index c340c091..6a057bb7 100644
--- a/tests/nodebug-base.sh
+++ b/tests/fs/bcachefs/nodebug-base.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/test-libs.sh
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../../test-libs.sh
 
 require-kernel-config PREEMPT
 export NO_BCACHEFS_DEBUG=1
diff --git a/tests/bcachefs/nodebug-ec.ktest b/tests/fs/bcachefs/nodebug-ec.ktest
similarity index 100%
rename from tests/bcachefs/nodebug-ec.ktest
rename to tests/fs/bcachefs/nodebug-ec.ktest
diff --git a/tests/bcachefs/nodebug-quota.ktest b/tests/fs/bcachefs/nodebug-fstests-nocow.ktest
similarity index 100%
rename from tests/bcachefs/nodebug-quota.ktest
rename to tests/fs/bcachefs/nodebug-fstests-nocow.ktest
diff --git a/tests/bcachefs/nodebug-replication.ktest b/tests/fs/bcachefs/nodebug-fstests.ktest
similarity index 100%
rename from tests/bcachefs/nodebug-replication.ktest
rename to tests/fs/bcachefs/nodebug-fstests.ktest
diff --git a/tests/bcachefs/nodebug-single_device.ktest b/tests/fs/bcachefs/nodebug-quota.ktest
similarity index 100%
rename from tests/bcachefs/nodebug-single_device.ktest
rename to tests/fs/bcachefs/nodebug-quota.ktest
diff --git a/tests/bcachefs/nodebug-subvol.ktest b/tests/fs/bcachefs/nodebug-replication.ktest
similarity index 100%
rename from tests/bcachefs/nodebug-subvol.ktest
rename to tests/fs/bcachefs/nodebug-replication.ktest
diff --git a/tests/bcachefs/nodebug-tier.ktest b/tests/fs/bcachefs/nodebug-single_device.ktest
similarity index 100%
rename from tests/bcachefs/nodebug-tier.ktest
rename to tests/fs/bcachefs/nodebug-single_device.ktest
diff --git a/tests/bcachefs/nodebug-units.ktest b/tests/fs/bcachefs/nodebug-subvol.ktest
similarity index 100%
rename from tests/bcachefs/nodebug-units.ktest
rename to tests/fs/bcachefs/nodebug-subvol.ktest
diff --git a/tests/bcachefs/nodebug-xfstests-nocow.ktest b/tests/fs/bcachefs/nodebug-tier.ktest
similarity index 100%
rename from tests/bcachefs/nodebug-xfstests-nocow.ktest
rename to tests/fs/bcachefs/nodebug-tier.ktest
diff --git a/tests/bcachefs/nodebug-xfstests.ktest b/tests/fs/bcachefs/nodebug-units.ktest
similarity index 100%
rename from tests/bcachefs/nodebug-xfstests.ktest
rename to tests/fs/bcachefs/nodebug-units.ktest
diff --git a/tests/bcachefs/perf-fio.ktest b/tests/fs/bcachefs/perf-fio.ktest
similarity index 98%
rename from tests/bcachefs/perf-fio.ktest
rename to tests/fs/bcachefs/perf-fio.ktest
index 00f2e6d2..2f8f03ee 100644
--- a/tests/bcachefs/perf-fio.ktest
+++ b/tests/fs/bcachefs/perf-fio.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../test-libs.sh
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../../test-libs.sh
 
 require-git http://evilpiepirate.org/git/bcachefs-tools.git
 require-make bcachefs-tools
diff --git a/tests/bcachefs/perf.ktest b/tests/fs/bcachefs/perf.ktest
similarity index 98%
rename from tests/bcachefs/perf.ktest
rename to tests/fs/bcachefs/perf.ktest
index 3ba89fcd..b254faba 100755
--- a/tests/bcachefs/perf.ktest
+++ b/tests/fs/bcachefs/perf.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../test-libs.sh
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../../test-libs.sh
 
 require-git http://evilpiepirate.org/git/bcachefs-tools.git
 require-make bcachefs-tools
diff --git a/tests/bcachefs/preempt-ec.ktest b/tests/fs/bcachefs/preempt-ec.ktest
similarity index 100%
rename from tests/bcachefs/preempt-ec.ktest
rename to tests/fs/bcachefs/preempt-ec.ktest
diff --git a/tests/bcachefs/preempt-quota.ktest b/tests/fs/bcachefs/preempt-fstests-nocow.ktest
similarity index 100%
rename from tests/bcachefs/preempt-quota.ktest
rename to tests/fs/bcachefs/preempt-fstests-nocow.ktest
diff --git a/tests/bcachefs/preempt-replication.ktest b/tests/fs/bcachefs/preempt-fstests.ktest
similarity index 100%
rename from tests/bcachefs/preempt-replication.ktest
rename to tests/fs/bcachefs/preempt-fstests.ktest
diff --git a/tests/bcachefs/preempt-single_device.ktest b/tests/fs/bcachefs/preempt-quota.ktest
similarity index 100%
rename from tests/bcachefs/preempt-single_device.ktest
rename to tests/fs/bcachefs/preempt-quota.ktest
diff --git a/tests/bcachefs/preempt-subvol.ktest b/tests/fs/bcachefs/preempt-replication.ktest
similarity index 100%
rename from tests/bcachefs/preempt-subvol.ktest
rename to tests/fs/bcachefs/preempt-replication.ktest
diff --git a/tests/bcachefs/preempt-tier.ktest b/tests/fs/bcachefs/preempt-single_device.ktest
similarity index 100%
rename from tests/bcachefs/preempt-tier.ktest
rename to tests/fs/bcachefs/preempt-single_device.ktest
diff --git a/tests/bcachefs/preempt-units.ktest b/tests/fs/bcachefs/preempt-subvol.ktest
similarity index 100%
rename from tests/bcachefs/preempt-units.ktest
rename to tests/fs/bcachefs/preempt-subvol.ktest
diff --git a/tests/bcachefs/preempt-xfstests-nocow.ktest b/tests/fs/bcachefs/preempt-tier.ktest
similarity index 100%
rename from tests/bcachefs/preempt-xfstests-nocow.ktest
rename to tests/fs/bcachefs/preempt-tier.ktest
diff --git a/tests/bcachefs/preempt-xfstests.ktest b/tests/fs/bcachefs/preempt-units.ktest
similarity index 100%
rename from tests/bcachefs/preempt-xfstests.ktest
rename to tests/fs/bcachefs/preempt-units.ktest
diff --git a/tests/bcachefs/quota.ktest b/tests/fs/bcachefs/quota.ktest
similarity index 100%
rename from tests/bcachefs/quota.ktest
rename to tests/fs/bcachefs/quota.ktest
diff --git a/tests/bcachefs/replication.ktest b/tests/fs/bcachefs/replication.ktest
similarity index 100%
rename from tests/bcachefs/replication.ktest
rename to tests/fs/bcachefs/replication.ktest
diff --git a/tests/bcachefs/single_device.ktest b/tests/fs/bcachefs/single_device.ktest
similarity index 100%
rename from tests/bcachefs/single_device.ktest
rename to tests/fs/bcachefs/single_device.ktest
diff --git a/tests/bcachefs/subvol.ktest b/tests/fs/bcachefs/subvol.ktest
similarity index 100%
rename from tests/bcachefs/subvol.ktest
rename to tests/fs/bcachefs/subvol.ktest
diff --git a/tests/bcachefs/tier.ktest b/tests/fs/bcachefs/tier.ktest
similarity index 100%
rename from tests/bcachefs/tier.ktest
rename to tests/fs/bcachefs/tier.ktest
diff --git a/tests/bcachefs/ubsan-ec.ktest b/tests/fs/bcachefs/ubsan-ec.ktest
similarity index 100%
rename from tests/bcachefs/ubsan-ec.ktest
rename to tests/fs/bcachefs/ubsan-ec.ktest
diff --git a/tests/bcachefs/ubsan-quota.ktest b/tests/fs/bcachefs/ubsan-fstests-nocow.ktest
similarity index 100%
rename from tests/bcachefs/ubsan-quota.ktest
rename to tests/fs/bcachefs/ubsan-fstests-nocow.ktest
diff --git a/tests/btrfs/ubsan-fstests.ktest b/tests/fs/bcachefs/ubsan-fstests.ktest
similarity index 100%
rename from tests/btrfs/ubsan-fstests.ktest
rename to tests/fs/bcachefs/ubsan-fstests.ktest
diff --git a/tests/bcachefs/ubsan-replication.ktest b/tests/fs/bcachefs/ubsan-quota.ktest
similarity index 100%
rename from tests/bcachefs/ubsan-replication.ktest
rename to tests/fs/bcachefs/ubsan-quota.ktest
diff --git a/tests/bcachefs/ubsan-single_device.ktest b/tests/fs/bcachefs/ubsan-replication.ktest
similarity index 100%
rename from tests/bcachefs/ubsan-single_device.ktest
rename to tests/fs/bcachefs/ubsan-replication.ktest
diff --git a/tests/bcachefs/ubsan-subvol.ktest b/tests/fs/bcachefs/ubsan-single_device.ktest
similarity index 100%
rename from tests/bcachefs/ubsan-subvol.ktest
rename to tests/fs/bcachefs/ubsan-single_device.ktest
diff --git a/tests/bcachefs/ubsan-tier.ktest b/tests/fs/bcachefs/ubsan-subvol.ktest
similarity index 100%
rename from tests/bcachefs/ubsan-tier.ktest
rename to tests/fs/bcachefs/ubsan-subvol.ktest
diff --git a/tests/bcachefs/ubsan-units.ktest b/tests/fs/bcachefs/ubsan-tier.ktest
similarity index 100%
rename from tests/bcachefs/ubsan-units.ktest
rename to tests/fs/bcachefs/ubsan-tier.ktest
diff --git a/tests/bcachefs/ubsan-xfstests-nocow.ktest b/tests/fs/bcachefs/ubsan-units.ktest
similarity index 100%
rename from tests/bcachefs/ubsan-xfstests-nocow.ktest
rename to tests/fs/bcachefs/ubsan-units.ktest
diff --git a/tests/bcachefs/units.ktest b/tests/fs/bcachefs/units.ktest
similarity index 100%
rename from tests/bcachefs/units.ktest
rename to tests/fs/bcachefs/units.ktest
diff --git a/tests/btrfs/fstests-quota.ktest b/tests/fs/btrfs/fstests-quota.ktest
similarity index 100%
rename from tests/btrfs/fstests-quota.ktest
rename to tests/fs/btrfs/fstests-quota.ktest
diff --git a/tests/btrfs/fstests-rt.ktest b/tests/fs/btrfs/fstests-rt.ktest
similarity index 100%
rename from tests/btrfs/fstests-rt.ktest
rename to tests/fs/btrfs/fstests-rt.ktest
diff --git a/tests/btrfs/fstests.ktest b/tests/fs/btrfs/fstests.ktest
similarity index 81%
rename from tests/btrfs/fstests.ktest
rename to tests/fs/btrfs/fstests.ktest
index 6de658a8..bd142034 100755
--- a/tests/btrfs/fstests.ktest
+++ b/tests/fs/btrfs/fstests.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../xfstests.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../fstests.sh
 
 require-kernel-config BTRFS_FS
 require-kernel-config BTRFS_FS_POSIX_ACL
@@ -15,7 +15,7 @@ export MKFS_OPTIONS=
 
 run_tests()
 {
-    run_xfstests "$@"
+    run_fstests "$@"
 }
 
 main "$@"
diff --git a/tests/btrfs/gcov-fstests.ktest b/tests/fs/btrfs/gcov-fstests.ktest
similarity index 100%
rename from tests/btrfs/gcov-fstests.ktest
rename to tests/fs/btrfs/gcov-fstests.ktest
diff --git a/tests/ext4/kasan-fstests.ktest b/tests/fs/btrfs/kasan-fstests.ktest
similarity index 100%
rename from tests/ext4/kasan-fstests.ktest
rename to tests/fs/btrfs/kasan-fstests.ktest
diff --git a/tests/ext4/lockdep-fstests.ktest b/tests/fs/btrfs/lockdep-fstests.ktest
similarity index 100%
rename from tests/ext4/lockdep-fstests.ktest
rename to tests/fs/btrfs/lockdep-fstests.ktest
diff --git a/tests/ext4/ubsan-fstests.ktest b/tests/fs/btrfs/ubsan-fstests.ktest
similarity index 100%
rename from tests/ext4/ubsan-fstests.ktest
rename to tests/fs/btrfs/ubsan-fstests.ktest
diff --git a/tests/ext2.ktest b/tests/fs/ext2/fstests.ktest
similarity index 61%
rename from tests/ext2.ktest
rename to tests/fs/ext2/fstests.ktest
index 35b14bd6..259358f3 100755
--- a/tests/ext2.ktest
+++ b/tests/fs/ext2/fstests.ktest
@@ -1,18 +1,17 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/xfstests.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../fstests.sh
 
 require-kernel-config EXT2_FS
 require-kernel-config EXT2_FS_XATTR
 require-kernel-config EXT2_FS_POSIX_ACL
 
 export FSTYP=ext2
+export MKFS_OPTIONS=
 
 run_tests()
 {
-    export MKFS_OPTIONS=
-
-    run_xfstests "$@"
+    run_fstests "$@"
 }
 
 main "$@"
diff --git a/tests/nilfs2/gcov-fstests.ktest b/tests/fs/ext2/gcov-fstests.ktest
similarity index 61%
rename from tests/nilfs2/gcov-fstests.ktest
rename to tests/fs/ext2/gcov-fstests.ktest
index f31c1086..975b3100 100755
--- a/tests/nilfs2/gcov-fstests.ktest
+++ b/tests/fs/ext2/gcov-fstests.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../test-libs.sh
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../../test-libs.sh
 
 require-gcov fs/xfs
 
diff --git a/tests/f2fs/kasan-fstests.ktest b/tests/fs/ext2/kasan-fstests.ktest
similarity index 100%
rename from tests/f2fs/kasan-fstests.ktest
rename to tests/fs/ext2/kasan-fstests.ktest
diff --git a/tests/f2fs/lockdep-fstests.ktest b/tests/fs/ext2/lockdep-fstests.ktest
similarity index 100%
rename from tests/f2fs/lockdep-fstests.ktest
rename to tests/fs/ext2/lockdep-fstests.ktest
diff --git a/tests/f2fs/ubsan-fstests.ktest b/tests/fs/ext2/ubsan-fstests.ktest
similarity index 100%
rename from tests/f2fs/ubsan-fstests.ktest
rename to tests/fs/ext2/ubsan-fstests.ktest
diff --git a/tests/ext4/fstests.ktest b/tests/fs/ext4/fstests.ktest
similarity index 72%
rename from tests/ext4/fstests.ktest
rename to tests/fs/ext4/fstests.ktest
index b7569aa0..eb0e2b78 100755
--- a/tests/ext4/fstests.ktest
+++ b/tests/fs/ext4/fstests.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../xfstests.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../fstests.sh
 
 require-kernel-config EXT4_FS
 require-kernel-config EXT4_FS_POSIX_ACL
@@ -12,7 +12,7 @@ export MKFS_OPTIONS=
 
 run_tests()
 {
-    run_xfstests "$@"
+    run_fstests "$@"
 }
 
 main "$@"
diff --git a/tests/jfs/gcov-fstests.ktest b/tests/fs/ext4/gcov-fstests.ktest
similarity index 61%
rename from tests/jfs/gcov-fstests.ktest
rename to tests/fs/ext4/gcov-fstests.ktest
index f31c1086..975b3100 100755
--- a/tests/jfs/gcov-fstests.ktest
+++ b/tests/fs/ext4/gcov-fstests.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../test-libs.sh
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../../test-libs.sh
 
 require-gcov fs/xfs
 
diff --git a/tests/jfs/kasan-fstests.ktest b/tests/fs/ext4/kasan-fstests.ktest
similarity index 100%
rename from tests/jfs/kasan-fstests.ktest
rename to tests/fs/ext4/kasan-fstests.ktest
diff --git a/tests/jfs/lockdep-fstests.ktest b/tests/fs/ext4/lockdep-fstests.ktest
similarity index 100%
rename from tests/jfs/lockdep-fstests.ktest
rename to tests/fs/ext4/lockdep-fstests.ktest
diff --git a/tests/jfs/ubsan-fstests.ktest b/tests/fs/ext4/ubsan-fstests.ktest
similarity index 100%
rename from tests/jfs/ubsan-fstests.ktest
rename to tests/fs/ext4/ubsan-fstests.ktest
diff --git a/tests/f2fs/fstests.ktest b/tests/fs/f2fs/fstests.ktest
similarity index 78%
rename from tests/f2fs/fstests.ktest
rename to tests/fs/f2fs/fstests.ktest
index 5d915807..10764d2d 100755
--- a/tests/f2fs/fstests.ktest
+++ b/tests/fs/f2fs/fstests.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../xfstests.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../fstests.sh
 
 require-kernel-config F2FS_FS
 require-kernel-config F2FS_STAT_FS
@@ -14,7 +14,7 @@ export MKFS_OPTIONS=
 
 run_tests()
 {
-    run_xfstests "$@"
+    run_fstests "$@"
 }
 
 main "$@"
diff --git a/tests/f2fs/gcov-fstests.ktest b/tests/fs/f2fs/gcov-fstests.ktest
similarity index 61%
rename from tests/f2fs/gcov-fstests.ktest
rename to tests/fs/f2fs/gcov-fstests.ktest
index f31c1086..975b3100 100755
--- a/tests/f2fs/gcov-fstests.ktest
+++ b/tests/fs/f2fs/gcov-fstests.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../test-libs.sh
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../../test-libs.sh
 
 require-gcov fs/xfs
 
diff --git a/tests/nilfs2/kasan-fstests.ktest b/tests/fs/f2fs/kasan-fstests.ktest
similarity index 100%
rename from tests/nilfs2/kasan-fstests.ktest
rename to tests/fs/f2fs/kasan-fstests.ktest
diff --git a/tests/nilfs2/lockdep-fstests.ktest b/tests/fs/f2fs/lockdep-fstests.ktest
similarity index 100%
rename from tests/nilfs2/lockdep-fstests.ktest
rename to tests/fs/f2fs/lockdep-fstests.ktest
diff --git a/tests/nilfs2/ubsan-fstests.ktest b/tests/fs/f2fs/ubsan-fstests.ktest
similarity index 100%
rename from tests/nilfs2/ubsan-fstests.ktest
rename to tests/fs/f2fs/ubsan-fstests.ktest
diff --git a/tests/xfstests.sh b/tests/fs/fstests.sh
similarity index 96%
rename from tests/xfstests.sh
rename to tests/fs/fstests.sh
index a3ae11e6..f10f5717 100644
--- a/tests/xfstests.sh
+++ b/tests/fs/fstests.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # xfstests wrapper:
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/test-libs.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../test-libs.sh
 
 require-git https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git xfstests
 
@@ -50,7 +50,7 @@ list_tests()
     popd > /dev/null
 }
 
-run_xfstests()
+run_fstests()
 {
     if [[ ! -f /xfstests-init-done ]]; then
 	mkswap ${ktest_scratch_dev[3]}
diff --git a/tests/jfs/fstests.ktest b/tests/fs/jfs/fstests.ktest
similarity index 71%
rename from tests/jfs/fstests.ktest
rename to tests/fs/jfs/fstests.ktest
index affb072f..4856c921 100755
--- a/tests/jfs/fstests.ktest
+++ b/tests/fs/jfs/fstests.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../xfstests.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../fstests.sh
 
 require-kernel-config JFS_FS
 require-kernel-config JFS_POSIX_ACL
@@ -12,7 +12,7 @@ export MKFS_OPTIONS=
 
 run_tests()
 {
-    run_xfstests "$@"
+    run_fstests "$@"
 }
 
 main "$@"
diff --git a/tests/ext4/gcov-fstests.ktest b/tests/fs/jfs/gcov-fstests.ktest
similarity index 61%
rename from tests/ext4/gcov-fstests.ktest
rename to tests/fs/jfs/gcov-fstests.ktest
index f31c1086..975b3100 100755
--- a/tests/ext4/gcov-fstests.ktest
+++ b/tests/fs/jfs/gcov-fstests.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../test-libs.sh
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../../test-libs.sh
 
 require-gcov fs/xfs
 
diff --git a/tests/xfs/kasan-fstests.ktest b/tests/fs/jfs/kasan-fstests.ktest
similarity index 100%
rename from tests/xfs/kasan-fstests.ktest
rename to tests/fs/jfs/kasan-fstests.ktest
diff --git a/tests/xfs/lockdep-fstests.ktest b/tests/fs/jfs/lockdep-fstests.ktest
similarity index 100%
rename from tests/xfs/lockdep-fstests.ktest
rename to tests/fs/jfs/lockdep-fstests.ktest
diff --git a/tests/xfs/ubsan-fstests.ktest b/tests/fs/jfs/ubsan-fstests.ktest
similarity index 100%
rename from tests/xfs/ubsan-fstests.ktest
rename to tests/fs/jfs/ubsan-fstests.ktest
diff --git a/tests/nfs/xfstests.ktest b/tests/fs/nfs/fstests.ktest
similarity index 96%
rename from tests/nfs/xfstests.ktest
rename to tests/fs/nfs/fstests.ktest
index 0e259af7..ce74d5cd 100755
--- a/tests/nfs/xfstests.ktest
+++ b/tests/fs/nfs/fstests.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../xfstests.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../fstests.sh
 
 require-git http://evilpiepirate.org/git/xfstests.git ../xfstests
 
@@ -73,7 +73,7 @@ EOF
 	touch /xfstests-config-done
     fi
 
-    run_xfstests "$@"
+    run_fstests "$@"
 }
 
 main "$@"
diff --git a/tests/nfs/kasan-xfstests.ktest b/tests/fs/nfs/kasan-fstests.ktest
similarity index 73%
rename from tests/nfs/kasan-xfstests.ktest
rename to tests/fs/nfs/kasan-fstests.ktest
index 0e0694c2..b1fb6a94 100755
--- a/tests/nfs/kasan-xfstests.ktest
+++ b/tests/fs/nfs/kasan-fstests.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../test-libs.sh
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../../test-libs.sh
 
 config-timeout-multiplier 3
 
diff --git a/tests/nfs/lockdep-xfstests.ktest b/tests/fs/nfs/lockdep-fstests.ktest
similarity index 100%
rename from tests/nfs/lockdep-xfstests.ktest
rename to tests/fs/nfs/lockdep-fstests.ktest
diff --git a/tests/nilfs2/fstests.ktest b/tests/fs/nilfs2/fstests.ktest
similarity index 59%
rename from tests/nilfs2/fstests.ktest
rename to tests/fs/nilfs2/fstests.ktest
index cf3fb4d9..1c8be422 100755
--- a/tests/nilfs2/fstests.ktest
+++ b/tests/fs/nilfs2/fstests.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../xfstests.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../fstests.sh
 
 require-kernel-config NILFS2_FS
 
@@ -9,7 +9,7 @@ export MKFS_OPTIONS=
 
 run_tests()
 {
-    run_xfstests "$@"
+    run_fstests "$@"
 }
 
 main "$@"
diff --git a/tests/fs/nilfs2/gcov-fstests.ktest b/tests/fs/nilfs2/gcov-fstests.ktest
new file mode 100755
index 00000000..975b3100
--- /dev/null
+++ b/tests/fs/nilfs2/gcov-fstests.ktest
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../../test-libs.sh
+
+require-gcov fs/xfs
+
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/fstests.ktest
diff --git a/tests/bcachefs/kasan-xfstests.ktest b/tests/fs/nilfs2/kasan-fstests.ktest
similarity index 100%
rename from tests/bcachefs/kasan-xfstests.ktest
rename to tests/fs/nilfs2/kasan-fstests.ktest
diff --git a/tests/bcachefs/lockdep-xfstests.ktest b/tests/fs/nilfs2/lockdep-fstests.ktest
similarity index 100%
rename from tests/bcachefs/lockdep-xfstests.ktest
rename to tests/fs/nilfs2/lockdep-fstests.ktest
diff --git a/tests/bcachefs/ubsan-xfstests.ktest b/tests/fs/nilfs2/ubsan-fstests.ktest
similarity index 100%
rename from tests/bcachefs/ubsan-xfstests.ktest
rename to tests/fs/nilfs2/ubsan-fstests.ktest
diff --git a/tests/puzzlefs/puzzlefs.ktest b/tests/fs/puzzlefs/puzzlefs.ktest
similarity index 97%
rename from tests/puzzlefs/puzzlefs.ktest
rename to tests/fs/puzzlefs/puzzlefs.ktest
index cf5ec519..06d5c9bd 100755
--- a/tests/puzzlefs/puzzlefs.ktest
+++ b/tests/fs/puzzlefs/puzzlefs.ktest
@@ -3,7 +3,7 @@
 # PuzzleFS tests
 #
 
-. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../test-libs.sh
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../../test-libs.sh
 
 require-git https://github.com/project-machine/puzzlefs
 require-make puzzlefs
diff --git a/tests/fs/squashfs.ktest b/tests/fs/squashfs.ktest
new file mode 100755
index 00000000..ed53f614
--- /dev/null
+++ b/tests/fs/squashfs.ktest
@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../test-libs.sh
+
+require-kernel-config MISC_FILESYSTEMS
+require-kernel-config SQUASHFS
+require-kernel-config SQUASHFS_ZLIB
+require-kernel-config SQUASHFS_LZO
+require-kernel-config SQUASHFS_LZ4
+require-kernel-config SQUASHFS_XZ
+require-kernel-config SQUASHFS_ZSTD
+
+config-timeout $(stress_timeout)
+
+config-image /home/kent/squashfs-test-images/file.sqsh
+config-image /home/kent/squashfs-test-images/bcachefs-tools.gzip.sqfs
+config-image /home/kent/squashfs-test-images/bcachefs-tools.lz4.sqfs
+config-image /home/kent/squashfs-test-images/bcachefs-tools.lzo.sqfs
+config-image /home/kent/squashfs-test-images/bcachefs-tools.xz.sqfs
+config-image /home/kent/squashfs-test-images/bcachefs-tools.zstd.sqfs
+
+case $1 in
+    prep)
+	for c in gzip lzo lz4 xz zstd lzma; do
+	    mksquashfs . bcachefs-tools.$c.sqfs -comp $c
+	done
+	;;
+esac
+
+test_squashfs()
+{
+    for dev in /dev/vdb; do
+	echo "testing image $dev"
+
+	mount -t squashfs $dev /mnt
+	find /mnt -type f -print|xargs cat > /dev/null
+	umount /mnt
+    done
+}
+
+main "$@"
diff --git a/tests/xfs/fstests-1k.ktest b/tests/fs/xfs/fstests-1k.ktest
similarity index 100%
rename from tests/xfs/fstests-1k.ktest
rename to tests/fs/xfs/fstests-1k.ktest
diff --git a/tests/xfs/fstests-quota.ktest b/tests/fs/xfs/fstests-quota.ktest
similarity index 100%
rename from tests/xfs/fstests-quota.ktest
rename to tests/fs/xfs/fstests-quota.ktest
diff --git a/tests/xfs/fstests-rt.ktest b/tests/fs/xfs/fstests-rt.ktest
similarity index 100%
rename from tests/xfs/fstests-rt.ktest
rename to tests/fs/xfs/fstests-rt.ktest
diff --git a/tests/xfs/fstests.ktest b/tests/fs/xfs/fstests.ktest
similarity index 85%
rename from tests/xfs/fstests.ktest
rename to tests/fs/xfs/fstests.ktest
index 44dd9ac2..1b71c2a1 100755
--- a/tests/xfs/fstests.ktest
+++ b/tests/fs/xfs/fstests.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../xfstests.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../fstests.sh
 
 require-kernel-config XFS_FS
 require-kernel-config XFS_QUOTA
@@ -17,7 +17,7 @@ export FSTYP=xfs
 
 run_tests()
 {
-    run_xfstests "$@"
+    run_fstests "$@"
 }
 
 main "$@"
diff --git a/tests/fs/xfs/gcov-fstests.ktest b/tests/fs/xfs/gcov-fstests.ktest
new file mode 100755
index 00000000..975b3100
--- /dev/null
+++ b/tests/fs/xfs/gcov-fstests.ktest
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../../test-libs.sh
+
+require-gcov fs/xfs
+
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/fstests.ktest
diff --git a/tests/fs/xfs/kasan-fstests.ktest b/tests/fs/xfs/kasan-fstests.ktest
new file mode 100755
index 00000000..93bf1097
--- /dev/null
+++ b/tests/fs/xfs/kasan-fstests.ktest
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../kasan-base.sh
diff --git a/tests/fs/xfs/lockdep-fstests.ktest b/tests/fs/xfs/lockdep-fstests.ktest
new file mode 100755
index 00000000..2ad19d00
--- /dev/null
+++ b/tests/fs/xfs/lockdep-fstests.ktest
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../lockdep-base.sh
diff --git a/tests/fs/xfs/ubsan-fstests.ktest b/tests/fs/xfs/ubsan-fstests.ktest
new file mode 100755
index 00000000..7ff75ef5
--- /dev/null
+++ b/tests/fs/xfs/ubsan-fstests.ktest
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../ubsan-base.sh
diff --git a/tests/xfs/gcov-fstests.ktest b/tests/xfs/gcov-fstests.ktest
deleted file mode 100755
index f31c1086..00000000
--- a/tests/xfs/gcov-fstests.ktest
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../test-libs.sh
-
-require-gcov fs/xfs
-
-. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/fstests.ktest