From: Christoph Hellwig <hch@lst.de>
Date: Sun, 23 Jun 2024 12:10:37 +0000 (+0200)
Subject: remove spurious _supported_fs calls
X-Git-Tag: v2024.07.14~5
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f2c179ef055d4b251e86d4f50c0d207f81be9129;p=xfstests-dev.git

remove spurious _supported_fs calls

Remove _supported_fs calls for generic in the generic directory
or for $FSTYP in the $FSTYP directory.

This leaves us with the negative checks, and the overloaded ext4
directory where some tests can also be run for ext2 and ext3.

While at it also remove the pointless "real QA test starts here"
usually placed right next to it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Zorro Lang <zlang@kernel.org>
---

diff --git a/new b/new
index 9651e0e0..6b50ffed 100755
--- a/new
+++ b/new
@@ -162,10 +162,7 @@ _begin_fstest ${new_groups[@]}
 # Import common functions.
 # . ./common/filter
 
-# real QA test starts here
-
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 
 # if error
diff --git a/tests/btrfs/001 b/tests/btrfs/001
index 71738e88..2d073e80 100755
--- a/tests/btrfs/001
+++ b/tests/btrfs/001
@@ -12,7 +12,6 @@ _begin_fstest auto quick subvol snapshot
 . ./common/filter
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_scratch
 
 _scratch_mkfs > /dev/null 2>&1
diff --git a/tests/btrfs/002 b/tests/btrfs/002
index e5fe8825..f223cc60 100755
--- a/tests/btrfs/002
+++ b/tests/btrfs/002
@@ -11,7 +11,6 @@ _begin_fstest auto snapshot
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 _scratch_mkfs > /dev/null 2>&1 || _fail "mkfs failed"
diff --git a/tests/btrfs/003 b/tests/btrfs/003
index 3ac53ef7..ecefdd14 100755
--- a/tests/btrfs/003
+++ b/tests/btrfs/003
@@ -40,7 +40,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_scratch_dev_pool 4
 _require_command "$WIPEFS_PROG" wipefs
diff --git a/tests/btrfs/004 b/tests/btrfs/004
index 684f5fdf..e89697d2 100755
--- a/tests/btrfs/004
+++ b/tests/btrfs/004
@@ -24,7 +24,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_no_large_scratch_dev
 _require_btrfs_command inspect-internal logical-resolve
diff --git a/tests/btrfs/005 b/tests/btrfs/005
index 8d66f0be..26721569 100755
--- a/tests/btrfs/005
+++ b/tests/btrfs/005
@@ -102,7 +102,6 @@ _rundefrag()
 . ./common/filter
 . ./common/defrag
 
-_supported_fs btrfs
 _require_scratch
 
 _scratch_mkfs >/dev/null 2>&1
diff --git a/tests/btrfs/006 b/tests/btrfs/006
index cd3a0c63..4f896f9e 100755
--- a/tests/btrfs/006
+++ b/tests/btrfs/006
@@ -12,7 +12,6 @@ _begin_fstest auto quick volume
 
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_scratch
 _require_scratch_dev_pool
 
diff --git a/tests/btrfs/007 b/tests/btrfs/007
index 5b9a887b..a7eb6216 100755
--- a/tests/btrfs/007
+++ b/tests/btrfs/007
@@ -25,7 +25,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_fssum
 _require_seek_data_hole
diff --git a/tests/btrfs/008 b/tests/btrfs/008
index bcbb72da..69d8ab4a 100755
--- a/tests/btrfs/008
+++ b/tests/btrfs/008
@@ -23,7 +23,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 
diff --git a/tests/btrfs/009 b/tests/btrfs/009
index 4a151049..74dd2cd2 100755
--- a/tests/btrfs/009
+++ b/tests/btrfs/009
@@ -11,7 +11,6 @@ _begin_fstest auto quick subvol
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 _scratch_mkfs > /dev/null 2>&1
diff --git a/tests/btrfs/010 b/tests/btrfs/010
index 10693901..d27c6dd2 100755
--- a/tests/btrfs/010
+++ b/tests/btrfs/010
@@ -22,7 +22,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_btrfs_fs_sysfs
 
diff --git a/tests/btrfs/011 b/tests/btrfs/011
index 40dfb157..c46f2cc4 100755
--- a/tests/btrfs/011
+++ b/tests/btrfs/011
@@ -40,7 +40,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch_nocheck
 _require_scratch_dev_pool 5
 _require_scratch_dev_pool_equal_size
diff --git a/tests/btrfs/012 b/tests/btrfs/012
index 1cb2905b..a96efeff 100755
--- a/tests/btrfs/012
+++ b/tests/btrfs/012
@@ -18,7 +18,6 @@ _begin_fstest auto convert
 
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_scratch_nocheck
 
 _require_command "$BTRFS_CONVERT_PROG" btrfs-convert
diff --git a/tests/btrfs/013 b/tests/btrfs/013
index 623de320..7b1e6042 100755
--- a/tests/btrfs/013
+++ b/tests/btrfs/013
@@ -15,7 +15,6 @@ _begin_fstest auto quick balance prealloc
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_xfs_io_command "falloc"
 
diff --git a/tests/btrfs/014 b/tests/btrfs/014
index af7a7aeb..4c95276f 100755
--- a/tests/btrfs/014
+++ b/tests/btrfs/014
@@ -28,7 +28,6 @@ _balance()
 
 . ./common/filter
 
-_supported_fs btrfs
 
 _require_scratch
 _scratch_mkfs >/dev/null 2>&1
diff --git a/tests/btrfs/015 b/tests/btrfs/015
index 346812da..fc4277ff 100755
--- a/tests/btrfs/015
+++ b/tests/btrfs/015
@@ -12,7 +12,6 @@ _begin_fstest auto quick snapshot remount
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 _scratch_mkfs > /dev/null 2>&1
diff --git a/tests/btrfs/016 b/tests/btrfs/016
index 95e13854..0fc084f5 100755
--- a/tests/btrfs/016
+++ b/tests/btrfs/016
@@ -14,7 +14,6 @@ tmp_dir=send_temp_$seq
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_fssum
 _require_xfs_io_command "falloc"
diff --git a/tests/btrfs/017 b/tests/btrfs/017
index b512098e..a64aa3e6 100755
--- a/tests/btrfs/017
+++ b/tests/btrfs/017
@@ -17,7 +17,6 @@ _begin_fstest auto quick qgroup
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_scratch_qgroup
 _require_cloner
diff --git a/tests/btrfs/018 b/tests/btrfs/018
index f9e9497a..a2810084 100755
--- a/tests/btrfs/018
+++ b/tests/btrfs/018
@@ -11,7 +11,6 @@ _begin_fstest auto quick subvol
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 _scratch_mkfs > /dev/null 2>&1
diff --git a/tests/btrfs/019 b/tests/btrfs/019
index 3ecde39f..b618978f 100755
--- a/tests/btrfs/019
+++ b/tests/btrfs/019
@@ -23,7 +23,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 
diff --git a/tests/btrfs/020 b/tests/btrfs/020
index d2d9269f..7e5c6fd7 100755
--- a/tests/btrfs/020
+++ b/tests/btrfs/020
@@ -27,7 +27,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_loop
 
diff --git a/tests/btrfs/021 b/tests/btrfs/021
index 13f2ba32..2209b3a8 100755
--- a/tests/btrfs/021
+++ b/tests/btrfs/021
@@ -29,7 +29,6 @@ run_test()
 	wait
 }
 
-_supported_fs btrfs
 _require_scratch
 
 _scratch_mkfs > /dev/null 2>&1
diff --git a/tests/btrfs/022 b/tests/btrfs/022
index dc88329c..31b7874b 100755
--- a/tests/btrfs/022
+++ b/tests/btrfs/022
@@ -11,7 +11,6 @@ _begin_fstest auto qgroup limit
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_qgroup_rescan
 _require_btrfs_qgroup_report
diff --git a/tests/btrfs/023 b/tests/btrfs/023
index 15ce7d69..f03bcbb9 100755
--- a/tests/btrfs/023
+++ b/tests/btrfs/023
@@ -13,7 +13,6 @@ _begin_fstest auto
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch_dev_pool 4
 # Zoned btrfs only supports SINGLE profile
 _require_non_zoned_device "${SCRATCH_DEV}"
diff --git a/tests/btrfs/024 b/tests/btrfs/024
index 2eefbe62..ccf844e0 100755
--- a/tests/btrfs/024
+++ b/tests/btrfs/024
@@ -13,7 +13,6 @@ _begin_fstest auto quick compress
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_btrfs_no_nodatacow
 
diff --git a/tests/btrfs/025 b/tests/btrfs/025
index bd54d3c5..383ac494 100755
--- a/tests/btrfs/025
+++ b/tests/btrfs/025
@@ -23,7 +23,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_xfs_io_command "falloc"
 
diff --git a/tests/btrfs/026 b/tests/btrfs/026
index 00914f10..745b85a6 100755
--- a/tests/btrfs/026
+++ b/tests/btrfs/026
@@ -12,7 +12,6 @@ _begin_fstest auto quick compress prealloc
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_xfs_io_command "falloc"
 
diff --git a/tests/btrfs/027 b/tests/btrfs/027
index 7d3307a1..28287771 100755
--- a/tests/btrfs/027
+++ b/tests/btrfs/027
@@ -11,7 +11,6 @@ _begin_fstest auto replace volume scrub
 
 . ./common/filter
 
-_supported_fs btrfs
 # we check scratch dev after each loop
 _require_scratch_nocheck
 _require_scratch_dev_pool 5
diff --git a/tests/btrfs/028 b/tests/btrfs/028
index 831875d3..f64fc831 100755
--- a/tests/btrfs/028
+++ b/tests/btrfs/028
@@ -15,7 +15,6 @@ _begin_fstest auto qgroup balance
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_btrfs_qgroup_report
 
diff --git a/tests/btrfs/029 b/tests/btrfs/029
index 9b56cc73..842b104c 100755
--- a/tests/btrfs/029
+++ b/tests/btrfs/029
@@ -21,7 +21,6 @@ _begin_fstest auto quick clone
 . ./common/filter
 . ./common/reflink
 
-_supported_fs btrfs
 
 _require_test
 _require_scratch
diff --git a/tests/btrfs/030 b/tests/btrfs/030
index 9dcbb550..bedbb728 100755
--- a/tests/btrfs/030
+++ b/tests/btrfs/030
@@ -30,7 +30,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_fssum
 
diff --git a/tests/btrfs/031 b/tests/btrfs/031
index 83a28e4c..8ac73d3a 100755
--- a/tests/btrfs/031
+++ b/tests/btrfs/031
@@ -17,7 +17,6 @@ _begin_fstest auto quick subvol clone
 . ./common/filter
 . ./common/reflink
 
-_supported_fs btrfs
 
 _require_test
 _require_scratch
diff --git a/tests/btrfs/032 b/tests/btrfs/032
index b7b1fcf6..5a963145 100755
--- a/tests/btrfs/032
+++ b/tests/btrfs/032
@@ -12,7 +12,6 @@ _begin_fstest auto quick remount
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 _scratch_mkfs > /dev/null 2>&1
diff --git a/tests/btrfs/033 b/tests/btrfs/033
index da002bcf..072f6111 100755
--- a/tests/btrfs/033
+++ b/tests/btrfs/033
@@ -11,7 +11,6 @@ _begin_fstest auto quick send snapshot
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 _scratch_mkfs > /dev/null 2>&1
diff --git a/tests/btrfs/034 b/tests/btrfs/034
index ce8c1bfa..73bdf1c2 100755
--- a/tests/btrfs/034
+++ b/tests/btrfs/034
@@ -20,7 +20,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_xfs_io_command "falloc"
 
diff --git a/tests/btrfs/035 b/tests/btrfs/035
index dac2fff7..7f057091 100755
--- a/tests/btrfs/035
+++ b/tests/btrfs/035
@@ -12,7 +12,6 @@ _begin_fstest auto quick clone
 . ./common/filter
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_scratch
 _require_cloner
 
diff --git a/tests/btrfs/036 b/tests/btrfs/036
index 32c129c3..92ecd560 100755
--- a/tests/btrfs/036
+++ b/tests/btrfs/036
@@ -42,7 +42,6 @@ do_snapshots()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 _scratch_mkfs > /dev/null 2>&1
diff --git a/tests/btrfs/037 b/tests/btrfs/037
index 4e4178cd..4d922143 100755
--- a/tests/btrfs/037
+++ b/tests/btrfs/037
@@ -27,7 +27,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_xfs_io_command "falloc"
 
diff --git a/tests/btrfs/038 b/tests/btrfs/038
index 3424e511..bdef4f41 100755
--- a/tests/btrfs/038
+++ b/tests/btrfs/038
@@ -26,7 +26,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_fssum
 
diff --git a/tests/btrfs/039 b/tests/btrfs/039
index 2e76bdd8..e7cea325 100755
--- a/tests/btrfs/039
+++ b/tests/btrfs/039
@@ -29,7 +29,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_fssum
 
diff --git a/tests/btrfs/040 b/tests/btrfs/040
index 7dd907d5..5d346be3 100755
--- a/tests/btrfs/040
+++ b/tests/btrfs/040
@@ -29,7 +29,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_fssum
 
diff --git a/tests/btrfs/041 b/tests/btrfs/041
index f69836b5..2662e2f4 100755
--- a/tests/btrfs/041
+++ b/tests/btrfs/041
@@ -26,7 +26,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 
diff --git a/tests/btrfs/042 b/tests/btrfs/042
index 63d14bcc..42719f2f 100755
--- a/tests/btrfs/042
+++ b/tests/btrfs/042
@@ -11,7 +11,6 @@ _begin_fstest auto quick qgroup limit
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_btrfs_qgroup_report
 
diff --git a/tests/btrfs/043 b/tests/btrfs/043
index 9fc2c6a2..5597316f 100755
--- a/tests/btrfs/043
+++ b/tests/btrfs/043
@@ -25,7 +25,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_fssum
 
diff --git a/tests/btrfs/044 b/tests/btrfs/044
index 71c64051..15536131 100755
--- a/tests/btrfs/044
+++ b/tests/btrfs/044
@@ -30,7 +30,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_fssum
 
diff --git a/tests/btrfs/045 b/tests/btrfs/045
index 90fda6e2..cc432cd5 100755
--- a/tests/btrfs/045
+++ b/tests/btrfs/045
@@ -46,7 +46,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_fssum
 
diff --git a/tests/btrfs/046 b/tests/btrfs/046
index 7f6b92a1..d395583c 100755
--- a/tests/btrfs/046
+++ b/tests/btrfs/046
@@ -29,7 +29,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_xfs_io_command "falloc"
diff --git a/tests/btrfs/047 b/tests/btrfs/047
index 4b3fb354..81f562ea 100755
--- a/tests/btrfs/047
+++ b/tests/btrfs/047
@@ -13,7 +13,6 @@ _begin_fstest auto quick snapshot attr
 . ./common/filter
 . ./common/attr
 
-_supported_fs btrfs
 _require_attrs
 _require_scratch
 
diff --git a/tests/btrfs/048 b/tests/btrfs/048
index 2b0a6258..a38c3951 100755
--- a/tests/btrfs/048
+++ b/tests/btrfs/048
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_btrfs_command "property"
diff --git a/tests/btrfs/049 b/tests/btrfs/049
index dd07c94a..19eec785 100755
--- a/tests/btrfs/049
+++ b/tests/btrfs/049
@@ -11,7 +11,6 @@
 . ./common/preamble
 _begin_fstest quick balance auto
 
-_supported_fs btrfs
 _require_scratch_swapfile
 _require_scratch_dev_pool 3
 
diff --git a/tests/btrfs/050 b/tests/btrfs/050
index da268480..effe9f15 100755
--- a/tests/btrfs/050
+++ b/tests/btrfs/050
@@ -27,7 +27,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_fssum
diff --git a/tests/btrfs/051 b/tests/btrfs/051
index 468fac12..5be403a8 100755
--- a/tests/btrfs/051
+++ b/tests/btrfs/051
@@ -24,7 +24,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_fssum
diff --git a/tests/btrfs/052 b/tests/btrfs/052
index 09f03f8a..a3a828f9 100755
--- a/tests/btrfs/052
+++ b/tests/btrfs/052
@@ -19,7 +19,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_cloner
 
diff --git a/tests/btrfs/053 b/tests/btrfs/053
index abfe372a..5e047f7b 100755
--- a/tests/btrfs/053
+++ b/tests/btrfs/053
@@ -26,7 +26,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_fssum
diff --git a/tests/btrfs/054 b/tests/btrfs/054
index e38c085a..7d98bf8d 100755
--- a/tests/btrfs/054
+++ b/tests/btrfs/054
@@ -34,7 +34,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 
diff --git a/tests/btrfs/055 b/tests/btrfs/055
index 900c3dba..bd0755d2 100755
--- a/tests/btrfs/055
+++ b/tests/btrfs/055
@@ -23,7 +23,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_cloner
 _require_btrfs_fs_feature "no_holes"
diff --git a/tests/btrfs/056 b/tests/btrfs/056
index 128c261a..f7557f4a 100755
--- a/tests/btrfs/056
+++ b/tests/btrfs/056
@@ -27,7 +27,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-_supported_fs btrfs
 _require_scratch
 _require_cloner
 _require_btrfs_fs_feature "no_holes"
diff --git a/tests/btrfs/057 b/tests/btrfs/057
index 56db3595..07e60557 100755
--- a/tests/btrfs/057
+++ b/tests/btrfs/057
@@ -11,7 +11,6 @@ _begin_fstest auto quick
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_qgroup_rescan
 
diff --git a/tests/btrfs/058 b/tests/btrfs/058
index 6df1c50d..7bc4af5b 100755
--- a/tests/btrfs/058
+++ b/tests/btrfs/058
@@ -27,7 +27,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_xfs_io_command "-T"
 
diff --git a/tests/btrfs/059 b/tests/btrfs/059
index 27be6947..227ebb14 100755
--- a/tests/btrfs/059
+++ b/tests/btrfs/059
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_btrfs_command "property"
diff --git a/tests/btrfs/060 b/tests/btrfs/060
index 27c4afe8..00f57841 100755
--- a/tests/btrfs/060
+++ b/tests/btrfs/060
@@ -28,7 +28,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 # we check scratch dev after each loop
 _require_scratch_nocheck
 _require_scratch_dev_pool 4
diff --git a/tests/btrfs/061 b/tests/btrfs/061
index 6ed80b20..2b3b76a7 100755
--- a/tests/btrfs/061
+++ b/tests/btrfs/061
@@ -28,7 +28,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 # we check scratch dev after each loop
 _require_scratch_nocheck
 _require_scratch_dev_pool 4
diff --git a/tests/btrfs/062 b/tests/btrfs/062
index 5794697c..4ab7ca53 100755
--- a/tests/btrfs/062
+++ b/tests/btrfs/062
@@ -28,7 +28,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 # we check scratch dev after each loop
 _require_scratch_nocheck
 _require_scratch_dev_pool 4
diff --git a/tests/btrfs/063 b/tests/btrfs/063
index 8a95756a..ea4275d2 100755
--- a/tests/btrfs/063
+++ b/tests/btrfs/063
@@ -28,7 +28,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 # we check scratch dev after each loop
 _require_scratch_nocheck
 _require_scratch_dev_pool 4
diff --git a/tests/btrfs/064 b/tests/btrfs/064
index a439d585..a8aa6251 100755
--- a/tests/btrfs/064
+++ b/tests/btrfs/064
@@ -30,7 +30,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 # we check scratch dev after each loop
 _require_scratch_nocheck
 _require_scratch_dev_pool 5
diff --git a/tests/btrfs/065 b/tests/btrfs/065
index 0ad8f9e0..5fb635ab 100755
--- a/tests/btrfs/065
+++ b/tests/btrfs/065
@@ -28,7 +28,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 # we check scratch dev after each loop
 _require_scratch_nocheck
 _require_scratch_dev_pool 5
diff --git a/tests/btrfs/066 b/tests/btrfs/066
index efe5195e..30fa438a 100755
--- a/tests/btrfs/066
+++ b/tests/btrfs/066
@@ -28,7 +28,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 # we check scratch dev after each loop
 _require_scratch_nocheck
 _require_scratch_dev_pool 4
diff --git a/tests/btrfs/067 b/tests/btrfs/067
index 328d1671..899b96da 100755
--- a/tests/btrfs/067
+++ b/tests/btrfs/067
@@ -28,7 +28,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 # we check scratch dev after each loop
 _require_scratch_nocheck
 _require_scratch_dev_pool 4
diff --git a/tests/btrfs/068 b/tests/btrfs/068
index 0fe541f4..48b6cdb0 100755
--- a/tests/btrfs/068
+++ b/tests/btrfs/068
@@ -29,7 +29,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 # we check scratch dev after each loop
 _require_scratch_nocheck
 _require_scratch_dev_pool 4
diff --git a/tests/btrfs/069 b/tests/btrfs/069
index f8b54b46..51055176 100755
--- a/tests/btrfs/069
+++ b/tests/btrfs/069
@@ -28,7 +28,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 # we check scratch dev after each loop
 _require_scratch_nocheck
 _require_scratch_dev_pool 5
diff --git a/tests/btrfs/070 b/tests/btrfs/070
index d0bd9674..f2e9dfcb 100755
--- a/tests/btrfs/070
+++ b/tests/btrfs/070
@@ -28,7 +28,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 # we check scratch dev after each loop
 _require_scratch_nocheck
 _require_scratch_dev_pool 5
diff --git a/tests/btrfs/071 b/tests/btrfs/071
index 50963738..5c65bcfe 100755
--- a/tests/btrfs/071
+++ b/tests/btrfs/071
@@ -28,7 +28,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 # we check scratch dev after each loop
 _require_scratch_nocheck
 _require_scratch_dev_pool 5
diff --git a/tests/btrfs/072 b/tests/btrfs/072
index 8f6ebca0..0a3da5ff 100755
--- a/tests/btrfs/072
+++ b/tests/btrfs/072
@@ -28,7 +28,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 # we check scratch dev after each loop
 _require_scratch_nocheck
 _require_scratch_dev_pool 4
diff --git a/tests/btrfs/073 b/tests/btrfs/073
index f6497e31..bf7e9ca7 100755
--- a/tests/btrfs/073
+++ b/tests/btrfs/073
@@ -28,7 +28,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 # we check scratch dev after each loop
 _require_scratch_nocheck
 _require_scratch_dev_pool 4
diff --git a/tests/btrfs/074 b/tests/btrfs/074
index d35bbe1a..f7826715 100755
--- a/tests/btrfs/074
+++ b/tests/btrfs/074
@@ -28,7 +28,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 # we check scratch dev after each loop
 _require_scratch_nocheck
 _require_scratch_dev_pool 4
diff --git a/tests/btrfs/075 b/tests/btrfs/075
index c54239e6..917993ca 100755
--- a/tests/btrfs/075
+++ b/tests/btrfs/075
@@ -20,7 +20,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 # SELINUX_MOUNT_OPTIONS will be set in common/config if selinux is enabled
diff --git a/tests/btrfs/076 b/tests/btrfs/076
index 730be879..c148406f 100755
--- a/tests/btrfs/076
+++ b/tests/btrfs/076
@@ -20,7 +20,6 @@ _cleanup()
 . ./common/filter
 . ./common/defrag
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _fixed_by_kernel_commit 4bcbb3325513 \
diff --git a/tests/btrfs/077 b/tests/btrfs/077
index cce054f8..4110c46d 100755
--- a/tests/btrfs/077
+++ b/tests/btrfs/077
@@ -33,7 +33,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_fssum
 
diff --git a/tests/btrfs/078 b/tests/btrfs/078
index 9ebae93b..bbebeff3 100755
--- a/tests/btrfs/078
+++ b/tests/btrfs/078
@@ -26,7 +26,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 workout()
diff --git a/tests/btrfs/079 b/tests/btrfs/079
index d13056ae..d55858df 100755
--- a/tests/btrfs/079
+++ b/tests/btrfs/079
@@ -32,7 +32,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 # Since xfs_io's fiemap always use SYNC flag and can't be unset,
 # we must use filefrag to call fiemap without SYNC flag.
diff --git a/tests/btrfs/080 b/tests/btrfs/080
index d4dea6d6..ea9d09b0 100755
--- a/tests/btrfs/080
+++ b/tests/btrfs/080
@@ -30,7 +30,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch_nocheck
 
 create_snapshot()
diff --git a/tests/btrfs/081 b/tests/btrfs/081
index c3f84c77..300ace53 100755
--- a/tests/btrfs/081
+++ b/tests/btrfs/081
@@ -21,7 +21,6 @@ _begin_fstest auto quick clone
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_cloner
 
diff --git a/tests/btrfs/082 b/tests/btrfs/082
index c20896bf..13cd1a28 100755
--- a/tests/btrfs/082
+++ b/tests/btrfs/082
@@ -20,7 +20,6 @@ _begin_fstest auto quick remount
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 _scratch_mkfs >$seqres.full 2>&1
diff --git a/tests/btrfs/083 b/tests/btrfs/083
index ae8cf9d4..37e9c4e4 100755
--- a/tests/btrfs/083
+++ b/tests/btrfs/083
@@ -25,7 +25,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_fssum
 
diff --git a/tests/btrfs/084 b/tests/btrfs/084
index 98c9af5f..2da27308 100755
--- a/tests/btrfs/084
+++ b/tests/btrfs/084
@@ -24,7 +24,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_fssum
 
diff --git a/tests/btrfs/085 b/tests/btrfs/085
index 12ae7dfa..291bb8af 100755
--- a/tests/btrfs/085
+++ b/tests/btrfs/085
@@ -26,7 +26,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-_supported_fs btrfs
 _require_scratch
 _require_dm_target flakey
 _require_btrfs_command inspect-internal dump-tree
diff --git a/tests/btrfs/086 b/tests/btrfs/086
index b0f9609d..c8d3adf0 100755
--- a/tests/btrfs/086
+++ b/tests/btrfs/086
@@ -20,7 +20,6 @@ _begin_fstest auto quick clone
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_cloner
 
diff --git a/tests/btrfs/087 b/tests/btrfs/087
index 28222e58..0c787e69 100755
--- a/tests/btrfs/087
+++ b/tests/btrfs/087
@@ -30,7 +30,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_fssum
 
diff --git a/tests/btrfs/088 b/tests/btrfs/088
index 1696d02a..32d9d3d5 100755
--- a/tests/btrfs/088
+++ b/tests/btrfs/088
@@ -19,7 +19,6 @@ _begin_fstest auto quick metadata
 . ./common/filter
 . ./common/fail_make_request
 
-_supported_fs btrfs
 _require_scratch
 _require_fail_make_request
 
diff --git a/tests/btrfs/089 b/tests/btrfs/089
index 9460d4e8..8f8e37b6 100755
--- a/tests/btrfs/089
+++ b/tests/btrfs/089
@@ -14,7 +14,6 @@ _begin_fstest auto quick subvol
 . ./common/filter
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_scratch
 
 _scratch_mkfs >>$seqres.full 2>&1
diff --git a/tests/btrfs/090 b/tests/btrfs/090
index 49a4f3c0..779ae7c8 100755
--- a/tests/btrfs/090
+++ b/tests/btrfs/090
@@ -18,7 +18,6 @@ _begin_fstest auto quick metadata
 
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_scratch
 _require_scratch_dev_pool
 
diff --git a/tests/btrfs/091 b/tests/btrfs/091
index 3b548966..3b479b5d 100755
--- a/tests/btrfs/091
+++ b/tests/btrfs/091
@@ -13,7 +13,6 @@ _begin_fstest auto quick qgroup
 . ./common/filter
 . ./common/reflink
 
-_supported_fs btrfs
 _require_scratch
 _require_cp_reflink
 _require_scratch_qgroup
diff --git a/tests/btrfs/092 b/tests/btrfs/092
index bcb3985a..98c7d368 100755
--- a/tests/btrfs/092
+++ b/tests/btrfs/092
@@ -29,7 +29,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_fssum
 
diff --git a/tests/btrfs/093 b/tests/btrfs/093
index eb4bea6c..eabc5601 100755
--- a/tests/btrfs/093
+++ b/tests/btrfs/093
@@ -17,7 +17,6 @@ _begin_fstest auto quick clone
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_cloner
 
diff --git a/tests/btrfs/094 b/tests/btrfs/094
index fe401fc0..b52464f0 100755
--- a/tests/btrfs/094
+++ b/tests/btrfs/094
@@ -29,7 +29,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_cloner
 
diff --git a/tests/btrfs/095 b/tests/btrfs/095
index b0076f3f..de34d64b 100755
--- a/tests/btrfs/095
+++ b/tests/btrfs/095
@@ -25,7 +25,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-_supported_fs btrfs
 _require_scratch
 _require_dm_target flakey
 _require_cloner
diff --git a/tests/btrfs/096 b/tests/btrfs/096
index 8e014cd2..3fb1af69 100755
--- a/tests/btrfs/096
+++ b/tests/btrfs/096
@@ -12,7 +12,6 @@ _begin_fstest auto quick clone
 . ./common/filter
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_scratch
 _require_cloner
 
diff --git a/tests/btrfs/097 b/tests/btrfs/097
index f5222ff3..53ff66c2 100755
--- a/tests/btrfs/097
+++ b/tests/btrfs/097
@@ -19,7 +19,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_cloner
 
diff --git a/tests/btrfs/098 b/tests/btrfs/098
index 092543f4..6ee0b910 100755
--- a/tests/btrfs/098
+++ b/tests/btrfs/098
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-_supported_fs btrfs
 _require_scratch
 _require_dm_target flakey
 _require_cloner
diff --git a/tests/btrfs/099 b/tests/btrfs/099
index a7c76f35..acd49c46 100755
--- a/tests/btrfs/099
+++ b/tests/btrfs/099
@@ -12,7 +12,6 @@ _begin_fstest auto quick qgroup limit
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_btrfs_qgroup_report
 
diff --git a/tests/btrfs/100 b/tests/btrfs/100
index 11dcbb8d..46bfc4f7 100755
--- a/tests/btrfs/100
+++ b/tests/btrfs/100
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter.btrfs
 . ./common/dmerror
 
-_supported_fs btrfs
 _require_scratch_dev_pool 3
 _require_dm_target error
 
diff --git a/tests/btrfs/101 b/tests/btrfs/101
index cedff5c4..c65e14ea 100755
--- a/tests/btrfs/101
+++ b/tests/btrfs/101
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter.btrfs
 . ./common/dmerror
 
-_supported_fs btrfs
 _require_scratch_dev_pool 3
 _require_btrfs_dev_del_by_devid
 _require_dm_target error
diff --git a/tests/btrfs/102 b/tests/btrfs/102
index 303904b8..d89f37c9 100755
--- a/tests/btrfs/102
+++ b/tests/btrfs/102
@@ -12,7 +12,6 @@ _begin_fstest auto quick metadata enospc balance
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 _scratch_mkfs >>$seqres.full 2>&1
diff --git a/tests/btrfs/103 b/tests/btrfs/103
index b60527cb..3331f7a4 100755
--- a/tests/btrfs/103
+++ b/tests/btrfs/103
@@ -12,7 +12,6 @@ _begin_fstest auto quick clone compress
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_cloner
 
diff --git a/tests/btrfs/104 b/tests/btrfs/104
index 2ba9ec9d..9479dca1 100755
--- a/tests/btrfs/104
+++ b/tests/btrfs/104
@@ -21,7 +21,6 @@ _begin_fstest auto qgroup
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_btrfs_qgroup_report
 
diff --git a/tests/btrfs/105 b/tests/btrfs/105
index 14b19f5d..4343cce0 100755
--- a/tests/btrfs/105
+++ b/tests/btrfs/105
@@ -22,7 +22,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 send_files_dir=$TEST_DIR/btrfs-test-$seq
diff --git a/tests/btrfs/106 b/tests/btrfs/106
index 2eb02be7..4876a600 100755
--- a/tests/btrfs/106
+++ b/tests/btrfs/106
@@ -13,7 +13,6 @@ _begin_fstest auto quick clone compress
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_cloner
 
diff --git a/tests/btrfs/107 b/tests/btrfs/107
index ae83f4d3..123906fb 100755
--- a/tests/btrfs/107
+++ b/tests/btrfs/107
@@ -13,7 +13,6 @@ _begin_fstest auto quick prealloc
 . ./common/filter
 . ./common/defrag
 
-_supported_fs btrfs
 _require_scratch
 _require_xfs_io_command "falloc"
 
diff --git a/tests/btrfs/108 b/tests/btrfs/108
index 7d14a22d..fe990343 100755
--- a/tests/btrfs/108
+++ b/tests/btrfs/108
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-_supported_fs btrfs
 _require_scratch
 _require_cp_reflink
 _require_xfs_io_command "fpunch"
diff --git a/tests/btrfs/109 b/tests/btrfs/109
index 13d3446f..0948c836 100755
--- a/tests/btrfs/109
+++ b/tests/btrfs/109
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-_supported_fs btrfs
 _require_scratch
 _require_cp_reflink
 
diff --git a/tests/btrfs/110 b/tests/btrfs/110
index e4f974fc..76fca6f2 100755
--- a/tests/btrfs/110
+++ b/tests/btrfs/110
@@ -20,7 +20,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 send_files_dir=$TEST_DIR/btrfs-test-$seq
diff --git a/tests/btrfs/111 b/tests/btrfs/111
index e5dfd227..956c956c 100755
--- a/tests/btrfs/111
+++ b/tests/btrfs/111
@@ -20,7 +20,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 send_files_dir=$TEST_DIR/btrfs-test-$seq
diff --git a/tests/btrfs/112 b/tests/btrfs/112
index 2e123828..1326b824 100755
--- a/tests/btrfs/112
+++ b/tests/btrfs/112
@@ -13,7 +13,6 @@ _begin_fstest auto quick clone prealloc compress
 . ./common/filter
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_scratch
 _require_cloner
 _require_btrfs_fs_feature "no_holes"
diff --git a/tests/btrfs/113 b/tests/btrfs/113
index a076a06f..e732ea6e 100755
--- a/tests/btrfs/113
+++ b/tests/btrfs/113
@@ -15,7 +15,6 @@ _begin_fstest auto quick compress clone
 . ./common/filter
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_scratch
 _require_cloner
 
diff --git a/tests/btrfs/114 b/tests/btrfs/114
index 35efbd77..f1327d40 100755
--- a/tests/btrfs/114
+++ b/tests/btrfs/114
@@ -12,7 +12,6 @@ _begin_fstest auto qgroup
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 _scratch_mkfs >>$seqres.full 2>&1
diff --git a/tests/btrfs/115 b/tests/btrfs/115
index 4af83b61..db74d4cb 100755
--- a/tests/btrfs/115
+++ b/tests/btrfs/115
@@ -12,7 +12,6 @@ _begin_fstest auto qgroup
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 _scratch_mkfs >>$seqres.full 2>&1
diff --git a/tests/btrfs/116 b/tests/btrfs/116
index 99da568d..a471f137 100755
--- a/tests/btrfs/116
+++ b/tests/btrfs/116
@@ -14,7 +14,6 @@ _begin_fstest auto quick metadata
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 # Writing non-contiguous data directly to the device
 _require_non_zoned_device $SCRATCH_DEV
diff --git a/tests/btrfs/117 b/tests/btrfs/117
index 1cc824be..caed7c0f 100755
--- a/tests/btrfs/117
+++ b/tests/btrfs/117
@@ -16,7 +16,6 @@ tmp=`mktemp -d`
 . ./common/filter
 . ./common/reflink
 
-_supported_fs btrfs
 _require_scratch
 _require_cp_reflink
 
diff --git a/tests/btrfs/118 b/tests/btrfs/118
index 0bb50b10..d6539837 100755
--- a/tests/btrfs/118
+++ b/tests/btrfs/118
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-_supported_fs btrfs
 _require_scratch
 _require_dm_target flakey
 
diff --git a/tests/btrfs/119 b/tests/btrfs/119
index 8e7c4789..a934ad63 100755
--- a/tests/btrfs/119
+++ b/tests/btrfs/119
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-_supported_fs btrfs
 _require_scratch
 _require_dm_target flakey
 
diff --git a/tests/btrfs/120 b/tests/btrfs/120
index 18cd87d4..a9b8adec 100755
--- a/tests/btrfs/120
+++ b/tests/btrfs/120
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-_supported_fs btrfs
 _require_scratch
 _require_dm_target flakey
 
diff --git a/tests/btrfs/121 b/tests/btrfs/121
index 8be9a167..8ed52b03 100755
--- a/tests/btrfs/121
+++ b/tests/btrfs/121
@@ -16,7 +16,6 @@ _begin_fstest auto quick snapshot qgroup
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 _scratch_mkfs >/dev/null
diff --git a/tests/btrfs/122 b/tests/btrfs/122
index 04170d30..9e1ee639 100755
--- a/tests/btrfs/122
+++ b/tests/btrfs/122
@@ -12,7 +12,6 @@ _begin_fstest auto quick snapshot qgroup
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_btrfs_qgroup_report
 
diff --git a/tests/btrfs/123 b/tests/btrfs/123
index 282b7ce2..127bdf34 100755
--- a/tests/btrfs/123
+++ b/tests/btrfs/123
@@ -15,7 +15,6 @@ _begin_fstest auto quick qgroup balance
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_btrfs_qgroup_report
 
diff --git a/tests/btrfs/124 b/tests/btrfs/124
index ba001ff8..af079c28 100755
--- a/tests/btrfs/124
+++ b/tests/btrfs/124
@@ -35,7 +35,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch_dev_pool 2
 _test_unmount
 _require_btrfs_forget_or_module_loadable
diff --git a/tests/btrfs/125 b/tests/btrfs/125
index 5d76018c..31379d81 100755
--- a/tests/btrfs/125
+++ b/tests/btrfs/125
@@ -34,7 +34,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch_dev_pool 3
 _test_unmount
 _require_btrfs_forget_or_module_loadable
diff --git a/tests/btrfs/126 b/tests/btrfs/126
index 637fde43..038f274a 100755
--- a/tests/btrfs/126
+++ b/tests/btrfs/126
@@ -11,7 +11,6 @@ _begin_fstest auto quick qgroup limit
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_btrfs_qgroup_report
 
diff --git a/tests/btrfs/127 b/tests/btrfs/127
index 2bdb235b..0bd0eb48 100755
--- a/tests/btrfs/127
+++ b/tests/btrfs/127
@@ -21,7 +21,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_fssum
diff --git a/tests/btrfs/128 b/tests/btrfs/128
index e7a6e35b..615c3e48 100755
--- a/tests/btrfs/128
+++ b/tests/btrfs/128
@@ -20,7 +20,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_fssum
diff --git a/tests/btrfs/129 b/tests/btrfs/129
index 64b02109..a9fd87e8 100755
--- a/tests/btrfs/129
+++ b/tests/btrfs/129
@@ -21,7 +21,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_fssum
diff --git a/tests/btrfs/130 b/tests/btrfs/130
index 31fe7589..36bc2e31 100755
--- a/tests/btrfs/130
+++ b/tests/btrfs/130
@@ -17,7 +17,6 @@ _begin_fstest auto quick clone send
 . ./common/filter
 . ./common/reflink
 
-_supported_fs btrfs
 _require_scratch
 _require_scratch_reflink
 
diff --git a/tests/btrfs/131 b/tests/btrfs/131
index ef8f4918..b4756a5f 100755
--- a/tests/btrfs/131
+++ b/tests/btrfs/131
@@ -11,7 +11,6 @@ _begin_fstest auto quick
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_btrfs_command inspect-internal dump-super
 _require_btrfs_fs_feature free_space_tree
diff --git a/tests/btrfs/132 b/tests/btrfs/132
index d0ac51e4..57d9751c 100755
--- a/tests/btrfs/132
+++ b/tests/btrfs/132
@@ -23,7 +23,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 # Use small filesystem to trigger the bug more easily
diff --git a/tests/btrfs/133 b/tests/btrfs/133
index 428736ef..e3a53331 100755
--- a/tests/btrfs/133
+++ b/tests/btrfs/133
@@ -21,7 +21,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_fssum
diff --git a/tests/btrfs/134 b/tests/btrfs/134
index a48b5bbd..fbb40631 100755
--- a/tests/btrfs/134
+++ b/tests/btrfs/134
@@ -21,7 +21,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_fssum
diff --git a/tests/btrfs/135 b/tests/btrfs/135
index f57a8ad2..9e9e55e7 100755
--- a/tests/btrfs/135
+++ b/tests/btrfs/135
@@ -22,7 +22,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_fssum
diff --git a/tests/btrfs/136 b/tests/btrfs/136
index 3cb7150f..9b5b3331 100755
--- a/tests/btrfs/136
+++ b/tests/btrfs/136
@@ -16,7 +16,6 @@ _begin_fstest auto convert
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch_nocheck
 # ext4 does not support zoned block device
 _require_non_zoned_device "${SCRATCH_DEV}"
diff --git a/tests/btrfs/137 b/tests/btrfs/137
index acef0b75..7710dc18 100755
--- a/tests/btrfs/137
+++ b/tests/btrfs/137
@@ -20,7 +20,6 @@ _cleanup()
 . ./common/filter
 . ./common/punch
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_xfs_io_command "fiemap"
diff --git a/tests/btrfs/138 b/tests/btrfs/138
index c2d272d1..17bbe28e 100755
--- a/tests/btrfs/138
+++ b/tests/btrfs/138
@@ -12,7 +12,6 @@ _begin_fstest auto compress
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_btrfs_command property
 _require_btrfs_no_nodatacow
diff --git a/tests/btrfs/139 b/tests/btrfs/139
index 6f5462af..aa39eea3 100755
--- a/tests/btrfs/139
+++ b/tests/btrfs/139
@@ -14,7 +14,6 @@ _begin_fstest auto qgroup limit
 
 . ./common/filter
 
-_supported_fs btrfs
 # We at least need 2GB of free space on $SCRATCH_DEV
 _require_scratch_size $((2 * 1024 * 1024))
 
diff --git a/tests/btrfs/140 b/tests/btrfs/140
index eb0fbc13..b2c8451d 100755
--- a/tests/btrfs/140
+++ b/tests/btrfs/140
@@ -16,7 +16,6 @@ _begin_fstest auto quick read_repair fiemap
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch_dev_pool 2
 # No data checksums for NOCOW case, so can't detect corruption and repair data.
 _require_btrfs_no_nodatacow
diff --git a/tests/btrfs/141 b/tests/btrfs/141
index d46301a5..3d48dff3 100755
--- a/tests/btrfs/141
+++ b/tests/btrfs/141
@@ -17,7 +17,6 @@ _begin_fstest auto quick read_repair
 
 . ./common/filter
 
-_supported_fs btrfs
 # No data checksums for NOCOW case, so can't detect corruption and repair data.
 _require_btrfs_no_nodatacow
 _require_scratch_dev_pool 2
diff --git a/tests/btrfs/142 b/tests/btrfs/142
index d9a8609e..cf7e8daa 100755
--- a/tests/btrfs/142
+++ b/tests/btrfs/142
@@ -18,7 +18,6 @@ _begin_fstest auto quick read_repair
 . ./common/filter
 . ./common/dmdust
 
-_supported_fs btrfs
 _require_scratch_dev_pool 2
 _require_dm_target dust
 
diff --git a/tests/btrfs/143 b/tests/btrfs/143
index 07ebf33c..5da9a578 100755
--- a/tests/btrfs/143
+++ b/tests/btrfs/143
@@ -25,7 +25,6 @@ _begin_fstest auto quick read_repair
 . ./common/filter
 . ./common/dmdust
 
-_supported_fs btrfs
 _require_scratch_dev_pool 2
 _require_dm_target dust
 
diff --git a/tests/btrfs/144 b/tests/btrfs/144
index daae7821..62c81ce9 100755
--- a/tests/btrfs/144
+++ b/tests/btrfs/144
@@ -21,7 +21,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_fssum
diff --git a/tests/btrfs/145 b/tests/btrfs/145
index 4e10a0e0..0f55a87b 100755
--- a/tests/btrfs/145
+++ b/tests/btrfs/145
@@ -21,7 +21,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_fssum
diff --git a/tests/btrfs/146 b/tests/btrfs/146
index f734b610..d6d2829a 100755
--- a/tests/btrfs/146
+++ b/tests/btrfs/146
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmerror
 
-_supported_fs btrfs
 _require_scratch
 _require_scratch_dev_pool
 _require_dm_target error
diff --git a/tests/btrfs/147 b/tests/btrfs/147
index 71703be3..e4f40df1 100755
--- a/tests/btrfs/147
+++ b/tests/btrfs/147
@@ -21,7 +21,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_fssum
diff --git a/tests/btrfs/148 b/tests/btrfs/148
index 74d48b6e..3f651e54 100755
--- a/tests/btrfs/148
+++ b/tests/btrfs/148
@@ -11,7 +11,6 @@ _begin_fstest auto quick rw scrub
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_scratch_dev_pool 4
 _require_odirect
diff --git a/tests/btrfs/149 b/tests/btrfs/149
index 5054a57c..aec34969 100755
--- a/tests/btrfs/149
+++ b/tests/btrfs/149
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_scratch_reflink
diff --git a/tests/btrfs/150 b/tests/btrfs/150
index fd386d92..a37f252b 100755
--- a/tests/btrfs/150
+++ b/tests/btrfs/150
@@ -16,7 +16,6 @@ _begin_fstest auto quick dangerous read_repair compress
 . ./common/filter
 . ./common/fail_make_request
 
-_supported_fs btrfs
 _require_debugfs
 _require_scratch
 _require_fail_make_request
diff --git a/tests/btrfs/151 b/tests/btrfs/151
index edf42a83..f635aa25 100755
--- a/tests/btrfs/151
+++ b/tests/btrfs/151
@@ -15,7 +15,6 @@ _begin_fstest auto quick volume
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_scratch_dev_pool 3
 _require_btrfs_dev_del_by_devid
diff --git a/tests/btrfs/152 b/tests/btrfs/152
index 9ea2128c..d819d6ca 100755
--- a/tests/btrfs/152
+++ b/tests/btrfs/152
@@ -12,7 +12,6 @@ _begin_fstest auto quick metadata qgroup send
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 _scratch_mkfs >>$seqres.full 2>&1
diff --git a/tests/btrfs/153 b/tests/btrfs/153
index 8dd3cd97..40cb1526 100755
--- a/tests/btrfs/153
+++ b/tests/btrfs/153
@@ -11,7 +11,6 @@ _begin_fstest auto quick qgroup limit preallocrw
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_btrfs_qgroup_report
 _require_xfs_io_command "falloc"
diff --git a/tests/btrfs/154 b/tests/btrfs/154
index ccd76035..86c14142 100755
--- a/tests/btrfs/154
+++ b/tests/btrfs/154
@@ -16,7 +16,6 @@ _begin_fstest auto quick
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_command $PYTHON3_PROG python3
 
diff --git a/tests/btrfs/155 b/tests/btrfs/155
index 70cccab7..b309a815 100755
--- a/tests/btrfs/155
+++ b/tests/btrfs/155
@@ -21,7 +21,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_fssum
diff --git a/tests/btrfs/156 b/tests/btrfs/156
index eb8fd062..d6cd0fde 100755
--- a/tests/btrfs/156
+++ b/tests/btrfs/156
@@ -19,7 +19,6 @@ _begin_fstest auto quick trim balance
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_fstrim
 
diff --git a/tests/btrfs/157 b/tests/btrfs/157
index 05cb94d0..c49229f0 100755
--- a/tests/btrfs/157
+++ b/tests/btrfs/157
@@ -25,7 +25,6 @@ _begin_fstest auto quick raid read_repair
 
 . ./common/filter
 
-_supported_fs btrfs
 # No data checksums for NOCOW case, so can't detect corruption and repair data.
 _require_btrfs_no_nodatacow
 _require_scratch_dev_pool 4
diff --git a/tests/btrfs/158 b/tests/btrfs/158
index 78a527c2..ff28defe 100755
--- a/tests/btrfs/158
+++ b/tests/btrfs/158
@@ -17,7 +17,6 @@ _begin_fstest auto quick raid scrub
 
 . ./common/filter
 
-_supported_fs btrfs
 # No data checksums for NOCOW case, so can't detect corruption and repair data.
 _require_btrfs_no_nodatacow
 _require_scratch_dev_pool 4
diff --git a/tests/btrfs/159 b/tests/btrfs/159
index 0cbf5be1..57765238 100755
--- a/tests/btrfs/159
+++ b/tests/btrfs/159
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-_supported_fs btrfs
 _require_scratch
 _require_dm_target flakey
 _require_xfs_io_command "fpunch"
diff --git a/tests/btrfs/160 b/tests/btrfs/160
index 23a2a8c4..04ed1f17 100755
--- a/tests/btrfs/160
+++ b/tests/btrfs/160
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmerror
 
-_supported_fs btrfs
 _require_scratch_dev_pool
 
 _require_dm_target error
diff --git a/tests/btrfs/161 b/tests/btrfs/161
index 57c54a88..89670682 100755
--- a/tests/btrfs/161
+++ b/tests/btrfs/161
@@ -13,7 +13,6 @@ _begin_fstest auto quick volume seed
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_command "$BTRFS_TUNE_PROG" btrfstune
 _require_scratch_dev_pool 2
 
diff --git a/tests/btrfs/162 b/tests/btrfs/162
index 31b794d9..bb70789b 100755
--- a/tests/btrfs/162
+++ b/tests/btrfs/162
@@ -15,7 +15,6 @@ _begin_fstest auto quick volume seed
 . ./common/filter
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_command "$BTRFS_TUNE_PROG" btrfstune
 _require_scratch_dev_pool 3
 
diff --git a/tests/btrfs/163 b/tests/btrfs/163
index d2c192c9..3050689d 100755
--- a/tests/btrfs/163
+++ b/tests/btrfs/163
@@ -27,7 +27,6 @@ _cleanup()
 . ./common/filter
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_command "$BTRFS_TUNE_PROG" btrfstune
 _require_scratch_dev_pool 3
 _require_btrfs_forget_or_module_loadable
diff --git a/tests/btrfs/164 b/tests/btrfs/164
index 433a321f..a7d7de61 100755
--- a/tests/btrfs/164
+++ b/tests/btrfs/164
@@ -20,7 +20,6 @@ _cleanup()
 	_btrfs_rescan_devices
 }
 
-_supported_fs btrfs
 _require_btrfs_forget_or_module_loadable
 _require_scratch_dev_pool 2
 
diff --git a/tests/btrfs/165 b/tests/btrfs/165
index bab40060..a1099d88 100755
--- a/tests/btrfs/165
+++ b/tests/btrfs/165
@@ -33,7 +33,6 @@ rm_r_subvol() {
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_btrfs_fs_feature "rmdir_subvol"
 
diff --git a/tests/btrfs/166 b/tests/btrfs/166
index 4c2af53b..719e2a3b 100755
--- a/tests/btrfs/166
+++ b/tests/btrfs/166
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-_supported_fs btrfs
 _require_scratch
 _require_dm_target flakey
 
diff --git a/tests/btrfs/167 b/tests/btrfs/167
index 57c2afad..cad94954 100755
--- a/tests/btrfs/167
+++ b/tests/btrfs/167
@@ -15,7 +15,6 @@ _begin_fstest auto quick replace volume remount compress
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch_dev_pool 2
 _require_scratch_dev_pool_equal_size
 
diff --git a/tests/btrfs/168 b/tests/btrfs/168
index 7879ec05..85e80396 100755
--- a/tests/btrfs/168
+++ b/tests/btrfs/168
@@ -21,7 +21,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_btrfs_command "property"
diff --git a/tests/btrfs/169 b/tests/btrfs/169
index 75a8ee8b..44da6979 100755
--- a/tests/btrfs/169
+++ b/tests/btrfs/169
@@ -21,7 +21,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_xfs_io_command "fpunch"
diff --git a/tests/btrfs/170 b/tests/btrfs/170
index 1beec6d7..2134ae97 100755
--- a/tests/btrfs/170
+++ b/tests/btrfs/170
@@ -13,7 +13,6 @@ _begin_fstest auto quick snapshot prealloc
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_xfs_io_command "falloc" "-k"
 
diff --git a/tests/btrfs/171 b/tests/btrfs/171
index e820fd9d..48dee176 100755
--- a/tests/btrfs/171
+++ b/tests/btrfs/171
@@ -16,7 +16,6 @@ _begin_fstest auto quick qgroup
 . ./common/filter
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_scratch
 
 _scratch_mkfs > /dev/null 2>&1
diff --git a/tests/btrfs/172 b/tests/btrfs/172
index fbb7739d..dc997c68 100755
--- a/tests/btrfs/172
+++ b/tests/btrfs/172
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmlogwrites
 
-_supported_fs btrfs
 _require_scratch
 _require_log_writes
 _require_xfs_io_command "sync_range"
diff --git a/tests/btrfs/173 b/tests/btrfs/173
index 42af2d26..61a7cbf7 100755
--- a/tests/btrfs/173
+++ b/tests/btrfs/173
@@ -12,7 +12,6 @@ _begin_fstest auto quick swap compress
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch_swapfile
 
 _scratch_mkfs >> $seqres.full 2>&1
diff --git a/tests/btrfs/174 b/tests/btrfs/174
index 16305c18..7eb50f05 100755
--- a/tests/btrfs/174
+++ b/tests/btrfs/174
@@ -12,7 +12,6 @@ _begin_fstest auto quick swap compress
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch_swapfile
 
 _scratch_mkfs >> $seqres.full 2>&1
diff --git a/tests/btrfs/175 b/tests/btrfs/175
index de52c71e..2208d5f1 100755
--- a/tests/btrfs/175
+++ b/tests/btrfs/175
@@ -11,7 +11,6 @@ _begin_fstest auto quick swap volume
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch_dev_pool 2
 _require_scratch_swapfile
 _check_minimal_fs_size $((1024 * 1024 * 1024))
diff --git a/tests/btrfs/176 b/tests/btrfs/176
index 76754410..86796c88 100755
--- a/tests/btrfs/176
+++ b/tests/btrfs/176
@@ -11,7 +11,6 @@ _begin_fstest auto quick swap volume
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch_dev_pool 3
 _require_scratch_swapfile
 
diff --git a/tests/btrfs/177 b/tests/btrfs/177
index 38c3d41d..7b13cd8d 100755
--- a/tests/btrfs/177
+++ b/tests/btrfs/177
@@ -11,7 +11,6 @@ _begin_fstest auto quick swap balance
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch_swapfile
 
 # Eliminate the differences between the old and new output formats
diff --git a/tests/btrfs/178 b/tests/btrfs/178
index fda287dd..1bd6dacf 100755
--- a/tests/btrfs/178
+++ b/tests/btrfs/178
@@ -23,7 +23,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_fssum
diff --git a/tests/btrfs/179 b/tests/btrfs/179
index 7fcdbfd3..290e5796 100755
--- a/tests/btrfs/179
+++ b/tests/btrfs/179
@@ -14,7 +14,6 @@ _begin_fstest auto qgroup dangerous
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 # default sleep interval
diff --git a/tests/btrfs/180 b/tests/btrfs/180
index 59bb3c83..dba757de 100755
--- a/tests/btrfs/180
+++ b/tests/btrfs/180
@@ -15,7 +15,6 @@ _begin_fstest auto quick qgroup limit prealloc
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_xfs_io_command falloc
 
diff --git a/tests/btrfs/181 b/tests/btrfs/181
index 068e6e8e..eab3b6a8 100755
--- a/tests/btrfs/181
+++ b/tests/btrfs/181
@@ -15,7 +15,6 @@ _begin_fstest auto quick balance
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_btrfs_command inspect-internal dump-super
 
diff --git a/tests/btrfs/182 b/tests/btrfs/182
index b5bd022b..865cbef0 100755
--- a/tests/btrfs/182
+++ b/tests/btrfs/182
@@ -17,7 +17,6 @@ _begin_fstest auto quick balance
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 nr_files=1024
diff --git a/tests/btrfs/183 b/tests/btrfs/183
index 9d3e78cc..acc6bbed 100755
--- a/tests/btrfs/183
+++ b/tests/btrfs/183
@@ -13,7 +13,6 @@ _begin_fstest auto quick clone compress punch
 . ./common/filter
 . ./common/reflink
 
-_supported_fs btrfs
 _require_scratch_reflink
 _require_xfs_io_command "fpunch"
 
diff --git a/tests/btrfs/184 b/tests/btrfs/184
index ad957457..575807b0 100755
--- a/tests/btrfs/184
+++ b/tests/btrfs/184
@@ -12,7 +12,6 @@ _begin_fstest auto quick volume
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_scratch_dev_pool 2
 _require_btrfs_command inspect-internal dump-super
diff --git a/tests/btrfs/185 b/tests/btrfs/185
index 2050672e..8d064345 100755
--- a/tests/btrfs/185
+++ b/tests/btrfs/185
@@ -23,7 +23,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch_dev_pool 2
 _scratch_dev_pool_get 2
 _fixed_by_kernel_commit a9261d4125c9 \
diff --git a/tests/btrfs/186 b/tests/btrfs/186
index 164e3975..a7d68c70 100755
--- a/tests/btrfs/186
+++ b/tests/btrfs/186
@@ -22,7 +22,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_btrfs_command "property"
diff --git a/tests/btrfs/187 b/tests/btrfs/187
index a7957e88..993d14be 100755
--- a/tests/btrfs/187
+++ b/tests/btrfs/187
@@ -19,7 +19,6 @@ _begin_fstest auto send dedupe clone balance
 . ./common/filter
 . ./common/reflink
 
-_supported_fs btrfs
 _require_scratch_dedupe
 _require_attrs
 
diff --git a/tests/btrfs/188 b/tests/btrfs/188
index 8d0e455e..6a3e9831 100755
--- a/tests/btrfs/188
+++ b/tests/btrfs/188
@@ -22,7 +22,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_btrfs_fs_feature "no_holes"
diff --git a/tests/btrfs/189 b/tests/btrfs/189
index 179ff079..e120add6 100755
--- a/tests/btrfs/189
+++ b/tests/btrfs/189
@@ -25,7 +25,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-_supported_fs btrfs
 _require_fssum
 _require_test
 _require_scratch_reflink
diff --git a/tests/btrfs/190 b/tests/btrfs/190
index 6d805e6b..5a91bec6 100755
--- a/tests/btrfs/190
+++ b/tests/btrfs/190
@@ -13,7 +13,6 @@ _begin_fstest auto quick replay balance qgroup recoveryloop
 . ./common/filter
 . ./common/dmlogwrites
 
-_supported_fs btrfs
 _require_scratch
 # and we need extra device as log device
 _require_log_writes
diff --git a/tests/btrfs/191 b/tests/btrfs/191
index 8bf591b6..e331a53b 100755
--- a/tests/btrfs/191
+++ b/tests/btrfs/191
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-_supported_fs btrfs
 _require_test
 _require_scratch_dedupe
 _require_fssum
diff --git a/tests/btrfs/192 b/tests/btrfs/192
index 0a35e055..f7fb65b8 100755
--- a/tests/btrfs/192
+++ b/tests/btrfs/192
@@ -26,7 +26,6 @@ _cleanup()
 . ./common/attr
 . ./common/dmlogwrites
 
-_supported_fs btrfs
 
 _require_command "$KILLALL_PROG" killall
 _require_command "$BLKDISCARD_PROG" blkdiscard
diff --git a/tests/btrfs/193 b/tests/btrfs/193
index bf9e92b4..4326e188 100755
--- a/tests/btrfs/193
+++ b/tests/btrfs/193
@@ -14,7 +14,6 @@ _begin_fstest auto quick qgroup enospc limit prealloc
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_xfs_io_command falloc
 
diff --git a/tests/btrfs/194 b/tests/btrfs/194
index 726f61d4..fb368765 100755
--- a/tests/btrfs/194
+++ b/tests/btrfs/194
@@ -15,7 +15,6 @@ _begin_fstest auto volume
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch_dev_pool 2
 _scratch_dev_pool_get 2
 
diff --git a/tests/btrfs/195 b/tests/btrfs/195
index 6de70121..72fc3a77 100755
--- a/tests/btrfs/195
+++ b/tests/btrfs/195
@@ -12,7 +12,6 @@ _begin_fstest auto volume balance scrub
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch_dev_pool 4
 # Zoned btrfs only supports SINGLE profile
 _require_non_zoned_device "${SCRATCH_DEV}"
diff --git a/tests/btrfs/196 b/tests/btrfs/196
index 9602c6f4..01622aaa 100755
--- a/tests/btrfs/196
+++ b/tests/btrfs/196
@@ -29,7 +29,6 @@ _cleanup()
 . ./common/dmthin
 . ./common/dmlogwrites
 
-_supported_fs btrfs
 
 # Use thin device as replay device, which requires $SCRATCH_DEV
 _require_scratch_nocheck
diff --git a/tests/btrfs/197 b/tests/btrfs/197
index 85f904c5..9f1d879a 100755
--- a/tests/btrfs/197
+++ b/tests/btrfs/197
@@ -23,7 +23,6 @@ _cleanup()
 
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_scratch_dev_pool 5
diff --git a/tests/btrfs/198 b/tests/btrfs/198
index e3c4b74a..d17ab6da 100755
--- a/tests/btrfs/198
+++ b/tests/btrfs/198
@@ -12,7 +12,6 @@ _begin_fstest auto quick volume
 . ./common/filter
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_command "$WIPEFS_PROG" wipefs
 _require_scratch
 _require_scratch_dev_pool 4
diff --git a/tests/btrfs/199 b/tests/btrfs/199
index ff687704..f161e550 100755
--- a/tests/btrfs/199
+++ b/tests/btrfs/199
@@ -26,7 +26,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _fixed_by_kernel_commit 6b7faadd985c \
 	"btrfs: Ensure we trim ranges across block group boundary"
 
diff --git a/tests/btrfs/200 b/tests/btrfs/200
index cd3e3b83..e62937a4 100755
--- a/tests/btrfs/200
+++ b/tests/btrfs/200
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/reflink
 . ./common/punch
 
-_supported_fs btrfs
 _require_fssum
 _require_test
 _require_scratch_reflink
diff --git a/tests/btrfs/201 b/tests/btrfs/201
index 007319ae..eb727cd2 100755
--- a/tests/btrfs/201
+++ b/tests/btrfs/201
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-_supported_fs btrfs
 _require_scratch
 _require_dm_target flakey
 _require_attrs
diff --git a/tests/btrfs/202 b/tests/btrfs/202
index d6077853..a9e32f6e 100755
--- a/tests/btrfs/202
+++ b/tests/btrfs/202
@@ -10,7 +10,6 @@ _begin_fstest auto quick subvol snapshot
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 _scratch_mkfs >> $seqres.full 2>&1
diff --git a/tests/btrfs/203 b/tests/btrfs/203
index 45872b85..b3a4bdd6 100755
--- a/tests/btrfs/203
+++ b/tests/btrfs/203
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-_supported_fs btrfs
 _require_test
 _require_scratch_reflink
 
diff --git a/tests/btrfs/204 b/tests/btrfs/204
index 73511d99..e75d6aad 100755
--- a/tests/btrfs/204
+++ b/tests/btrfs/204
@@ -12,7 +12,6 @@ _begin_fstest auto quick punch
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_xfs_io_command "fpunch"
 
diff --git a/tests/btrfs/205 b/tests/btrfs/205
index 096a5dd9..13a1df8b 100755
--- a/tests/btrfs/205
+++ b/tests/btrfs/205
@@ -19,7 +19,6 @@ _begin_fstest auto quick clone compress prealloc
 . ./common/filter
 . ./common/reflink
 
-_supported_fs btrfs
 _require_scratch_reflink
 _require_xfs_io_command "falloc" "-k"
 _require_command "$CHATTR_PROG" chattr
diff --git a/tests/btrfs/206 b/tests/btrfs/206
index 39fac00d..258328a1 100755
--- a/tests/btrfs/206
+++ b/tests/btrfs/206
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmlogwrites
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_log_writes
diff --git a/tests/btrfs/207 b/tests/btrfs/207
index fc18b17f..e6faf6c7 100755
--- a/tests/btrfs/207
+++ b/tests/btrfs/207
@@ -12,7 +12,6 @@ _begin_fstest auto rw raid
 
 . ./common/filter
 
-_supported_fs btrfs
 # we check scratch dev after each loop
 _require_scratch_nocheck
 _require_scratch_dev_pool 4
diff --git a/tests/btrfs/208 b/tests/btrfs/208
index c104fa74..5ea732ae 100755
--- a/tests/btrfs/208
+++ b/tests/btrfs/208
@@ -13,7 +13,6 @@ _begin_fstest auto quick subvol
 . ./common/filter
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_scratch
 _require_btrfs_command subvolume delete --subvolid
 
diff --git a/tests/btrfs/209 b/tests/btrfs/209
index 9f8808b6..5a5964a3 100755
--- a/tests/btrfs/209
+++ b/tests/btrfs/209
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-_supported_fs btrfs
 _require_scratch
 _require_dm_target flakey
 _require_btrfs_fs_feature "no_holes"
diff --git a/tests/btrfs/210 b/tests/btrfs/210
index 021a4b8a..3df2e897 100755
--- a/tests/btrfs/210
+++ b/tests/btrfs/210
@@ -12,7 +12,6 @@ _begin_fstest auto quick qgroup snapshot
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 _scratch_mkfs >/dev/null
diff --git a/tests/btrfs/211 b/tests/btrfs/211
index d80dc06f..01271491 100755
--- a/tests/btrfs/211
+++ b/tests/btrfs/211
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-_supported_fs btrfs
 _require_scratch
 _require_xfs_io_command "falloc" "-k"
 # fiemap needed by _count_extents()
diff --git a/tests/btrfs/212 b/tests/btrfs/212
index 71337722..f356d7d0 100755
--- a/tests/btrfs/212
+++ b/tests/btrfs/212
@@ -24,7 +24,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_command "$KILLALL_PROG" killall
 
diff --git a/tests/btrfs/213 b/tests/btrfs/213
index 33504d3d..694a277c 100755
--- a/tests/btrfs/213
+++ b/tests/btrfs/213
@@ -19,7 +19,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_xfs_io_command pwrite -D
 
diff --git a/tests/btrfs/214 b/tests/btrfs/214
index 24d7c981..994ba6b3 100755
--- a/tests/btrfs/214
+++ b/tests/btrfs/214
@@ -13,7 +13,6 @@ _register_cleanup "cleanup"
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_command "$SETCAP_PROG" setcap
 _require_command "$GETCAP_PROG" getcap
diff --git a/tests/btrfs/215 b/tests/btrfs/215
index 7054a9ba..b63ebff6 100755
--- a/tests/btrfs/215
+++ b/tests/btrfs/215
@@ -20,7 +20,6 @@ get_physical()
 		$AWK_PROG "(\$1 ~ /stripe/ && \$3 ~ /devid/ && \$2 ~ /0/) { print \$6 }"
 }
 
-_supported_fs btrfs
 _require_scratch
 # No data checksums for NOCOW case, so can't detect corruption and repair data.
 _require_btrfs_no_nodatacow
diff --git a/tests/btrfs/216 b/tests/btrfs/216
index e606ca33..08062c5e 100755
--- a/tests/btrfs/216
+++ b/tests/btrfs/216
@@ -12,7 +12,6 @@ _begin_fstest auto quick seed
 
 . ./common/filter
 
-_supported_fs btrfs
 _fixed_by_kernel_commit 4faf55b03823 \
 	"btrfs: don't traverse into the seed devices in show_devname"
 _require_scratch_dev_pool 2
diff --git a/tests/btrfs/217 b/tests/btrfs/217
index f96a6933..6f0292ae 100755
--- a/tests/btrfs/217
+++ b/tests/btrfs/217
@@ -14,7 +14,6 @@ _begin_fstest auto quick trim dangerous
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch_size $((5 * 1024 * 1024)) #kB
 _require_fstrim
 
diff --git a/tests/btrfs/218 b/tests/btrfs/218
index 9578d4c2..70b3b938 100755
--- a/tests/btrfs/218
+++ b/tests/btrfs/218
@@ -13,7 +13,6 @@ _begin_fstest auto quick volume
 . ./common/filter
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _fixed_by_kernel_commit 124604eb50f8 \
 	"btrfs: init device stats for seed devices"
 _require_test
diff --git a/tests/btrfs/219 b/tests/btrfs/219
index 6f89b8ae..052f61a3 100755
--- a/tests/btrfs/219
+++ b/tests/btrfs/219
@@ -37,7 +37,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 
 loop_mnt1=$TEST_DIR/$seq/mnt1
 loop_mnt2=$TEST_DIR/$seq/mnt2
diff --git a/tests/btrfs/220 b/tests/btrfs/220
index 2b62c9bb..b98d4149 100755
--- a/tests/btrfs/220
+++ b/tests/btrfs/220
@@ -14,7 +14,6 @@ _register_cleanup "cleanup"
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 cleanup()
diff --git a/tests/btrfs/221 b/tests/btrfs/221
index be5d7be3..b1ff34f4 100755
--- a/tests/btrfs/221
+++ b/tests/btrfs/221
@@ -23,7 +23,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_fssum
diff --git a/tests/btrfs/222 b/tests/btrfs/222
index e7321011..36684eb3 100755
--- a/tests/btrfs/222
+++ b/tests/btrfs/222
@@ -22,7 +22,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_fssum
diff --git a/tests/btrfs/223 b/tests/btrfs/223
index e69ed706..f6c0daa6 100755
--- a/tests/btrfs/223
+++ b/tests/btrfs/223
@@ -14,7 +14,6 @@ _begin_fstest auto quick replace trim
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch_dev_pool 3
 _require_command "$WIPEFS_PROG" wipefs
 
diff --git a/tests/btrfs/224 b/tests/btrfs/224
index 28b39121..02ef80e4 100755
--- a/tests/btrfs/224
+++ b/tests/btrfs/224
@@ -12,7 +12,6 @@ _begin_fstest auto quick qgroup
 . ./common/filter
 . ./common/reflink
 
-_supported_fs btrfs
 
 _require_scratch
 _require_btrfs_qgroup_report
diff --git a/tests/btrfs/225 b/tests/btrfs/225
index d6b1cbc1..9e254935 100755
--- a/tests/btrfs/225
+++ b/tests/btrfs/225
@@ -23,7 +23,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _fixed_by_kernel_commit b5ddcffa3777 \
 	"btrfs: fix put of uninitialized kobject after seed device delete"
 _require_test
diff --git a/tests/btrfs/226 b/tests/btrfs/226
index dd6743d6..70275d0a 100755
--- a/tests/btrfs/226
+++ b/tests/btrfs/226
@@ -13,7 +13,6 @@ _begin_fstest auto quick rw snapshot clone prealloc punch
 . ./common/filter
 . ./common/reflink
 
-_supported_fs btrfs
 _require_scratch_reflink
 _require_chattr C
 _require_odirect
diff --git a/tests/btrfs/227 b/tests/btrfs/227
index 4663874c..a73b125e 100755
--- a/tests/btrfs/227
+++ b/tests/btrfs/227
@@ -22,7 +22,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_fssum
diff --git a/tests/btrfs/228 b/tests/btrfs/228
index c7eeade1..9caa6a33 100755
--- a/tests/btrfs/228
+++ b/tests/btrfs/228
@@ -11,7 +11,6 @@ _begin_fstest auto quick volume
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_btrfs_command inspect-internal dump-tree
 
diff --git a/tests/btrfs/229 b/tests/btrfs/229
index 54ed74a1..b263aa1f 100755
--- a/tests/btrfs/229
+++ b/tests/btrfs/229
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-_supported_fs btrfs
 _require_test
 _require_scratch_reflink
 
diff --git a/tests/btrfs/230 b/tests/btrfs/230
index 4cef062b..79511661 100755
--- a/tests/btrfs/230
+++ b/tests/btrfs/230
@@ -12,7 +12,6 @@ _begin_fstest auto quick qgroup limit
 
 . ./common/filter
 
-_supported_fs btrfs
 
 # This test requires specific data space usage, skip if we have compression
 # enabled.
diff --git a/tests/btrfs/231 b/tests/btrfs/231
index 69801295..d9d01150 100755
--- a/tests/btrfs/231
+++ b/tests/btrfs/231
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-_supported_fs btrfs
 _require_scratch
 _require_btrfs_fs_feature "no_holes"
 _require_btrfs_mkfs_feature "no-holes"
diff --git a/tests/btrfs/232 b/tests/btrfs/232
index 9caeee4c..4dcc39cc 100755
--- a/tests/btrfs/232
+++ b/tests/btrfs/232
@@ -28,7 +28,6 @@ writer()
 	done
 }
 
-_supported_fs btrfs
 
 # This test requires specific data space usage, skip if we have compression
 # enabled.
diff --git a/tests/btrfs/233 b/tests/btrfs/233
index 1a7ea6ad..6c7cdc9a 100755
--- a/tests/btrfs/233
+++ b/tests/btrfs/233
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter.btrfs
 . ./common/dmflakey
 
-_supported_fs btrfs
 _require_scratch
 _require_dm_target flakey
 _require_btrfs_command inspect-internal dump-tree
diff --git a/tests/btrfs/234 b/tests/btrfs/234
index eccfc5ca..512a8cb5 100755
--- a/tests/btrfs/234
+++ b/tests/btrfs/234
@@ -13,7 +13,6 @@ _begin_fstest auto quick compress rw
 . ./common/filter
 . ./common/attr
 
-_supported_fs btrfs
 _require_scratch
 _require_odirect
 _require_btrfs_no_nodatacow
diff --git a/tests/btrfs/235 b/tests/btrfs/235
index a1ec3aad..dae5c7c1 100755
--- a/tests/btrfs/235
+++ b/tests/btrfs/235
@@ -21,7 +21,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_command "$SETCAP_PROG" setcap
diff --git a/tests/btrfs/236 b/tests/btrfs/236
index ed3bddb8..a3b58f0c 100755
--- a/tests/btrfs/236
+++ b/tests/btrfs/236
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-_supported_fs btrfs
 _require_scratch
 _require_dm_target flakey
 
diff --git a/tests/btrfs/237 b/tests/btrfs/237
index 33b2f262..2839f6e4 100755
--- a/tests/btrfs/237
+++ b/tests/btrfs/237
@@ -14,7 +14,6 @@ _begin_fstest auto quick zone balance
 
 . ./common/zoned
 
-_supported_fs btrfs
 _require_scratch
 _require_btrfs_command inspect-internal dump-tree
 _require_btrfs_command filesystem sync
diff --git a/tests/btrfs/238 b/tests/btrfs/238
index b85eb340..bbdce6a5 100755
--- a/tests/btrfs/238
+++ b/tests/btrfs/238
@@ -11,7 +11,6 @@ _begin_fstest auto quick seed trim
 
 . ./common/filter
 
-_supported_fs btrfs
 _fixed_by_kernel_commit 5e753a817b2d \
 	"btrfs: fix unmountable seed device after fstrim"
 _require_command "$BTRFS_TUNE_PROG" btrfstune
diff --git a/tests/btrfs/239 b/tests/btrfs/239
index 41fe438e..3ac49027 100755
--- a/tests/btrfs/239
+++ b/tests/btrfs/239
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-_supported_fs btrfs
 _require_scratch
 _require_dm_target flakey
 
diff --git a/tests/btrfs/240 b/tests/btrfs/240
index f0fcf8a4..6ad7adc1 100755
--- a/tests/btrfs/240
+++ b/tests/btrfs/240
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-_supported_fs btrfs
 _require_scratch
 _require_dm_target flakey
 _require_xfs_io_command "falloc"
diff --git a/tests/btrfs/241 b/tests/btrfs/241
index 32f0e109..a4d2471d 100755
--- a/tests/btrfs/241
+++ b/tests/btrfs/241
@@ -23,7 +23,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_fssum
diff --git a/tests/btrfs/242 b/tests/btrfs/242
index 8daf0f2e..daa2d972 100755
--- a/tests/btrfs/242
+++ b/tests/btrfs/242
@@ -13,7 +13,6 @@ _begin_fstest auto quick volume trim
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_btrfs_forget_or_module_loadable
 _require_scratch_dev_pool 2
 
diff --git a/tests/btrfs/243 b/tests/btrfs/243
index 1ad0fa58..6e0649fb 100755
--- a/tests/btrfs/243
+++ b/tests/btrfs/243
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-_supported_fs btrfs
 _require_scratch
 _require_dm_target flakey
 
diff --git a/tests/btrfs/244 b/tests/btrfs/244
index 4c5d69e7..a806685d 100755
--- a/tests/btrfs/244
+++ b/tests/btrfs/244
@@ -17,7 +17,6 @@ _begin_fstest auto quick volume dangerous
 # 	rm -r -f $tmp.*
 # }
 
-_supported_fs btrfs
 _require_scratch
 
 _scratch_mkfs >> $seqres.full 2>&1
diff --git a/tests/btrfs/245 b/tests/btrfs/245
index c580b1fa..4d6bc5e0 100755
--- a/tests/btrfs/245
+++ b/tests/btrfs/245
@@ -12,7 +12,6 @@ _begin_fstest auto quick idmapped subvol
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_idmapped_mounts
 _require_test
 _require_scratch
diff --git a/tests/btrfs/246 b/tests/btrfs/246
index 3617d7fc..ce58a15a 100755
--- a/tests/btrfs/246
+++ b/tests/btrfs/246
@@ -18,7 +18,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 # If it's subpage case, we don't support inline extents creation for now.
diff --git a/tests/btrfs/247 b/tests/btrfs/247
index 341496e4..402f0400 100755
--- a/tests/btrfs/247
+++ b/tests/btrfs/247
@@ -14,7 +14,6 @@ _begin_fstest auto quick rename subvol
 
  . ./common/renameat2
 
-_supported_fs btrfs
 _require_renameat2 exchange
 _require_scratch
 
diff --git a/tests/btrfs/248 b/tests/btrfs/248
index 8e6d9211..134de9ed 100755
--- a/tests/btrfs/248
+++ b/tests/btrfs/248
@@ -14,7 +14,6 @@
 . ./common/preamble
 _begin_fstest auto quick seed volume
 
-_supported_fs btrfs
 _require_test
 _require_scratch_dev_pool 2
 _require_btrfs_forget_or_module_loadable
diff --git a/tests/btrfs/249 b/tests/btrfs/249
index c7f93ed4..641a3c87 100755
--- a/tests/btrfs/249
+++ b/tests/btrfs/249
@@ -16,7 +16,6 @@
 . ./common/preamble
 _begin_fstest auto quick seed volume
 
-_supported_fs btrfs
 _require_scratch_dev_pool 3
 _require_command "$WIPEFS_PROG" wipefs
 _require_btrfs_forget_or_module_loadable
diff --git a/tests/btrfs/250 b/tests/btrfs/250
index 495a3232..c2205c08 100755
--- a/tests/btrfs/250
+++ b/tests/btrfs/250
@@ -22,7 +22,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_chattr C
 _require_odirect
diff --git a/tests/btrfs/251 b/tests/btrfs/251
index 944f0a19..2c4a823d 100755
--- a/tests/btrfs/251
+++ b/tests/btrfs/251
@@ -12,7 +12,6 @@ _begin_fstest auto quick compress dangerous
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 pagesize=$(_get_page_size)
diff --git a/tests/btrfs/252 b/tests/btrfs/252
index defca229..2da02ffa 100755
--- a/tests/btrfs/252
+++ b/tests/btrfs/252
@@ -35,7 +35,6 @@ _cleanup()
 . ./common/filter
 
 
-_supported_fs btrfs
 # The size needed is variable as it depends on the specific randomized
 # operations from fsstress and on the value of $LOAD_FACTOR. But require
 # at least $LOAD_FACTOR * 6G, as we do the receive operations to the same
diff --git a/tests/btrfs/253 b/tests/btrfs/253
index 5fbce070..adbc6bfb 100755
--- a/tests/btrfs/253
+++ b/tests/btrfs/253
@@ -78,7 +78,6 @@ alloc_size() {
 }
 
 . ./common/filter
-_supported_fs btrfs
 _require_test
 _require_scratch
 # The chunk size on zoned mode is fixed to the zone size
diff --git a/tests/btrfs/254 b/tests/btrfs/254
index c789d874..d9c9eea9 100755
--- a/tests/btrfs/254
+++ b/tests/btrfs/254
@@ -28,7 +28,6 @@ _cleanup()
 . ./common/filter
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_scratch_dev_pool 3
 _require_block_device $SCRATCH_DEV
 _require_dm_target linear
diff --git a/tests/btrfs/255 b/tests/btrfs/255
index ee52873f..14c12904 100755
--- a/tests/btrfs/255
+++ b/tests/btrfs/255
@@ -12,7 +12,6 @@
 . ./common/preamble
 _begin_fstest auto qgroup balance
 
-_supported_fs btrfs
 _require_scratch
 
 _scratch_mkfs >> $seqres.full 2>&1
diff --git a/tests/btrfs/256 b/tests/btrfs/256
index 211a0962..78105476 100755
--- a/tests/btrfs/256
+++ b/tests/btrfs/256
@@ -22,7 +22,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_fssum
 
diff --git a/tests/btrfs/257 b/tests/btrfs/257
index 7b4c043f..ad6f3572 100755
--- a/tests/btrfs/257
+++ b/tests/btrfs/257
@@ -20,7 +20,6 @@ _begin_fstest auto quick defrag prealloc fiemap
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 
 # We rely on specific extent layout, don't run on compress
diff --git a/tests/btrfs/258 b/tests/btrfs/258
index 7373a561..5498d6ac 100755
--- a/tests/btrfs/258
+++ b/tests/btrfs/258
@@ -12,7 +12,6 @@ _begin_fstest auto defrag quick fiemap remount
 
 . ./common/filter
 
-_supported_fs generic
 _require_scratch
 _require_xfs_io_command "fiemap"
 
diff --git a/tests/btrfs/259 b/tests/btrfs/259
index 5b0bf7e0..41c16e7a 100755
--- a/tests/btrfs/259
+++ b/tests/btrfs/259
@@ -12,7 +12,6 @@ _begin_fstest auto quick defrag fiemap compress
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_xfs_io_command "fiemap"
 
diff --git a/tests/btrfs/260 b/tests/btrfs/260
index b16e8378..ce949b11 100755
--- a/tests/btrfs/260
+++ b/tests/btrfs/260
@@ -19,7 +19,6 @@ _begin_fstest auto quick defrag compress prealloc fiemap
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_xfs_io_command "fiemap" "ranged"
 _require_xfs_io_command "falloc"
diff --git a/tests/btrfs/261 b/tests/btrfs/261
index 58fa8e75..4052baae 100755
--- a/tests/btrfs/261
+++ b/tests/btrfs/261
@@ -10,7 +10,6 @@
 . ./common/preamble
 _begin_fstest auto volume raid scrub
 
-_supported_fs btrfs
 _require_scratch_dev_pool 4
 _btrfs_get_profile_configs replace-missing
 _require_fssum
diff --git a/tests/btrfs/262 b/tests/btrfs/262
index f50e5d23..b5f199af 100755
--- a/tests/btrfs/262
+++ b/tests/btrfs/262
@@ -13,7 +13,6 @@ _begin_fstest auto quick qgroup
 
 . ./common/filter
 
-_supported_fs btrfs
 
 _require_scratch
 
diff --git a/tests/btrfs/263 b/tests/btrfs/263
index 919724f5..9d18b005 100755
--- a/tests/btrfs/263
+++ b/tests/btrfs/263
@@ -12,7 +12,6 @@ _begin_fstest auto quick defrag fiemap remount
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_xfs_io_command "fiemap" "ranged"
 
diff --git a/tests/btrfs/264 b/tests/btrfs/264
index da1057bb..e87a063d 100755
--- a/tests/btrfs/264
+++ b/tests/btrfs/264
@@ -21,7 +21,6 @@ _begin_fstest auto quick compress attr
 . ./common/filter
 . ./common/attr
 
-_supported_fs btrfs
 _require_scratch
 _require_attrs
 _require_chattr C
diff --git a/tests/btrfs/265 b/tests/btrfs/265
index 0e72f8f2..0fa55a7f 100755
--- a/tests/btrfs/265
+++ b/tests/btrfs/265
@@ -13,7 +13,6 @@ _begin_fstest auto quick read_repair
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch_dev_pool 3
 
 # No data checksums for NOCOW case, so can't detect corruption and repair data.
diff --git a/tests/btrfs/266 b/tests/btrfs/266
index 7a10b92f..0788ba94 100755
--- a/tests/btrfs/266
+++ b/tests/btrfs/266
@@ -14,7 +14,6 @@ _begin_fstest auto quick read_repair
 
 . ./common/filter
 
-_supported_fs btrfs
 # No data checksums for NOCOW case, so can't detect corruption and repair data.
 _require_btrfs_no_nodatacow
 _require_scratch_dev_pool 3
diff --git a/tests/btrfs/267 b/tests/btrfs/267
index e15a4623..151ccdae 100755
--- a/tests/btrfs/267
+++ b/tests/btrfs/267
@@ -14,7 +14,6 @@ _begin_fstest auto quick read_repair
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch_dev_pool 3
 
 # No data checksums for NOCOW case, so can't detect corruption and repair data.
diff --git a/tests/btrfs/268 b/tests/btrfs/268
index d122ee36..dce5cb95 100755
--- a/tests/btrfs/268
+++ b/tests/btrfs/268
@@ -13,7 +13,6 @@ _begin_fstest auto quick read_repair
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_odirect
 # No data checksums for NOCOW case, so can't detect corruption and repair data.
diff --git a/tests/btrfs/269 b/tests/btrfs/269
index 7ffad125..129a4a41 100755
--- a/tests/btrfs/269
+++ b/tests/btrfs/269
@@ -17,7 +17,6 @@ _begin_fstest auto quick read_repair
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_odirect
 # No data checksums for NOCOW case, so can't detect corruption and repair data.
diff --git a/tests/btrfs/270 b/tests/btrfs/270
index 221ef7d2..c8651fa1 100755
--- a/tests/btrfs/270
+++ b/tests/btrfs/270
@@ -11,7 +11,6 @@ _begin_fstest auto quick read_repair compress
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_btrfs_command inspect-internal dump-tree
 _require_non_zoned_device "${SCRATCH_DEV}" # no overwrites on zoned devices
diff --git a/tests/btrfs/271 b/tests/btrfs/271
index a342af3a..2fc38e9c 100755
--- a/tests/btrfs/271
+++ b/tests/btrfs/271
@@ -12,7 +12,6 @@ _begin_fstest auto quick raid
 . ./common/filter
 . ./common/fail_make_request
 
-_supported_fs btrfs
 _require_scratch
 _require_fail_make_request
 _require_scratch_dev_pool 2
diff --git a/tests/btrfs/272 b/tests/btrfs/272
index 4f799367..e0f61379 100755
--- a/tests/btrfs/272
+++ b/tests/btrfs/272
@@ -15,7 +15,6 @@
 . ./common/preamble
 _begin_fstest auto quick send
 
-_supported_fs btrfs
 _fixed_by_kernel_commit 3aa5bd367fa5a3 \
 	"btrfs: send: fix sending link commands for existing file paths"
 _require_test
diff --git a/tests/btrfs/273 b/tests/btrfs/273
index d3ac5adb..06ae5d53 100755
--- a/tests/btrfs/273
+++ b/tests/btrfs/273
@@ -23,7 +23,6 @@ _cleanup()
 
 . ./common/zoned
 
-_supported_fs btrfs
 _fixed_by_kernel_commit 2ce543f47843 \
 	"btrfs: zoned: wait until zone is finished when allocation didn't progress"
 # which is further fixed by
diff --git a/tests/btrfs/274 b/tests/btrfs/274
index ec7d6626..9a7abc74 100755
--- a/tests/btrfs/274
+++ b/tests/btrfs/274
@@ -18,7 +18,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs btrfs
 _fixed_by_kernel_commit 60021bd754c6ca \
     "btrfs: prevent subvol with swapfile from being deleted"
 _require_scratch_swapfile
diff --git a/tests/btrfs/275 b/tests/btrfs/275
index 955a0c98..9966340b 100755
--- a/tests/btrfs/275
+++ b/tests/btrfs/275
@@ -12,7 +12,6 @@ _begin_fstest auto quick attr
 . ./common/filter
 . ./common/attr
 
-_supported_fs btrfs
 _fixed_by_kernel_commit b51111271b03 \
 	"btrfs: check if root is readonly while setting security xattr"
 _require_attrs
diff --git a/tests/btrfs/276 b/tests/btrfs/276
index 70dadd93..1c81f47e 100755
--- a/tests/btrfs/276
+++ b/tests/btrfs/276
@@ -15,7 +15,6 @@ _begin_fstest auto snapshot fiemap remount
 . ./common/filter.btrfs
 . ./common/attr
 
-_supported_fs btrfs
 _require_scratch
 _require_xfs_io_command "fiemap" "ranged"
 _require_attrs
diff --git a/tests/btrfs/277 b/tests/btrfs/277
index 9770e1c1..4c87be1e 100755
--- a/tests/btrfs/277
+++ b/tests/btrfs/277
@@ -20,7 +20,6 @@ _cleanup()
 . ./common/filter
 . ./common/verity
 
-_supported_fs btrfs
 _require_scratch_verity
 _require_fsverity_builtin_signatures
 _require_command "$SETCAP_PROG" setcap
diff --git a/tests/btrfs/278 b/tests/btrfs/278
index a8b110bc..44b19439 100755
--- a/tests/btrfs/278
+++ b/tests/btrfs/278
@@ -15,7 +15,6 @@
 . ./common/preamble
 _begin_fstest auto quick send
 
-_supported_fs btrfs
 _fixed_by_kernel_commit 9ed0a72e5b355d \
 	"btrfs: send: fix failures when processing inodes with no links"
 _require_test
diff --git a/tests/btrfs/279 b/tests/btrfs/279
index 5b5824fd..97e29eba 100755
--- a/tests/btrfs/279
+++ b/tests/btrfs/279
@@ -18,7 +18,6 @@ _begin_fstest auto quick subvol fiemap clone
 . ./common/reflink
 . ./common/punch # for _filter_fiemap_flags
 
-_supported_fs btrfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fiemap"
diff --git a/tests/btrfs/280 b/tests/btrfs/280
index 0f7f8a37..f4d6f47e 100755
--- a/tests/btrfs/280
+++ b/tests/btrfs/280
@@ -18,7 +18,6 @@ _begin_fstest auto quick compress snapshot fiemap defrag
 . ./common/filter
 . ./common/punch # for _filter_fiemap_flags
 
-_supported_fs btrfs
 _require_scratch
 _require_xfs_io_command "fiemap"
 
diff --git a/tests/btrfs/281 b/tests/btrfs/281
index 290ccaca..855dd824 100755
--- a/tests/btrfs/281
+++ b/tests/btrfs/281
@@ -19,7 +19,6 @@ _begin_fstest auto quick send compress clone fiemap
 . ./common/reflink
 . ./common/punch # for _filter_fiemap_flags
 
-_supported_fs btrfs
 _require_test
 _require_scratch_reflink
 _require_btrfs_send_version 2
diff --git a/tests/btrfs/282 b/tests/btrfs/282
index 2c6fc5fc..3b4ad9ea 100755
--- a/tests/btrfs/282
+++ b/tests/btrfs/282
@@ -11,7 +11,6 @@ _begin_fstest auto scrub
 
 . ./common/filter
 
-_supported_fs btrfs
 _wants_kernel_commit eb3b50536642 \
 	"btrfs: scrub: per-device bandwidth control"
 
diff --git a/tests/btrfs/283 b/tests/btrfs/283
index 8fa282ee..f7a8290a 100755
--- a/tests/btrfs/283
+++ b/tests/btrfs/283
@@ -15,7 +15,6 @@ _begin_fstest auto quick send clone fiemap
 . ./common/reflink
 . ./common/punch # for _filter_fiemap_flags
 
-_supported_fs btrfs
 _require_test
 _require_scratch_reflink
 _require_cp_reflink
diff --git a/tests/btrfs/284 b/tests/btrfs/284
index 8c0f6795..19ffbbe6 100755
--- a/tests/btrfs/284
+++ b/tests/btrfs/284
@@ -10,7 +10,6 @@
 . ./common/preamble
 _begin_fstest auto quick send compress snapshot
 
-_supported_fs btrfs
 _require_btrfs_send_version 2
 _require_test
 # The size needed is variable as it depends on the specific randomized
diff --git a/tests/btrfs/285 b/tests/btrfs/285
index 56cdad51..5ceb69d4 100755
--- a/tests/btrfs/285
+++ b/tests/btrfs/285
@@ -14,7 +14,6 @@ sysfs_size_classes() {
 	cat "/sys/fs/btrfs/$uuid/allocation/data/size_classes"
 }
 
-_supported_fs btrfs
 _require_scratch
 _require_btrfs_fs_sysfs
 _require_fs_sysfs allocation/data/size_classes
diff --git a/tests/btrfs/286 b/tests/btrfs/286
index 3429a611..b8fa2767 100755
--- a/tests/btrfs/286
+++ b/tests/btrfs/286
@@ -12,7 +12,6 @@ _begin_fstest auto replace
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_command "$WIPEFS_PROG" wipefs
 _btrfs_get_profile_configs replace-missing
 _require_fssum
diff --git a/tests/btrfs/287 b/tests/btrfs/287
index 24d8e66a..d6c04ea8 100755
--- a/tests/btrfs/287
+++ b/tests/btrfs/287
@@ -12,7 +12,6 @@ _begin_fstest auto quick snapshot clone punch logical_resolve
 . ./common/filter.btrfs
 . ./common/reflink
 
-_supported_fs btrfs
 _require_btrfs_scratch_logical_resolve_v2
 _require_scratch_reflink
 _require_xfs_io_command "fpunch"
diff --git a/tests/btrfs/288 b/tests/btrfs/288
index 839ecc33..c0328a05 100755
--- a/tests/btrfs/288
+++ b/tests/btrfs/288
@@ -11,7 +11,6 @@ _begin_fstest auto repair quick volume scrub
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch_dev_pool 2
 
 _require_odirect
diff --git a/tests/btrfs/289 b/tests/btrfs/289
index 148bf56a..86e91021 100755
--- a/tests/btrfs/289
+++ b/tests/btrfs/289
@@ -11,7 +11,6 @@ _begin_fstest auto quick scrub repair
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 # No data checksums for NOCOW case, so can't detect corruption and repair data.
 _require_btrfs_no_nodatacow
diff --git a/tests/btrfs/290 b/tests/btrfs/290
index 9ed54662..1a5e267b 100755
--- a/tests/btrfs/290
+++ b/tests/btrfs/290
@@ -22,7 +22,6 @@ _cleanup()
 	rm -f $tmp.*
 }
 
-_supported_fs btrfs
 _require_scratch_verity
 _require_scratch_nocheck
 _require_odirect
diff --git a/tests/btrfs/291 b/tests/btrfs/291
index fc654565..c31de3a9 100755
--- a/tests/btrfs/291
+++ b/tests/btrfs/291
@@ -31,7 +31,6 @@ _cleanup()
 . ./common/dmlogwrites
 . ./common/verity
 
-_supported_fs btrfs
 
 _require_scratch
 _require_test
diff --git a/tests/btrfs/292 b/tests/btrfs/292
index f920d961..a09bc516 100755
--- a/tests/btrfs/292
+++ b/tests/btrfs/292
@@ -13,7 +13,6 @@ _begin_fstest auto raid volume trim
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch_dev_pool 6
 _require_fstrim
 _fixed_by_kernel_commit a7299a18a179 \
diff --git a/tests/btrfs/293 b/tests/btrfs/293
index 09139f19..61db0bee 100755
--- a/tests/btrfs/293
+++ b/tests/btrfs/293
@@ -20,7 +20,6 @@ _cleanup()
 
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _fixed_by_kernel_commit deccae40e4b3 \
 	"btrfs: can_nocow_file_extent should pass down args->strict from callers"
 _require_scratch_swapfile
diff --git a/tests/btrfs/294 b/tests/btrfs/294
index 9d6f7566..6a3caa24 100755
--- a/tests/btrfs/294
+++ b/tests/btrfs/294
@@ -11,7 +11,6 @@ _begin_fstest auto raid volume
 
 . ./common/filter
 
-_supported_fs btrfs
 
 # No zoned support for RAID56 yet.
 _require_non_zoned_device "${SCRATCH_DEV}"
diff --git a/tests/btrfs/295 b/tests/btrfs/295
index 00a5c568..1cd1ba91 100755
--- a/tests/btrfs/295
+++ b/tests/btrfs/295
@@ -10,7 +10,6 @@
 _begin_fstest auto quick dangerous
 
 . ./common/filter
-_supported_fs btrfs
 _require_scratch
 # Directly writing to the device, which may not work with a zoned device
 _require_non_zoned_device "$SCRATCH_DEV"
diff --git a/tests/btrfs/296 b/tests/btrfs/296
index d4446198..f4f7cec6 100755
--- a/tests/btrfs/296
+++ b/tests/btrfs/296
@@ -10,7 +10,6 @@
 . ./common/preamble
 _begin_fstest auto quick balance
 
-_supported_fs btrfs
 _require_scratch_dev_pool 3
 _fixed_by_kernel_commit b7625f461da6 \
 	"btrfs: sysfs: update fs features directory asynchronously"
diff --git a/tests/btrfs/297 b/tests/btrfs/297
index 7afe854d..eb4f365e 100755
--- a/tests/btrfs/297
+++ b/tests/btrfs/297
@@ -11,7 +11,6 @@ _begin_fstest auto quick raid scrub
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_odirect
 _require_non_zoned_device "${SCRATCH_DEV}"
 _require_scratch_dev_pool 3
diff --git a/tests/btrfs/298 b/tests/btrfs/298
index 0cea81d0..d4aee55e 100755
--- a/tests/btrfs/298
+++ b/tests/btrfs/298
@@ -10,7 +10,6 @@
 . ./common/preamble
 _begin_fstest auto quick seed
 
-_supported_fs btrfs
 _require_command "$BTRFS_TUNE_PROG" btrfstune
 _require_command "$WIPEFS_PROG" wipefs
 _require_scratch_dev_pool 2
diff --git a/tests/btrfs/299 b/tests/btrfs/299
index fe80771a..07f40f0b 100755
--- a/tests/btrfs/299
+++ b/tests/btrfs/299
@@ -17,7 +17,6 @@
 . ./common/preamble
 _begin_fstest auto quick preallocrw logical_resolve
 
-_supported_fs btrfs
 _require_scratch
 _require_xfs_io_command "falloc" "-k"
 _require_btrfs_command inspect-internal logical-resolve
diff --git a/tests/btrfs/300 b/tests/btrfs/300
index 4ea22a01..7fcb444a 100755
--- a/tests/btrfs/300
+++ b/tests/btrfs/300
@@ -12,7 +12,6 @@
 _begin_fstest auto quick subvol snapshot
 _register_cleanup "cleanup"
 
-_supported_fs btrfs
 _fixed_by_kernel_commit 94628ad94408 \
 	"btrfs: copy dir permission and time when creating a stub subvolume"
 
diff --git a/tests/btrfs/301 b/tests/btrfs/301
index 62854a50..6b59749d 100755
--- a/tests/btrfs/301
+++ b/tests/btrfs/301
@@ -12,7 +12,6 @@ _begin_fstest auto quick qgroup clone subvol prealloc snapshot remount
 
 . ./common/reflink
 
-_supported_fs btrfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_btrfs_command inspect-internal dump-tree
diff --git a/tests/btrfs/302 b/tests/btrfs/302
index 3b52892d..f41505ac 100755
--- a/tests/btrfs/302
+++ b/tests/btrfs/302
@@ -17,7 +17,6 @@ _begin_fstest auto quick snapshot subvol
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_fssum
 
diff --git a/tests/btrfs/303 b/tests/btrfs/303
index ed3abcc1..501a0b49 100755
--- a/tests/btrfs/303
+++ b/tests/btrfs/303
@@ -20,7 +20,6 @@ _cleanup()
 . ./common/filter
 . ./common/punch  # for _filter_fiemap
 
-_supported_fs btrfs
 _require_test
 _require_scratch
 _require_xfs_io_command "fiemap"
diff --git a/tests/btrfs/304 b/tests/btrfs/304
index 1ecc528d..b7ed66af 100755
--- a/tests/btrfs/304
+++ b/tests/btrfs/304
@@ -13,7 +13,6 @@ _begin_fstest auto quick raid remount volume raid-stripe-tree
 . ./common/filter
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_btrfs_command inspect-internal dump-tree
 _require_btrfs_mkfs_feature "raid-stripe-tree"
 _require_scratch_dev_pool 4
diff --git a/tests/btrfs/305 b/tests/btrfs/305
index 1c092482..ad060853 100755
--- a/tests/btrfs/305
+++ b/tests/btrfs/305
@@ -14,7 +14,6 @@ _begin_fstest auto quick raid remount volume raid-stripe-tree
 . ./common/filter
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_btrfs_command inspect-internal dump-tree
 _require_btrfs_mkfs_feature "raid-stripe-tree"
 _require_scratch_dev_pool 4
diff --git a/tests/btrfs/306 b/tests/btrfs/306
index 6e384318..b47c446b 100755
--- a/tests/btrfs/306
+++ b/tests/btrfs/306
@@ -14,7 +14,6 @@ _begin_fstest auto quick raid remount volume raid-stripe-tree
 . ./common/filter
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_btrfs_command inspect-internal dump-tree
 _require_btrfs_mkfs_feature "raid-stripe-tree"
 _require_scratch_dev_pool 4
diff --git a/tests/btrfs/307 b/tests/btrfs/307
index d9c39b92..02a9d4d3 100755
--- a/tests/btrfs/307
+++ b/tests/btrfs/307
@@ -13,7 +13,6 @@ _begin_fstest auto quick raid remount volume raid-stripe-tree
 . ./common/filter
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_btrfs_command inspect-internal dump-tree
 _require_btrfs_mkfs_feature "raid-stripe-tree"
 _require_scratch_dev_pool 4
diff --git a/tests/btrfs/308 b/tests/btrfs/308
index ee9f15f0..3c8d410a 100755
--- a/tests/btrfs/308
+++ b/tests/btrfs/308
@@ -14,7 +14,6 @@ _begin_fstest auto quick raid remount volume raid-stripe-tree
 . ./common/filter
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_btrfs_command inspect-internal dump-tree
 _require_btrfs_mkfs_feature "raid-stripe-tree"
 _require_scratch_dev_pool 4
diff --git a/tests/btrfs/309 b/tests/btrfs/309
index d1eb953f..e803a59d 100755
--- a/tests/btrfs/309
+++ b/tests/btrfs/309
@@ -9,7 +9,6 @@
 . ./common/preamble
 _begin_fstest auto quick snapshot subvol
 
-_supported_fs btrfs
 _require_scratch
 _require_test_program t_snapshot_deleted_subvolume
 _fixed_by_kernel_commit 7081929ab257 \
diff --git a/tests/btrfs/310 b/tests/btrfs/310
index c83b6c29..2912b83c 100755
--- a/tests/btrfs/310
+++ b/tests/btrfs/310
@@ -9,7 +9,6 @@
 . ./common/preamble
 _begin_fstest auto quick compress
 
-_supported_fs btrfs
 _require_scratch
 
 # This test require inlined compressed extents creation, and all the writes
diff --git a/tests/btrfs/311 b/tests/btrfs/311
index 98993965..51147c59 100755
--- a/tests/btrfs/311
+++ b/tests/btrfs/311
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/filter.btrfs
 . ./common/reflink
 
-_supported_fs btrfs
 _require_cp_reflink
 _require_scratch
 _require_btrfs_fs_feature temp_fsid
diff --git a/tests/btrfs/313 b/tests/btrfs/313
index 5b8062f4..5a9e98de 100755
--- a/tests/btrfs/313
+++ b/tests/btrfs/313
@@ -20,7 +20,6 @@ _cleanup()
 . ./common/filter.btrfs
 . ./common/reflink
 
-_supported_fs btrfs
 _require_cp_reflink
 _require_scratch_dev_pool 2
 _require_btrfs_fs_feature temp_fsid
diff --git a/tests/btrfs/314 b/tests/btrfs/314
index da594d39..76dccc41 100755
--- a/tests/btrfs/314
+++ b/tests/btrfs/314
@@ -21,7 +21,6 @@ _cleanup()
 
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_scratch_dev_pool 2
 _require_btrfs_fs_feature temp_fsid
 
diff --git a/tests/btrfs/315 b/tests/btrfs/315
index 7e5c74df..5852afad 100755
--- a/tests/btrfs/315
+++ b/tests/btrfs/315
@@ -20,7 +20,6 @@ _cleanup()
 
 . ./common/filter.btrfs
 
-_supported_fs btrfs
 _require_scratch_dev_pool 3
 _require_btrfs_fs_feature temp_fsid
 
diff --git a/tests/btrfs/316 b/tests/btrfs/316
index 63e9a7d9..80eaacca 100755
--- a/tests/btrfs/316
+++ b/tests/btrfs/316
@@ -14,7 +14,6 @@
 . ./common/preamble
 _begin_fstest auto quick qgroup
 
-_supported_fs btrfs
 _require_scratch
 _require_qgroup_rescan
 
diff --git a/tests/btrfs/317 b/tests/btrfs/317
index b17ba584..f55e444b 100755
--- a/tests/btrfs/317
+++ b/tests/btrfs/317
@@ -15,7 +15,6 @@ _fixed_by_kernel_commit 5906333cc4af \
 
 . common/filter.btrfs
 
-_supported_fs btrfs
 _require_scratch_dev_pool 4
 _require_zoned_device "$SCRATCH_DEV"
 
diff --git a/tests/btrfs/318 b/tests/btrfs/318
index 1eb72625..79977276 100755
--- a/tests/btrfs/318
+++ b/tests/btrfs/318
@@ -15,8 +15,6 @@ _begin_fstest auto quick volume scrub tempfsid
 _fixed_by_kernel_commit 9f7eb8405dcb \
 	"btrfs: validate device maj:min during open"
 
-# real QA test starts here
-_supported_fs btrfs
 _require_test
 _require_command "$PARTED_PROG" parted
 _require_batched_discard "$TEST_DIR"
diff --git a/tests/btrfs/320 b/tests/btrfs/320
index afed43b5..15549165 100755
--- a/tests/btrfs/320
+++ b/tests/btrfs/320
@@ -12,7 +12,6 @@ _begin_fstest auto qgroup limit
 
 . ./common/filter
 
-_supported_fs btrfs
 _require_scratch
 _require_qgroup_rescan
 _require_btrfs_qgroup_report
diff --git a/tests/btrfs/330 b/tests/btrfs/330
index 095f6b36..3545a116 100755
--- a/tests/btrfs/330
+++ b/tests/btrfs/330
@@ -17,8 +17,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter.btrfs
 
-# real QA test starts here
-_supported_fs btrfs
 _require_scratch
 
 $MOUNT_PROG -V | grep -q 'fd-based-mount'
diff --git a/tests/ceph/001 b/tests/ceph/001
index 79a5f58a..0d470624 100755
--- a/tests/ceph/001
+++ b/tests/ceph/001
@@ -18,8 +18,6 @@ _begin_fstest auto quick copy_range
 . common/attr
 . common/reflink
 
-# real QA test starts here
-_supported_fs ceph
 _require_debugfs
 _require_xfs_io_command "copy_range"
 _exclude_test_mount_option "test_dummy_encryption"
diff --git a/tests/ceph/002 b/tests/ceph/002
index 02f66842..20f2e887 100755
--- a/tests/ceph/002
+++ b/tests/ceph/002
@@ -26,8 +26,6 @@ _begin_fstest auto quick copy_range
 . common/filter
 . common/attr
 
-# real QA test starts here
-_supported_fs ceph
 
 _require_xfs_io_command "copy_range"
 _exclude_test_mount_option "test_dummy_encryption"
diff --git a/tests/ceph/003 b/tests/ceph/003
index 2d6cb393..4f11fb84 100755
--- a/tests/ceph/003
+++ b/tests/ceph/003
@@ -14,8 +14,6 @@ _begin_fstest auto quick copy_range
 . common/attr
 . common/reflink
 
-# real QA test starts here
-_supported_fs ceph
 
 _require_xfs_io_command "copy_range"
 _exclude_test_mount_option "test_dummy_encryption"
diff --git a/tests/ceph/004 b/tests/ceph/004
index 124ed1bc..5653586a 100755
--- a/tests/ceph/004
+++ b/tests/ceph/004
@@ -34,9 +34,7 @@ _begin_fstest auto quick quota
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 
-_supported_fs ceph
 _require_attrs
 _require_test
 _require_test_program "rename"
diff --git a/tests/ceph/005 b/tests/ceph/005
index 015f6571..4db2df01 100755
--- a/tests/ceph/005
+++ b/tests/ceph/005
@@ -11,7 +11,6 @@
 . ./common/preamble
 _begin_fstest auto quick quota
 
-_supported_fs ceph
 _require_scratch
 _exclude_test_mount_option "test_dummy_encryption"
 
diff --git a/tests/cifs/001 b/tests/cifs/001
index e20108cb..547315a3 100755
--- a/tests/cifs/001
+++ b/tests/cifs/001
@@ -19,8 +19,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs cifs
 _require_cloner
 _require_test
 
diff --git a/tests/ext4/001 b/tests/ext4/001
index f8650365..4575cf69 100755
--- a/tests/ext4/001
+++ b/tests/ext4/001
@@ -14,7 +14,6 @@ _begin_fstest auto prealloc quick zero fiemap
 . ./common/filter
 . ./common/punch
 
-# real QA test starts here
 _supported_fs ext4
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "fzero"
diff --git a/tests/ext4/002 b/tests/ext4/002
index f09e9c1a..9c6eb5a0 100755
--- a/tests/ext4/002
+++ b/tests/ext4/002
@@ -29,7 +29,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _supported_fs ext4 ext3
 
 _require_scratch_nocheck
diff --git a/tests/ext4/003 b/tests/ext4/003
index a70ad97a..e2b588d8 100755
--- a/tests/ext4/003
+++ b/tests/ext4/003
@@ -20,7 +20,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _supported_fs ext4
 
 _require_scratch
diff --git a/tests/ext4/004 b/tests/ext4/004
index 0c2ad897..20cfdb44 100755
--- a/tests/ext4/004
+++ b/tests/ext4/004
@@ -43,7 +43,6 @@ workout()
 	rm -rf restoresymtable
 }
 
-# real QA test starts here
 _supported_fs ext4
 
 _require_test
diff --git a/tests/ext4/005 b/tests/ext4/005
index 794caa17..a271fbbf 100755
--- a/tests/ext4/005
+++ b/tests/ext4/005
@@ -17,7 +17,6 @@ _begin_fstest auto quick metadata ioctl rw
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _supported_fs ext4
 _require_scratch
 _require_command "$CHATTR_PROG" chattr
diff --git a/tests/ext4/006 b/tests/ext4/006
index b73692aa..d7862073 100755
--- a/tests/ext4/006
+++ b/tests/ext4/006
@@ -28,7 +28,6 @@ if [ ! -x "$(type -P e2fuzz)" ]; then
 	_notrun "Couldn't find e2fuzz"
 fi
 
-# real QA test starts here
 _supported_fs ext4
 
 _require_scratch
diff --git a/tests/ext4/007 b/tests/ext4/007
index 2e8b4d19..deedbd9e 100755
--- a/tests/ext4/007
+++ b/tests/ext4/007
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 _supported_fs ext4
 
 _require_scratch
diff --git a/tests/ext4/008 b/tests/ext4/008
index 9509ed92..b4b20ac1 100755
--- a/tests/ext4/008
+++ b/tests/ext4/008
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 _supported_fs ext4
 
 _require_scratch
diff --git a/tests/ext4/009 b/tests/ext4/009
index 4258c486..06a42fd7 100755
--- a/tests/ext4/009
+++ b/tests/ext4/009
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 _supported_fs ext4
 
 _require_xfs_io_command "falloc"
diff --git a/tests/ext4/010 b/tests/ext4/010
index e2cc5489..1139c79e 100755
--- a/tests/ext4/010
+++ b/tests/ext4/010
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 _supported_fs ext4
 
 _require_scratch
diff --git a/tests/ext4/011 b/tests/ext4/011
index 15703f61..cae4fb6b 100755
--- a/tests/ext4/011
+++ b/tests/ext4/011
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 _supported_fs ext4
 
 _require_scratch
diff --git a/tests/ext4/012 b/tests/ext4/012
index 358874a1..f7f2b0fb 100755
--- a/tests/ext4/012
+++ b/tests/ext4/012
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 _supported_fs ext4
 
 _require_scratch
diff --git a/tests/ext4/013 b/tests/ext4/013
index 1d33e564..7d2a9154 100755
--- a/tests/ext4/013
+++ b/tests/ext4/013
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 _supported_fs ext4
 
 _require_scratch
diff --git a/tests/ext4/014 b/tests/ext4/014
index ad87c781..ffed795a 100755
--- a/tests/ext4/014
+++ b/tests/ext4/014
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 _supported_fs ext4
 
 _require_scratch
diff --git a/tests/ext4/015 b/tests/ext4/015
index 3c07b5e5..81feda5c 100755
--- a/tests/ext4/015
+++ b/tests/ext4/015
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 _supported_fs ext4
 
 _require_xfs_io_command "falloc"
diff --git a/tests/ext4/016 b/tests/ext4/016
index cee7eadf..b7db4cfd 100755
--- a/tests/ext4/016
+++ b/tests/ext4/016
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 _supported_fs ext4
 
 _require_scratch
diff --git a/tests/ext4/017 b/tests/ext4/017
index b07964ec..fc867442 100755
--- a/tests/ext4/017
+++ b/tests/ext4/017
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 _supported_fs ext4
 
 _require_scratch
diff --git a/tests/ext4/018 b/tests/ext4/018
index 92df4cf5..f7377f05 100755
--- a/tests/ext4/018
+++ b/tests/ext4/018
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 _supported_fs ext4
 
 _require_scratch
diff --git a/tests/ext4/019 b/tests/ext4/019
index f0514093..987972a8 100755
--- a/tests/ext4/019
+++ b/tests/ext4/019
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 _supported_fs ext4
 
 _require_scratch
diff --git a/tests/ext4/020 b/tests/ext4/020
index 110a0fd0..a2fb60fa 100755
--- a/tests/ext4/020
+++ b/tests/ext4/020
@@ -17,7 +17,6 @@ _begin_fstest auto quick ioctl rw defrag
 . ./common/filter
 . ./common/defrag
 
-# real QA test starts here
 _supported_fs ext4
 _require_scratch
 _require_defrag
diff --git a/tests/ext4/021 b/tests/ext4/021
index 62768c60..d69dc584 100755
--- a/tests/ext4/021
+++ b/tests/ext4/021
@@ -12,7 +12,6 @@ _begin_fstest auto quick
 
 # Import common functions.
 
-# real QA test starts here
 _supported_fs ext4
 _require_scratch
 _require_dumpe2fs
diff --git a/tests/ext4/022 b/tests/ext4/022
index 96929cb8..6b74ff89 100755
--- a/tests/ext4/022
+++ b/tests/ext4/022
@@ -18,7 +18,6 @@ do_setfattr()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 _supported_fs ext4
 _require_scratch
 _require_dumpe2fs
diff --git a/tests/ext4/023 b/tests/ext4/023
index ebc5ffe3..b5217da3 100755
--- a/tests/ext4/023
+++ b/tests/ext4/023
@@ -18,7 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
 _supported_fs ext4
 _require_scratch
 
diff --git a/tests/ext4/024 b/tests/ext4/024
index 11b335f0..e58cb991 100755
--- a/tests/ext4/024
+++ b/tests/ext4/024
@@ -13,7 +13,6 @@ _begin_fstest auto quick encrypt dangerous
 # get standard environment and checks
 . ./common/encrypt
 
-# real QA test starts here
 _supported_fs ext4
 _require_scratch_encryption
 _require_command "$KEYCTL_PROG" keyctl
diff --git a/tests/ext4/025 b/tests/ext4/025
index 4299e4b2..ce3a3d21 100755
--- a/tests/ext4/025
+++ b/tests/ext4/025
@@ -13,7 +13,6 @@ _begin_fstest auto quick fuzzers dangerous
 # get standard environment and checks
 . ./common/filter
 
-# real QA test starts here
 _supported_fs ext4
 _require_scratch_nocheck
 _require_command "$DEBUGFS_PROG" debugfs
diff --git a/tests/ext4/026 b/tests/ext4/026
index 782fdca6..5bb2add2 100755
--- a/tests/ext4/026
+++ b/tests/ext4/026
@@ -16,7 +16,6 @@ _begin_fstest auto quick attr
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 _supported_fs ext4
 _require_scratch
 _require_attrs
diff --git a/tests/ext4/027 b/tests/ext4/027
index 5bcb2d55..93de00f2 100755
--- a/tests/ext4/027
+++ b/tests/ext4/027
@@ -19,7 +19,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _supported_fs ext4
 _require_scratch
 _require_xfs_io_command "fsmap"
diff --git a/tests/ext4/028 b/tests/ext4/028
index 3e18baf9..30f3c448 100755
--- a/tests/ext4/028
+++ b/tests/ext4/028
@@ -20,7 +20,6 @@ _cleanup()
 . ./common/filter
 . ./common/populate
 
-# real QA test starts here
 _supported_fs ext4
 _require_scratch
 _require_populate_commands
diff --git a/tests/ext4/029 b/tests/ext4/029
index 9d6c4504..8a6969d2 100755
--- a/tests/ext4/029
+++ b/tests/ext4/029
@@ -19,7 +19,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _supported_fs ext4
 _require_logdev
 _require_scratch
diff --git a/tests/ext4/030 b/tests/ext4/030
index 4b51edd2..80f34ccf 100755
--- a/tests/ext4/030
+++ b/tests/ext4/030
@@ -20,7 +20,6 @@ _require_scratch_dax_mountopt "dax"
 _require_test_program "t_ext4_dax_journal_corruption"
 _require_command "$CHATTR_PROG" chattr
 
-# real QA test starts here
 _scratch_mkfs > $seqres.full 2>&1
 
 # In order to get our failure condition consistently we need to turn off
diff --git a/tests/ext4/031 b/tests/ext4/031
index ac16786f..b583f825 100755
--- a/tests/ext4/031
+++ b/tests/ext4/031
@@ -24,7 +24,6 @@ _require_scratch_dax_mountopt "dax"
 _require_test_program "t_ext4_dax_inline_corruption"
 _require_scratch_ext4_feature "inline_data"
 
-# real QA test starts here
 _scratch_mkfs_ext4 -O inline_data > $seqres.full 2>&1
 
 TESTFILE=$SCRATCH_MNT/testfile
diff --git a/tests/ext4/032 b/tests/ext4/032
index 3d91db22..6bc3b61b 100755
--- a/tests/ext4/032
+++ b/tests/ext4/032
@@ -80,7 +80,6 @@ _cleanup()
 
 # get standard environment and checks
 
-# real QA test starts here
 _supported_fs ext4
 
 _require_loop
diff --git a/tests/ext4/033 b/tests/ext4/033
index 22041a17..53f7106e 100755
--- a/tests/ext4/033
+++ b/tests/ext4/033
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmhugedisk
 
-# real QA test starts here
 _supported_fs ext4
 _require_scratch_nocheck
 _require_dmhugedisk
diff --git a/tests/ext4/034 b/tests/ext4/034
index b656e54d..cdd2e553 100755
--- a/tests/ext4/034
+++ b/tests/ext4/034
@@ -17,7 +17,6 @@ _begin_fstest auto quick quota fiemap prealloc
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
 
 # Modify as appropriate.
 _supported_fs ext4
diff --git a/tests/ext4/035 b/tests/ext4/035
index a8278b0e..cf221c5a 100755
--- a/tests/ext4/035
+++ b/tests/ext4/035
@@ -19,7 +19,6 @@ _begin_fstest auto quick resize
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _supported_fs ext4
 _require_scratch
 _exclude_scratch_mount_option dax
diff --git a/tests/ext4/036 b/tests/ext4/036
index 60ab0b90..045fe82f 100755
--- a/tests/ext4/036
+++ b/tests/ext4/036
@@ -15,7 +15,6 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _supported_fs ext3 ext4
 _require_scratch
 
diff --git a/tests/ext4/037 b/tests/ext4/037
index 5ecb9f83..ac309d67 100755
--- a/tests/ext4/037
+++ b/tests/ext4/037
@@ -15,7 +15,6 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _supported_fs ext3 ext4
 
 # nofsck as we modify sb via debugfs
diff --git a/tests/ext4/038 b/tests/ext4/038
index 596de65b..b594bd9c 100755
--- a/tests/ext4/038
+++ b/tests/ext4/038
@@ -12,7 +12,6 @@ _begin_fstest auto quick
 
 # Import common functions.
 
-# real QA test starts here
 _supported_fs ext3 ext4
 _require_scratch
 _require_command "$DEBUGFS_PROG" debugfs
diff --git a/tests/ext4/039 b/tests/ext4/039
index 4ca4058a..2830740e 100755
--- a/tests/ext4/039
+++ b/tests/ext4/039
@@ -56,7 +56,6 @@ chattr_opt: $chattr_opt" >>$seqres.full
 	done
 }
 
-# real QA test starts here
 _supported_fs ext3 ext4
 _require_scratch
 _exclude_scratch_mount_option dax
diff --git a/tests/ext4/040 b/tests/ext4/040
index a20d5897..5760058a 100755
--- a/tests/ext4/040
+++ b/tests/ext4/040
@@ -21,7 +21,6 @@ PIDS=""
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _supported_fs ext2 ext3 ext4
 _require_scratch_nocheck
 _disable_dmesg_check
diff --git a/tests/ext4/041 b/tests/ext4/041
index 941cd26b..76513db3 100755
--- a/tests/ext4/041
+++ b/tests/ext4/041
@@ -21,7 +21,6 @@ PIDS=""
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _supported_fs ext2 ext3 ext4
 _require_scratch_nocheck
 _disable_dmesg_check
diff --git a/tests/ext4/042 b/tests/ext4/042
index 9e5ef22d..0d97f6de 100755
--- a/tests/ext4/042
+++ b/tests/ext4/042
@@ -12,7 +12,6 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
 _supported_fs ext2 ext3 ext4
diff --git a/tests/ext4/043 b/tests/ext4/043
index de0ddf7f..0bbbb42a 100755
--- a/tests/ext4/043
+++ b/tests/ext4/043
@@ -12,7 +12,6 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _supported_fs ext3 ext4
 
 _require_scratch
diff --git a/tests/ext4/044 b/tests/ext4/044
index 96fa70cc..53006514 100755
--- a/tests/ext4/044
+++ b/tests/ext4/044
@@ -12,7 +12,6 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _supported_fs ext4
 _require_scratch
 _require_test_program "t_get_file_time"
diff --git a/tests/ext4/045 b/tests/ext4/045
index a90ae1ba..587bedec 100755
--- a/tests/ext4/045
+++ b/tests/ext4/045
@@ -16,7 +16,6 @@ LONG_DIR=2
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _supported_fs ext4
 
 _require_scratch
diff --git a/tests/ext4/047 b/tests/ext4/047
index 7e0c8438..f67b615a 100755
--- a/tests/ext4/047
+++ b/tests/ext4/047
@@ -13,7 +13,6 @@ _begin_fstest auto quick dax
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _supported_fs ext4
 _require_scratch_dax_mountopt "dax=always"
 _require_dax_iflag
diff --git a/tests/ext4/048 b/tests/ext4/048
index c23c0ea3..99a2c7b8 100755
--- a/tests/ext4/048
+++ b/tests/ext4/048
@@ -13,7 +13,6 @@ _begin_fstest auto quick dir
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _supported_fs ext4
 
 _require_scratch
diff --git a/tests/ext4/049 b/tests/ext4/049
index f6ec1d6d..5b24e632 100755
--- a/tests/ext4/049
+++ b/tests/ext4/049
@@ -13,7 +13,6 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _supported_fs ext4
 _require_scratch
 
diff --git a/tests/ext4/050 b/tests/ext4/050
index 6f93b86d..6ba0038e 100755
--- a/tests/ext4/050
+++ b/tests/ext4/050
@@ -13,7 +13,6 @@ _begin_fstest auto ioctl quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _supported_fs ext4
 
 _require_scratch
diff --git a/tests/ext4/051 b/tests/ext4/051
index e4b63a32..a1e35fa3 100755
--- a/tests/ext4/051
+++ b/tests/ext4/051
@@ -12,7 +12,6 @@
 . ./common/preamble
 _begin_fstest auto rw quick
 
-# real QA test starts here
 _supported_fs ext4
 _require_scratch
 _require_scratch_shutdown
diff --git a/tests/ext4/052 b/tests/ext4/052
index dc40e670..edcdc025 100755
--- a/tests/ext4/052
+++ b/tests/ext4/052
@@ -27,7 +27,6 @@ _cleanup()
 # Import common functions.
 # . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
 _supported_fs ext4
diff --git a/tests/ext4/054 b/tests/ext4/054
index 215f564a..0dbe8364 100755
--- a/tests/ext4/054
+++ b/tests/ext4/054
@@ -17,7 +17,6 @@ _begin_fstest auto quick dangerous_fuzzers prealloc punch
 # Import common functions
 . ./common/filter
 
-# real QA test starts here
 _supported_fs ext4
 _require_scratch_nocheck
 _require_xfs_io_command "falloc"
diff --git a/tests/ext4/055 b/tests/ext4/055
index aa15cfe9..e1815c23 100755
--- a/tests/ext4/055
+++ b/tests/ext4/055
@@ -16,7 +16,6 @@
 . ./common/preamble
 _begin_fstest auto quota
 
-# real QA test starts here
 _require_scratch_nocheck
 _supported_fs ext4
 _require_user fsgqa
diff --git a/tests/ext4/056 b/tests/ext4/056
index 9e3f97c3..8a290b11 100755
--- a/tests/ext4/056
+++ b/tests/ext4/056
@@ -19,7 +19,6 @@
 . ./common/preamble
 _begin_fstest auto ioctl resize quick
 
-# real QA test starts here
 
 INITIAL_FS_SIZE=1G
 RESIZED_FS_SIZE=$((2*1024*1024*1024))  # 2G
diff --git a/tests/ext4/057 b/tests/ext4/057
index 6babedb2..529f0c29 100755
--- a/tests/ext4/057
+++ b/tests/ext4/057
@@ -20,7 +20,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _supported_fs ext4
 _require_scratch
 _require_test_program uuid_ioctl
diff --git a/tests/ext4/058 b/tests/ext4/058
index 4704daa7..a7fc5e6c 100755
--- a/tests/ext4/058
+++ b/tests/ext4/058
@@ -13,7 +13,6 @@
 . ./common/preamble
 _begin_fstest auto quick
 
-# real QA test starts here
 
 _supported_fs ext4
 _fixed_by_kernel_commit a08f789d2ab5 \
diff --git a/tests/ext4/059 b/tests/ext4/059
index 66bac608..50e788f0 100755
--- a/tests/ext4/059
+++ b/tests/ext4/059
@@ -11,7 +11,6 @@
 . ./common/preamble
 _begin_fstest auto resize quick
 
-# real QA test starts here
 _supported_fs ext4
 _fixed_by_kernel_commit b55c3cd102a6 \
 	"ext4: add reserved GDT blocks check"
diff --git a/tests/ext4/271 b/tests/ext4/271
index 8d9bd7dc..6d60f40d 100755
--- a/tests/ext4/271
+++ b/tests/ext4/271
@@ -12,7 +12,6 @@ _begin_fstest auto rw quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _supported_fs ext4
 _require_scratch
 # this test needs no journal to be loaded, skip on journal related mount
diff --git a/tests/ext4/301 b/tests/ext4/301
index 7c3dc720..dd0c7d48 100755
--- a/tests/ext4/301
+++ b/tests/ext4/301
@@ -15,7 +15,6 @@ fio_config=$tmp.fio
 . ./common/filter
 . ./common/defrag
 
-# real QA test starts here
 _supported_fs ext4
 _require_scratch
 _require_defrag
diff --git a/tests/ext4/302 b/tests/ext4/302
index e2f4b4e4..d73cf9bf 100755
--- a/tests/ext4/302
+++ b/tests/ext4/302
@@ -16,7 +16,6 @@ fio_config=$tmp.fio
 . ./common/filter
 . ./common/defrag
 
-# real QA test starts here
 _supported_fs ext4
 _require_scratch
 _require_defrag
diff --git a/tests/ext4/303 b/tests/ext4/303
index db25ea1f..d9be4567 100755
--- a/tests/ext4/303
+++ b/tests/ext4/303
@@ -16,7 +16,6 @@ fio_config=$tmp.fio
 . ./common/filter
 . ./common/defrag
 
-# real QA test starts here
 _supported_fs ext4
 _require_scratch
 _require_defrag
diff --git a/tests/ext4/304 b/tests/ext4/304
index ce5c53aa..208b8a2a 100755
--- a/tests/ext4/304
+++ b/tests/ext4/304
@@ -17,7 +17,6 @@ fio_config=$tmp.fio
 . ./common/filter
 . ./common/defrag
 
-# real QA test starts here
 _supported_fs ext4
 _require_scratch
 _require_defrag
diff --git a/tests/ext4/305 b/tests/ext4/305
index 2c89a583..acada44b 100755
--- a/tests/ext4/305
+++ b/tests/ext4/305
@@ -22,7 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _supported_fs ext4
 
 _require_scratch
diff --git a/tests/ext4/306 b/tests/ext4/306
index 715732a7..b5147caf 100755
--- a/tests/ext4/306
+++ b/tests/ext4/306
@@ -22,7 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _supported_fs ext4
 
 _require_scratch
diff --git a/tests/ext4/307 b/tests/ext4/307
index 8b1cfc9e..f7c95c51 100755
--- a/tests/ext4/307
+++ b/tests/ext4/307
@@ -34,8 +34,6 @@ _workout()
 	run_check md5sum -c $out.md5sum
 }
 
-# real QA test starts here
-_supported_fs generic
 _supported_fs ext4
 _require_scratch
 _require_defrag
diff --git a/tests/ext4/308 b/tests/ext4/308
index 849ebdf8..9712c6f4 100755
--- a/tests/ext4/308
+++ b/tests/ext4/308
@@ -17,7 +17,6 @@ PIDS=""
 . ./common/filter
 . ./common/defrag
 
-# real QA test starts here
 _require_scratch
 _require_defrag
 _require_xfs_io_command "falloc"
diff --git a/tests/f2fs/001 b/tests/f2fs/001
index 2bf39d8c..caf2bf7f 100755
--- a/tests/f2fs/001
+++ b/tests/f2fs/001
@@ -21,7 +21,6 @@ _begin_fstest auto quick rw prealloc
 # Import common functions.
 . ./common/filter
 
-_supported_fs f2fs
 _require_scratch
 _require_xfs_io_command "falloc"
 
diff --git a/tests/f2fs/002 b/tests/f2fs/002
index c0bf440b..74146217 100755
--- a/tests/f2fs/002
+++ b/tests/f2fs/002
@@ -46,8 +46,6 @@ _begin_fstest auto quick rw encrypt compress fiemap
 . ./common/f2fs
 . ./common/encrypt
 
-_supported_fs f2fs
-
 # Prerequisites to create a file that is both encrypted and LZ4-compressed
 _require_scratch_encryption -v 2
 _require_scratch_f2fs_compression lz4
diff --git a/tests/generic/001 b/tests/generic/001
index c59344e4..d7491efd 100755
--- a/tests/generic/001
+++ b/tests/generic/001
@@ -25,8 +25,6 @@ status=1
 done_cleanup=false
 _register_cleanup "_cleanup; rm -f $tmp.*"
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 
 verbose=true
diff --git a/tests/generic/002 b/tests/generic/002
index 3974ef0e..b202492b 100755
--- a/tests/generic/002
+++ b/tests/generic/002
@@ -14,8 +14,6 @@ _begin_fstest metadata udf auto quick
 
 status=0	# success is the default!
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_hardlinks
 
diff --git a/tests/generic/003 b/tests/generic/003
index 999aed14..44dc7d48 100755
--- a/tests/generic/003
+++ b/tests/generic/003
@@ -15,9 +15,7 @@ _begin_fstest atime auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs generic
 _require_scratch
 _require_atime
 _require_relatime
diff --git a/tests/generic/004 b/tests/generic/004
index a575c2ef..70e8f7cc 100755
--- a/tests/generic/004
+++ b/tests/generic/004
@@ -19,8 +19,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_xfs_io_command "-T"
diff --git a/tests/generic/005 b/tests/generic/005
index e497b33c..8b64884b 100755
--- a/tests/generic/005
+++ b/tests/generic/005
@@ -41,8 +41,6 @@ _touch()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_symlinks
 
diff --git a/tests/generic/006 b/tests/generic/006
index bc532920..acd358f5 100755
--- a/tests/generic/006
+++ b/tests/generic/006
@@ -31,8 +31,6 @@ _count()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 
 mkdir $TEST_DIR/permname.$$
diff --git a/tests/generic/007 b/tests/generic/007
index 5183816b..45d1c976 100755
--- a/tests/generic/007
+++ b/tests/generic/007
@@ -25,8 +25,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 
 sourcefile=$tmp.nametest
diff --git a/tests/generic/008 b/tests/generic/008
index 7ddb2c65..b8ec456b 100755
--- a/tests/generic/008
+++ b/tests/generic/008
@@ -16,7 +16,6 @@ _begin_fstest auto quick prealloc zero
 . ./common/filter
 . ./common/punch
 
-# real QA test starts here
 
 # Modify as appropriate.
 
diff --git a/tests/generic/009 b/tests/generic/009
index 7c9b137f..05c5e408 100755
--- a/tests/generic/009
+++ b/tests/generic/009
@@ -13,7 +13,6 @@ _begin_fstest auto quick prealloc zero fiemap
 . ./common/filter
 . ./common/punch
 
-# real QA test starts here
 _require_xfs_io_command "fzero"
 _require_xfs_io_command "fiemap"
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/010 b/tests/generic/010
index ac9689af..cef98443 100755
--- a/tests/generic/010
+++ b/tests/generic/010
@@ -33,8 +33,6 @@ _filter_dbtest()
 
 _require_test_program "dbtest"
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 
 cd $TEST_DIR
diff --git a/tests/generic/011 b/tests/generic/011
index f4c795ae..c7892961 100755
--- a/tests/generic/011
+++ b/tests/generic/011
@@ -23,8 +23,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 
 out=$TEST_DIR/dirstress.$$
diff --git a/tests/generic/012 b/tests/generic/012
index 74e7a02b..c1dfb472 100755
--- a/tests/generic/012
+++ b/tests/generic/012
@@ -18,8 +18,6 @@ _begin_fstest auto quick prealloc punch collapse fiemap
 . ./common/filter
 . ./common/punch
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_xfs_io_command "fpunch"
diff --git a/tests/generic/013 b/tests/generic/013
index 24b69517..3a000b97 100755
--- a/tests/generic/013
+++ b/tests/generic/013
@@ -59,8 +59,6 @@ _do_test()
     _check_test_fs
 }
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 
 echo "brevity is wit..."
diff --git a/tests/generic/014 b/tests/generic/014
index cff3622b..541d6569 100755
--- a/tests/generic/014
+++ b/tests/generic/014
@@ -22,7 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-_supported_fs generic
 
 _require_test
 _require_sparse_files
diff --git a/tests/generic/015 b/tests/generic/015
index 716a7b1f..d4f81c7f 100755
--- a/tests/generic/015
+++ b/tests/generic/015
@@ -23,8 +23,6 @@ _free()
     _df_dir $SCRATCH_MNT | $AWK_PROG '{ print $5 }'
 }
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_no_large_scratch_dev
diff --git a/tests/generic/016 b/tests/generic/016
index 833e9161..2d026170 100755
--- a/tests/generic/016
+++ b/tests/generic/016
@@ -18,8 +18,6 @@ _begin_fstest auto quick prealloc punch collapse fiemap
 . ./common/filter
 . ./common/punch
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_xfs_io_command "fpunch"
diff --git a/tests/generic/017 b/tests/generic/017
index 5f0d8513..960e0096 100755
--- a/tests/generic/017
+++ b/tests/generic/017
@@ -15,8 +15,6 @@ _begin_fstest auto prealloc collapse fiemap
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_xfs_io_command "fiemap"
diff --git a/tests/generic/018 b/tests/generic/018
index 4ffc91d5..501960d7 100755
--- a/tests/generic/018
+++ b/tests/generic/018
@@ -13,8 +13,6 @@ _begin_fstest auto fsr quick defrag
 . ./common/filter
 . ./common/defrag
 
-# real QA test starts here
-_supported_fs generic
 
 # We require scratch so that we'll have free contiguous space
 _require_scratch
diff --git a/tests/generic/019 b/tests/generic/019
index b81c1d17..26108be4 100755
--- a/tests/generic/019
+++ b/tests/generic/019
@@ -15,7 +15,6 @@ fio_config=$tmp.fio
 # Import common functions.
 . ./common/filter
 . ./common/fail_make_request
-_supported_fs generic
 _require_scratch
 _require_block_device $SCRATCH_DEV
 _require_fail_make_request
@@ -126,7 +125,6 @@ _workout()
 	run_check _scratch_unmount
 }
 
-# real QA test starts here
 
 _scratch_mkfs >> $seqres.full 2>&1 || _fail "mkfs failed"
 _scratch_mount
diff --git a/tests/generic/020 b/tests/generic/020
index 4951b9e3..8b77d5ca 100755
--- a/tests/generic/020
+++ b/tests/generic/020
@@ -176,8 +176,6 @@ _attr_get_maxval_size()
 	esac
 }
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_attrs
diff --git a/tests/generic/021 b/tests/generic/021
index 532feeeb..0fb2719a 100755
--- a/tests/generic/021
+++ b/tests/generic/021
@@ -18,8 +18,6 @@ _begin_fstest auto quick prealloc punch collapse fiemap
 . ./common/filter
 . ./common/punch
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_xfs_io_command "fpunch"
diff --git a/tests/generic/022 b/tests/generic/022
index 62577b81..a50f19e8 100755
--- a/tests/generic/022
+++ b/tests/generic/022
@@ -18,8 +18,6 @@ _begin_fstest auto quick prealloc punch collapse fiemap
 . ./common/filter
 . ./common/punch
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_xfs_io_command "fpunch"
diff --git a/tests/generic/023 b/tests/generic/023
index 2b1973c3..db00762b 100755
--- a/tests/generic/023
+++ b/tests/generic/023
@@ -12,13 +12,11 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/renameat2
 
-_supported_fs generic
 
 _require_test
 _require_renameat2
 _require_symlinks
 
-# real QA test starts here
 
 rename_dir=$TEST_DIR/$$
 mkdir -p $rename_dir
diff --git a/tests/generic/024 b/tests/generic/024
index 84eecb9b..d170c316 100755
--- a/tests/generic/024
+++ b/tests/generic/024
@@ -12,13 +12,11 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/renameat2
 
-_supported_fs generic
 
 _require_test
 _require_renameat2 noreplace
 _require_symlinks
 
-# real QA test starts here
 
 rename_dir=$TEST_DIR/$$
 mkdir $rename_dir
diff --git a/tests/generic/025 b/tests/generic/025
index d3c79370..fab6d937 100755
--- a/tests/generic/025
+++ b/tests/generic/025
@@ -12,13 +12,11 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/renameat2
 
-_supported_fs generic
 
 _require_test
 _require_renameat2 exchange
 _require_symlinks
 
-# real QA test starts here
 
 rename_dir=$TEST_DIR/$$
 mkdir $rename_dir
diff --git a/tests/generic/026 b/tests/generic/026
index 43b7b0b7..0944ead5 100755
--- a/tests/generic/026
+++ b/tests/generic/026
@@ -22,8 +22,6 @@ _cleanup()
     [ -n "$TEST_DIR" ] && rm -rf $TEST_DIR/$seq.dir1
 }
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _acl_setup_ids
 _require_acls
diff --git a/tests/generic/027 b/tests/generic/027
index eace1b35..b7721dfb 100755
--- a/tests/generic/027
+++ b/tests/generic/027
@@ -28,8 +28,6 @@ create_file()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 
diff --git a/tests/generic/028 b/tests/generic/028
index 9d646c55..1257a3ab 100755
--- a/tests/generic/028
+++ b/tests/generic/028
@@ -19,8 +19,6 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 
 echo "Silence is golden"
diff --git a/tests/generic/029 b/tests/generic/029
index 8b75c02a..0af46e89 100755
--- a/tests/generic/029
+++ b/tests/generic/029
@@ -14,10 +14,8 @@ _begin_fstest auto quick rw
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch
 
 testfile=$SCRATCH_MNT/testfile
diff --git a/tests/generic/030 b/tests/generic/030
index c467bb74..3f0e5b99 100755
--- a/tests/generic/030
+++ b/tests/generic/030
@@ -14,10 +14,8 @@ _begin_fstest auto quick rw
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch
 _require_xfs_io_command "mremap"
 
diff --git a/tests/generic/031 b/tests/generic/031
index 0d2e8268..4d6a54d1 100755
--- a/tests/generic/031
+++ b/tests/generic/031
@@ -14,10 +14,8 @@ _begin_fstest auto quick prealloc rw collapse
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch
 _require_xfs_io_command "fcollapse"
 
diff --git a/tests/generic/032 b/tests/generic/032
index c006a591..63abd62a 100755
--- a/tests/generic/032
+++ b/tests/generic/032
@@ -25,7 +25,6 @@ _cleanup()
 # Import common functions.
 . ./common/punch
 
-# real QA test starts here
 
 _syncloop()
 {
@@ -35,7 +34,6 @@ _syncloop()
 }
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "fiemap"
diff --git a/tests/generic/033 b/tests/generic/033
index d3b926e6..a9a9ff5a 100755
--- a/tests/generic/033
+++ b/tests/generic/033
@@ -17,10 +17,8 @@ _begin_fstest auto quick rw zero
 
 # Import common functions.
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch
 _require_xfs_io_command "fzero"
 
diff --git a/tests/generic/034 b/tests/generic/034
index 3f422993..71aae2a0 100755
--- a/tests/generic/034
+++ b/tests/generic/034
@@ -26,8 +26,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_dm_target flakey
 
diff --git a/tests/generic/035 b/tests/generic/035
index a2135d7f..2c8e8d31 100755
--- a/tests/generic/035
+++ b/tests/generic/035
@@ -12,14 +12,12 @@ _begin_fstest auto quick
 
 # Import common functions.
 
-_supported_fs generic
 
 _require_test
 
 # Select appropriate golden output based on fstype
 _link_out_file
 
-# real QA test starts here
 
 rename_dir=$TEST_DIR/$$
 mkdir -p $rename_dir
diff --git a/tests/generic/036 b/tests/generic/036
index 1bc762dd..b88b1706 100755
--- a/tests/generic/036
+++ b/tests/generic/036
@@ -13,9 +13,7 @@ _begin_fstest auto aio rw stress
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs generic
 _require_test
 
 _run_aiodio aio-dio-fcntl-race
diff --git a/tests/generic/037 b/tests/generic/037
index 55beddb4..7d387e25 100755
--- a/tests/generic/037
+++ b/tests/generic/037
@@ -29,8 +29,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_attrs
 
diff --git a/tests/generic/038 b/tests/generic/038
index e1176292..22ea8d36 100755
--- a/tests/generic/038
+++ b/tests/generic/038
@@ -46,8 +46,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/039 b/tests/generic/039
index 72eb6fa7..5162e85b 100755
--- a/tests/generic/039
+++ b/tests/generic/039
@@ -29,8 +29,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_hardlinks
 _require_dm_target flakey
diff --git a/tests/generic/040 b/tests/generic/040
index 62e3468b..eb88e9ee 100755
--- a/tests/generic/040
+++ b/tests/generic/040
@@ -34,8 +34,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_hardlinks
 _require_dm_target flakey
diff --git a/tests/generic/041 b/tests/generic/041
index ccf002c0..44701368 100755
--- a/tests/generic/041
+++ b/tests/generic/041
@@ -38,8 +38,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_hardlinks
 _require_dm_target flakey
diff --git a/tests/generic/042 b/tests/generic/042
index 63a46d6b..fd0ef705 100755
--- a/tests/generic/042
+++ b/tests/generic/042
@@ -19,7 +19,6 @@ _begin_fstest shutdown rw punch zero prealloc auto quick
 . ./common/filter
 . ./common/punch
 
-# real QA test starts here
 
 _crashtest()
 {
@@ -59,7 +58,6 @@ _crashtest()
 }
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch
 _require_scratch_shutdown
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/043 b/tests/generic/043
index d5ca438a..4110aa2a 100755
--- a/tests/generic/043
+++ b/tests/generic/043
@@ -12,8 +12,6 @@ _begin_fstest shutdown metadata log auto fiemap
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_scratch_shutdown
diff --git a/tests/generic/044 b/tests/generic/044
index a5d3e9ed..5d21875c 100755
--- a/tests/generic/044
+++ b/tests/generic/044
@@ -12,8 +12,6 @@ _begin_fstest shutdown metadata log auto fiemap
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_scratch_shutdown
diff --git a/tests/generic/045 b/tests/generic/045
index dfbcaeb4..9904142f 100755
--- a/tests/generic/045
+++ b/tests/generic/045
@@ -12,8 +12,6 @@ _begin_fstest shutdown metadata log auto fiemap
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_scratch_shutdown
diff --git a/tests/generic/046 b/tests/generic/046
index 29165e45..5ed60c76 100755
--- a/tests/generic/046
+++ b/tests/generic/046
@@ -12,8 +12,6 @@ _begin_fstest shutdown metadata log auto fiemap
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_scratch_shutdown
diff --git a/tests/generic/047 b/tests/generic/047
index 61590e9b..f5ba0d19 100755
--- a/tests/generic/047
+++ b/tests/generic/047
@@ -13,8 +13,6 @@ _begin_fstest shutdown metadata rw auto fiemap
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_scratch_shutdown
diff --git a/tests/generic/048 b/tests/generic/048
index ebe9132e..7b28cb05 100755
--- a/tests/generic/048
+++ b/tests/generic/048
@@ -13,8 +13,6 @@ _begin_fstest shutdown metadata rw auto fiemap
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_scratch_shutdown
diff --git a/tests/generic/049 b/tests/generic/049
index e5c5a0e3..8e4b9956 100755
--- a/tests/generic/049
+++ b/tests/generic/049
@@ -13,8 +13,6 @@ _begin_fstest shutdown metadata rw auto fiemap
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_scratch_shutdown
diff --git a/tests/generic/050 b/tests/generic/050
index 0664f8c0..ca02d309 100755
--- a/tests/generic/050
+++ b/tests/generic/050
@@ -20,8 +20,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch_nocheck
 _require_scratch_shutdown
diff --git a/tests/generic/051 b/tests/generic/051
index afde8e26..65571fdd 100755
--- a/tests/generic/051
+++ b/tests/generic/051
@@ -22,8 +22,6 @@ _cleanup()
 	rm -f $tmp.*
 }
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_scratch_shutdown
diff --git a/tests/generic/052 b/tests/generic/052
index 9771575c..ec9de678 100755
--- a/tests/generic/052
+++ b/tests/generic/052
@@ -16,8 +16,6 @@ _begin_fstest shutdown log auto quick
 . ./common/filter
 . ./common/log
 
-# real QA test starts here
-_supported_fs generic
 
 rm -f $tmp.log
 
diff --git a/tests/generic/053 b/tests/generic/053
index d7a2ffbd..b308d233 100755
--- a/tests/generic/053
+++ b/tests/generic/053
@@ -13,8 +13,6 @@ _begin_fstest acl repair auto quick
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_acls
diff --git a/tests/generic/054 b/tests/generic/054
index 806117d6..20e9a1e9 100755
--- a/tests/generic/054
+++ b/tests/generic/054
@@ -15,8 +15,6 @@ _begin_fstest shutdown log v2log auto
 . ./common/filter
 . ./common/log
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_scratch_shutdown
diff --git a/tests/generic/055 b/tests/generic/055
index 935691e1..b1126c90 100755
--- a/tests/generic/055
+++ b/tests/generic/055
@@ -42,8 +42,6 @@ _get_quota_option()
     esac
 }
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_scratch_shutdown
diff --git a/tests/generic/056 b/tests/generic/056
index 99d5e325..3e139e1e 100755
--- a/tests/generic/056
+++ b/tests/generic/056
@@ -27,8 +27,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_hardlinks
 _require_dm_target flakey
diff --git a/tests/generic/057 b/tests/generic/057
index 7e4e305e..c92af5dd 100755
--- a/tests/generic/057
+++ b/tests/generic/057
@@ -27,8 +27,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_hardlinks
 _require_dm_target flakey
diff --git a/tests/generic/058 b/tests/generic/058
index dddadbe0..2b8c8047 100755
--- a/tests/generic/058
+++ b/tests/generic/058
@@ -18,8 +18,6 @@ _begin_fstest auto quick prealloc punch insert fiemap
 . ./common/filter
 . ./common/punch
 
-# real QA test starts here
-_supported_fs generic
 
 _require_xfs_io_command "fpunch"
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/059 b/tests/generic/059
index 00c0f7b0..0d327078 100755
--- a/tests/generic/059
+++ b/tests/generic/059
@@ -35,8 +35,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_dm_target flakey
 _require_xfs_io_command "fpunch"
diff --git a/tests/generic/060 b/tests/generic/060
index 3a890ed0..794a1c99 100755
--- a/tests/generic/060
+++ b/tests/generic/060
@@ -18,8 +18,6 @@ _begin_fstest auto quick prealloc punch insert fiemap
 . ./common/filter
 . ./common/punch
 
-# real QA test starts here
-_supported_fs generic
 
 _require_xfs_io_command "fpunch"
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/061 b/tests/generic/061
index e370ffdf..2de6407e 100755
--- a/tests/generic/061
+++ b/tests/generic/061
@@ -18,8 +18,6 @@ _begin_fstest auto quick prealloc punch insert fiemap
 . ./common/filter
 . ./common/punch
 
-# real QA test starts here
-_supported_fs generic
 
 _require_xfs_io_command "fpunch"
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/062 b/tests/generic/062
index 6e5ad049..8f4dfcbf 100755
--- a/tests/generic/062
+++ b/tests/generic/062
@@ -47,8 +47,6 @@ _create_test_bed()
 	find $SCRATCH_MNT | LC_COLLATE=POSIX sort | _filter_scratch | grep -v "lost+found"
 }
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_attrs
@@ -57,7 +55,6 @@ _require_mknod
 
 rm -f $tmp.backup1 $tmp.backup2 $seqres.full
 
-# real QA test starts here
 _scratch_mkfs > /dev/null 2>&1 || _fail "mkfs failed"
 _scratch_mount
 _create_test_bed
diff --git a/tests/generic/063 b/tests/generic/063
index 3974647b..b41cf53b 100755
--- a/tests/generic/063
+++ b/tests/generic/063
@@ -18,8 +18,6 @@ _begin_fstest auto quick prealloc punch insert fiemap
 . ./common/filter
 . ./common/punch
 
-# real QA test starts here
-_supported_fs generic
 
 _require_xfs_io_command "fpunch"
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/064 b/tests/generic/064
index b50c55e7..aed13970 100755
--- a/tests/generic/064
+++ b/tests/generic/064
@@ -15,8 +15,6 @@ _begin_fstest auto quick prealloc collapse insert fiemap
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_xfs_io_command "fiemap"
diff --git a/tests/generic/065 b/tests/generic/065
index 7f974fea..adf55b75 100755
--- a/tests/generic/065
+++ b/tests/generic/065
@@ -28,8 +28,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_hardlinks
 _require_dm_target flakey
diff --git a/tests/generic/066 b/tests/generic/066
index d8a38655..e32e9658 100755
--- a/tests/generic/066
+++ b/tests/generic/066
@@ -32,8 +32,6 @@ _cleanup()
 . ./common/dmflakey
 . ./common/attr
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_dm_target flakey
 _require_attrs
diff --git a/tests/generic/067 b/tests/generic/067
index cb466e0c..b561b7bc 100755
--- a/tests/generic/067
+++ b/tests/generic/067
@@ -19,10 +19,8 @@ _begin_fstest auto quick mount
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_symlinks
 _require_test
 _require_scratch
diff --git a/tests/generic/068 b/tests/generic/068
index af527fee..1e8248b9 100755
--- a/tests/generic/068
+++ b/tests/generic/068
@@ -28,8 +28,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_freeze
diff --git a/tests/generic/069 b/tests/generic/069
index 5579bff2..390a340b 100755
--- a/tests/generic/069
+++ b/tests/generic/069
@@ -15,8 +15,6 @@ _register_cleanup "rm -rf $tmp.*"
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 
diff --git a/tests/generic/070 b/tests/generic/070
index 8a134f80..a8e84eff 100755
--- a/tests/generic/070
+++ b/tests/generic/070
@@ -21,8 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_attrs
diff --git a/tests/generic/071 b/tests/generic/071
index 205d8315..7eb9662b 100755
--- a/tests/generic/071
+++ b/tests/generic/071
@@ -14,8 +14,6 @@ _begin_fstest auto quick prealloc
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_xfs_io_command "falloc" "-k"
 
diff --git a/tests/generic/072 b/tests/generic/072
index 59b49fac..001f980a 100755
--- a/tests/generic/072
+++ b/tests/generic/072
@@ -15,8 +15,6 @@ _begin_fstest auto metadata stress collapse
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_xfs_io_command "fcollapse"
 
diff --git a/tests/generic/073 b/tests/generic/073
index f28a0838..5ebf634f 100755
--- a/tests/generic/073
+++ b/tests/generic/073
@@ -28,8 +28,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_dm_target flakey
 
diff --git a/tests/generic/074 b/tests/generic/074
index ec63c50f..923bf36b 100755
--- a/tests/generic/074
+++ b/tests/generic/074
@@ -21,7 +21,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-_supported_fs generic
 _require_test
 
 _do_test()
diff --git a/tests/generic/075 b/tests/generic/075
index 9f24ad41..8db58e86 100755
--- a/tests/generic/075
+++ b/tests/generic/075
@@ -101,8 +101,6 @@ _process_args()
     done
 }
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 
 size10=`expr 10 \* 1024 \* 1024`	# 10 megabytes
diff --git a/tests/generic/076 b/tests/generic/076
index c024fadd..b50c2df5 100755
--- a/tests/generic/076
+++ b/tests/generic/076
@@ -30,8 +30,6 @@ _register_cleanup "_cleanup; rm -f $tmp.*"
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_local_device $SCRATCH_DEV
diff --git a/tests/generic/077 b/tests/generic/077
index 4d66f105..9323f327 100755
--- a/tests/generic/077
+++ b/tests/generic/077
@@ -34,8 +34,6 @@ _register_cleanup "_cleanup; rm -f $tmp.*"
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs generic
 
 [ ! -d $filler ] && _notrun "No directory at least 256MB to source files from"
 
diff --git a/tests/generic/078 b/tests/generic/078
index fe0fb44a..f7ae7268 100755
--- a/tests/generic/078
+++ b/tests/generic/078
@@ -12,13 +12,11 @@ _begin_fstest auto quick metadata
 # Import common functions.
 . ./common/renameat2
 
-_supported_fs generic
 
 _require_test
 _require_renameat2 whiteout
 _require_symlinks
 
-# real QA test starts here
 
 rename_dir=$TEST_DIR/$$
 mkdir $rename_dir
diff --git a/tests/generic/079 b/tests/generic/079
index 9e7ccd31..df9ae52c 100755
--- a/tests/generic/079
+++ b/tests/generic/079
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-_supported_fs generic
 
 _require_chattr ia
 _require_user_exists "nobody"
@@ -31,7 +30,6 @@ _require_user_exists "daemon"
 _require_test_program "t_immutable"
 _require_scratch
 
-# real QA test starts here
 _scratch_mkfs >/dev/null 2>&1 || _fail "mkfs failed"
 _scratch_mount
 
diff --git a/tests/generic/080 b/tests/generic/080
index 1bfc6d72..5c38cc20 100755
--- a/tests/generic/080
+++ b/tests/generic/080
@@ -22,8 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 
 echo "Silence is golden."
diff --git a/tests/generic/081 b/tests/generic/081
index 0996f221..468c87ac 100755
--- a/tests/generic/081
+++ b/tests/generic/081
@@ -47,8 +47,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_scratch_nolvm
 _require_dm_target snapshot
diff --git a/tests/generic/082 b/tests/generic/082
index ddf48f63..f078ef2f 100755
--- a/tests/generic/082
+++ b/tests/generic/082
@@ -18,8 +18,6 @@ filter_project_quota_line()
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_scratch
 _require_quota
diff --git a/tests/generic/083 b/tests/generic/083
index 4cd1c399..10db5f08 100755
--- a/tests/generic/083
+++ b/tests/generic/083
@@ -29,8 +29,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_no_large_scratch_dev
diff --git a/tests/generic/084 b/tests/generic/084
index 942ee400..137ba23c 100755
--- a/tests/generic/084
+++ b/tests/generic/084
@@ -15,8 +15,6 @@ _begin_fstest auto metadata quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 
 link_unlink_storm()
diff --git a/tests/generic/085 b/tests/generic/085
index 786d8e6f..cfe6112d 100755
--- a/tests/generic/085
+++ b/tests/generic/085
@@ -34,8 +34,6 @@ cleanup_dmdev()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_block_device $SCRATCH_DEV
 _require_dm_target linear
diff --git a/tests/generic/086 b/tests/generic/086
index 509c4f38..4ae79b81 100755
--- a/tests/generic/086
+++ b/tests/generic/086
@@ -19,10 +19,8 @@ _begin_fstest auto prealloc preallocrw quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/087 b/tests/generic/087
index 160b32de..fe66b00b 100755
--- a/tests/generic/087
+++ b/tests/generic/087
@@ -28,8 +28,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_chown
 
diff --git a/tests/generic/088 b/tests/generic/088
index 1c17b82f..5228ffe5 100755
--- a/tests/generic/088
+++ b/tests/generic/088
@@ -19,8 +19,6 @@ _filter()
     _filter_test_dir | sed -e '/----------/d'
 }
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_chown
 
diff --git a/tests/generic/089 b/tests/generic/089
index 1bbd1507..89c19484 100755
--- a/tests/generic/089
+++ b/tests/generic/089
@@ -26,8 +26,6 @@ addentries()
 	done
 }
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_hardlinks
 
diff --git a/tests/generic/090 b/tests/generic/090
index c0fdd2b2..36a9ee86 100755
--- a/tests/generic/090
+++ b/tests/generic/090
@@ -26,8 +26,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_hardlinks
 _require_dm_target flakey
diff --git a/tests/generic/091 b/tests/generic/091
index 9c02e36d..8f7c13da 100755
--- a/tests/generic/091
+++ b/tests/generic/091
@@ -12,8 +12,6 @@ _begin_fstest rw auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_odirect
 
diff --git a/tests/generic/092 b/tests/generic/092
index bdd8fedd..d8c22327 100755
--- a/tests/generic/092
+++ b/tests/generic/092
@@ -20,10 +20,8 @@ status=0	# success is the default!
 . ./common/filter
 . ./common/punch
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "fiemap"
diff --git a/tests/generic/093 b/tests/generic/093
index d7ddfd1b..c4e866da 100755
--- a/tests/generic/093
+++ b/tests/generic/093
@@ -25,8 +25,6 @@ filefilter()
     sed -e "s#$file#file#"
 }
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_attrs security
diff --git a/tests/generic/094 b/tests/generic/094
index 0d9ce8b6..c82efced 100755
--- a/tests/generic/094
+++ b/tests/generic/094
@@ -12,8 +12,6 @@ _begin_fstest auto quick prealloc fiemap
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_odirect
 _require_xfs_io_command "fiemap"
diff --git a/tests/generic/095 b/tests/generic/095
index 9d0446e9..7a0adf88 100755
--- a/tests/generic/095
+++ b/tests/generic/095
@@ -12,8 +12,6 @@ _begin_fstest auto quick rw stress
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_odirect
 _require_aio
diff --git a/tests/generic/096 b/tests/generic/096
index 41b646c0..70eae014 100755
--- a/tests/generic/096
+++ b/tests/generic/096
@@ -15,8 +15,6 @@ _begin_fstest auto prealloc quick zero
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_xfs_io_command "fzero"
 
diff --git a/tests/generic/097 b/tests/generic/097
index 613aabaa..7f53b69d 100755
--- a/tests/generic/097
+++ b/tests/generic/097
@@ -37,8 +37,6 @@ setfattr()
 . ./common/attr
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_attrs user trusted
diff --git a/tests/generic/098 b/tests/generic/098
index b947fb25..57de42e9 100755
--- a/tests/generic/098
+++ b/tests/generic/098
@@ -18,8 +18,6 @@ _begin_fstest auto quick metadata
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 
 # This test was motivated by an issue found in btrfs when the btrfs no-holes
diff --git a/tests/generic/099 b/tests/generic/099
index eab6f472..c7d5932b 100755
--- a/tests/generic/099
+++ b/tests/generic/099
@@ -46,8 +46,6 @@ _cleanup()
 #   -> interesting if it allows user to specify ACEs in any order
 #
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_runas
 
diff --git a/tests/generic/100 b/tests/generic/100
index cec47a0c..fd33e1f1 100755
--- a/tests/generic/100
+++ b/tests/generic/100
@@ -19,8 +19,6 @@ _cleanup()
      rm -f $tmp.* $TEMP_DIR/$TAR_FILE
 }
  
-# real QA test starts here
-_supported_fs generic
 _require_test
 
 # Use _populate_fs() in common/rc to create a directory structure.
diff --git a/tests/generic/101 b/tests/generic/101
index 76750c33..2e954357 100755
--- a/tests/generic/101
+++ b/tests/generic/101
@@ -25,8 +25,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_dm_target flakey
 
diff --git a/tests/generic/102 b/tests/generic/102
index 3536ebf7..daa5061b 100755
--- a/tests/generic/102
+++ b/tests/generic/102
@@ -18,8 +18,6 @@ _begin_fstest auto rw
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 
 dev_size=$((1024 * 1024 * 1024))     # 1GB filesystem
diff --git a/tests/generic/103 b/tests/generic/103
index fd650ec9..6ef251ec 100755
--- a/tests/generic/103
+++ b/tests/generic/103
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" 25
 # Import common functions.
 . ./common/attr
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_attrs
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/104 b/tests/generic/104
index 955185fa..7f294e1b 100755
--- a/tests/generic/104
+++ b/tests/generic/104
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_hardlinks
 _require_dm_target flakey
diff --git a/tests/generic/105 b/tests/generic/105
index a05219df..a74dc726 100755
--- a/tests/generic/105
+++ b/tests/generic/105
@@ -23,9 +23,7 @@ _cleanup()
 . ./common/attr
 
 # Modify as appropriate.
-_supported_fs generic
 
-# real QA test starts here
 
 _require_scratch
 _require_acls
diff --git a/tests/generic/106 b/tests/generic/106
index b8869236..2b89ae69 100755
--- a/tests/generic/106
+++ b/tests/generic/106
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_hardlinks
 _require_dm_target flakey
diff --git a/tests/generic/107 b/tests/generic/107
index 623c30a9..177ca59c 100755
--- a/tests/generic/107
+++ b/tests/generic/107
@@ -25,8 +25,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_hardlinks
 _require_dm_target flakey
diff --git a/tests/generic/108 b/tests/generic/108
index 07703fc8..da13715f 100755
--- a/tests/generic/108
+++ b/tests/generic/108
@@ -30,8 +30,6 @@ _cleanup()
 . ./common/filter
 . ./common/scsi_debug
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_nolvm
 _require_block_device $SCRATCH_DEV
 _require_scsi_debug
diff --git a/tests/generic/109 b/tests/generic/109
index b0bc1709..2b0b438c 100755
--- a/tests/generic/109
+++ b/tests/generic/109
@@ -12,8 +12,6 @@ _begin_fstest auto metadata dir
 
 # Import common functions.
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_symlinks
 
diff --git a/tests/generic/110 b/tests/generic/110
index ef5ac5f6..12d8d408 100755
--- a/tests/generic/110
+++ b/tests/generic/110
@@ -24,7 +24,6 @@ _cleanup()
 . common/filter
 . common/reflink
 
-# real QA test starts here
 _require_test_reflink
 
 _require_xfs_io_command "fiemap"
diff --git a/tests/generic/111 b/tests/generic/111
index 5df0fa80..7d408080 100755
--- a/tests/generic/111
+++ b/tests/generic/111
@@ -25,7 +25,6 @@ _cleanup()
 . common/filter
 . common/reflink
 
-# real QA test starts here
 _require_test_reflink
 
 _require_xfs_io_command "fiemap"
diff --git a/tests/generic/112 b/tests/generic/112
index 971d0467..0084b555 100755
--- a/tests/generic/112
+++ b/tests/generic/112
@@ -97,8 +97,6 @@ _process_args()
     done
 }
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_aio
 
diff --git a/tests/generic/113 b/tests/generic/113
index cacb2425..2b7140b9 100755
--- a/tests/generic/113
+++ b/tests/generic/113
@@ -53,8 +53,6 @@ _do_test()
     rm -f $_files
 }
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_aio
 _require_odirect
diff --git a/tests/generic/114 b/tests/generic/114
index a5ad4fab..068ed9e2 100755
--- a/tests/generic/114
+++ b/tests/generic/114
@@ -19,7 +19,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-_supported_fs generic
 
 _require_test
 _require_sparse_files
diff --git a/tests/generic/115 b/tests/generic/115
index 13d4b537..ddbb7b89 100755
--- a/tests/generic/115
+++ b/tests/generic/115
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 
 _require_xfs_io_command "fiemap"
diff --git a/tests/generic/116 b/tests/generic/116
index 88b64f4c..702a2487 100755
--- a/tests/generic/116
+++ b/tests/generic/116
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 
 testdir=$TEST_DIR/test-$seq
diff --git a/tests/generic/117 b/tests/generic/117
index e23c0508..f9769be9 100755
--- a/tests/generic/117
+++ b/tests/generic/117
@@ -45,8 +45,6 @@ ITERATIONS=10
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_attrs
diff --git a/tests/generic/118 b/tests/generic/118
index 35d933ff..cc8f1b44 100755
--- a/tests/generic/118
+++ b/tests/generic/118
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 
 testdir=$TEST_DIR/test-$seq
diff --git a/tests/generic/119 b/tests/generic/119
index 481d12d2..55bb6013 100755
--- a/tests/generic/119
+++ b/tests/generic/119
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_arbitrary_fileset_reflink
 
diff --git a/tests/generic/120 b/tests/generic/120
index 5a67ed0d..7527bd4a 100755
--- a/tests/generic/120
+++ b/tests/generic/120
@@ -12,8 +12,6 @@ _begin_fstest other atime auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_atime
diff --git a/tests/generic/121 b/tests/generic/121
index e9038240..2cec559f 100755
--- a/tests/generic/121
+++ b/tests/generic/121
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_dedupe
 
 testdir=$TEST_DIR/test-$seq
diff --git a/tests/generic/122 b/tests/generic/122
index 89309c22..a007e107 100755
--- a/tests/generic/122
+++ b/tests/generic/122
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_dedupe
 
 testdir=$TEST_DIR/test-$seq
diff --git a/tests/generic/123 b/tests/generic/123
index 43f90b46..46188f0f 100755
--- a/tests/generic/123
+++ b/tests/generic/123
@@ -23,8 +23,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_user
diff --git a/tests/generic/124 b/tests/generic/124
index 2d567160..ad56aea3 100755
--- a/tests/generic/124
+++ b/tests/generic/124
@@ -22,8 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_scratch
diff --git a/tests/generic/125 b/tests/generic/125
index 0d8e61a1..e2bc5fa1 100755
--- a/tests/generic/125
+++ b/tests/generic/125
@@ -12,8 +12,6 @@ _begin_fstest other pnfs auto
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_user
diff --git a/tests/generic/126 b/tests/generic/126
index 04fbd4c6..142d2bb9 100755
--- a/tests/generic/126
+++ b/tests/generic/126
@@ -18,8 +18,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_chown
 
diff --git a/tests/generic/127 b/tests/generic/127
index f931badd..c8984f27 100755
--- a/tests/generic/127
+++ b/tests/generic/127
@@ -79,8 +79,6 @@ _fsx_std_mmap()
     return 0
 }
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 
 _fsx_lite_nommap || exit
diff --git a/tests/generic/128 b/tests/generic/128
index 924d6aa8..f931ca06 100755
--- a/tests/generic/128
+++ b/tests/generic/128
@@ -12,8 +12,6 @@ _begin_fstest perms auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_user
diff --git a/tests/generic/129 b/tests/generic/129
index 3d3a42a2..fd311d77 100755
--- a/tests/generic/129
+++ b/tests/generic/129
@@ -18,8 +18,6 @@ echo_and_run()
     $1
 }
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_sparse_files
diff --git a/tests/generic/130 b/tests/generic/130
index 39a848c2..e8a7f33c 100755
--- a/tests/generic/130
+++ b/tests/generic/130
@@ -21,8 +21,6 @@ _begin_fstest pattern auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_sparse_files
diff --git a/tests/generic/131 b/tests/generic/131
index 5472ffe4..e5860c70 100755
--- a/tests/generic/131
+++ b/tests/generic/131
@@ -13,8 +13,6 @@ _begin_fstest perms auto quick
 . ./common/filter
 . ./common/locktest
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_test_fcntl_advisory_locks
 
diff --git a/tests/generic/132 b/tests/generic/132
index db7a1bf7..fdfbab2a 100755
--- a/tests/generic/132
+++ b/tests/generic/132
@@ -13,8 +13,6 @@ _begin_fstest pattern auto
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 
diff --git a/tests/generic/133 b/tests/generic/133
index c1c7c34a..3ed1bfc6 100755
--- a/tests/generic/133
+++ b/tests/generic/133
@@ -12,8 +12,6 @@ _begin_fstest rw auto
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_odirect
 
diff --git a/tests/generic/134 b/tests/generic/134
index 58b81872..1d5627af 100755
--- a/tests/generic/134
+++ b/tests/generic/134
@@ -26,7 +26,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 
 testdir=$TEST_DIR/test-$seq
diff --git a/tests/generic/135 b/tests/generic/135
index dc7593d5..30c52af7 100755
--- a/tests/generic/135
+++ b/tests/generic/135
@@ -12,8 +12,6 @@ _begin_fstest metadata auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_odirect
 _require_scratch
diff --git a/tests/generic/136 b/tests/generic/136
index c5b80074..d88fb1dd 100755
--- a/tests/generic/136
+++ b/tests/generic/136
@@ -26,7 +26,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_dedupe
 
 testdir=$TEST_DIR/test-$seq
diff --git a/tests/generic/137 b/tests/generic/137
index 18644d9d..6d87ce33 100755
--- a/tests/generic/137
+++ b/tests/generic/137
@@ -26,7 +26,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_test_dedupe
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/138 b/tests/generic/138
index d061ac34..f51257d7 100755
--- a/tests/generic/138
+++ b/tests/generic/138
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_cp_reflink
 
diff --git a/tests/generic/139 b/tests/generic/139
index 3eb1519d..ea951705 100755
--- a/tests/generic/139
+++ b/tests/generic/139
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_cp_reflink
 _require_odirect 512
diff --git a/tests/generic/140 b/tests/generic/140
index 52cf07dc..8cbc23bb 100755
--- a/tests/generic/140
+++ b/tests/generic/140
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_cp_reflink
 
diff --git a/tests/generic/141 b/tests/generic/141
index 206ccca9..d6fab33f 100755
--- a/tests/generic/141
+++ b/tests/generic/141
@@ -12,8 +12,6 @@ _begin_fstest rw auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _scratch_mkfs >/dev/null 2>&1
diff --git a/tests/generic/142 b/tests/generic/142
index 17d6b792..4846c822 100755
--- a/tests/generic/142
+++ b/tests/generic/142
@@ -25,7 +25,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_cp_reflink
 
diff --git a/tests/generic/143 b/tests/generic/143
index f9be9afe..ce4e22dc 100755
--- a/tests/generic/143
+++ b/tests/generic/143
@@ -25,7 +25,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_cp_reflink
 _require_odirect
diff --git a/tests/generic/144 b/tests/generic/144
index 4daaeae0..158c6b0f 100755
--- a/tests/generic/144
+++ b/tests/generic/144
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_cp_reflink
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/145 b/tests/generic/145
index f213f53b..f9f179ef 100755
--- a/tests/generic/145
+++ b/tests/generic/145
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_cp_reflink
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/146 b/tests/generic/146
index d0953fda..5fbb011d 100755
--- a/tests/generic/146
+++ b/tests/generic/146
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_cp_reflink
 _require_xfs_io_command "fpunch"
diff --git a/tests/generic/147 b/tests/generic/147
index 11380094..e1ac9621 100755
--- a/tests/generic/147
+++ b/tests/generic/147
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_cp_reflink
 _require_xfs_io_command "finsert"
diff --git a/tests/generic/148 b/tests/generic/148
index 1b321821..c0a523d5 100755
--- a/tests/generic/148
+++ b/tests/generic/148
@@ -25,7 +25,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_cp_reflink
 _require_xfs_io_command "truncate"
diff --git a/tests/generic/149 b/tests/generic/149
index 108f1368..594f72a8 100755
--- a/tests/generic/149
+++ b/tests/generic/149
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_cp_reflink
 _require_xfs_io_command "fzero"
diff --git a/tests/generic/150 b/tests/generic/150
index 2830dd26..159a53c4 100755
--- a/tests/generic/150
+++ b/tests/generic/150
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_cp_reflink
 
diff --git a/tests/generic/151 b/tests/generic/151
index dd5bd64e..a335b927 100755
--- a/tests/generic/151
+++ b/tests/generic/151
@@ -27,7 +27,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_cp_reflink
 
diff --git a/tests/generic/152 b/tests/generic/152
index 8ee353c5..8d87dbac 100755
--- a/tests/generic/152
+++ b/tests/generic/152
@@ -27,7 +27,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_cp_reflink
 _require_xfs_io_command "fpunch"
diff --git a/tests/generic/153 b/tests/generic/153
index 342959fd..2945dfc6 100755
--- a/tests/generic/153
+++ b/tests/generic/153
@@ -27,7 +27,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_cp_reflink
 _require_xfs_io_command "fcollapse"
diff --git a/tests/generic/154 b/tests/generic/154
index 41d63863..ae5e56e0 100755
--- a/tests/generic/154
+++ b/tests/generic/154
@@ -27,7 +27,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_cp_reflink
 
diff --git a/tests/generic/155 b/tests/generic/155
index 1ee04c67..09ea8ed2 100755
--- a/tests/generic/155
+++ b/tests/generic/155
@@ -29,7 +29,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_cp_reflink
 _require_xfs_io_command "fzero"
diff --git a/tests/generic/156 b/tests/generic/156
index df0d0a74..fc29df36 100755
--- a/tests/generic/156
+++ b/tests/generic/156
@@ -34,7 +34,6 @@ _cleanup()
 . ./common/attr
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_cp_reflink
 _require_xfs_io_command "funshare"
diff --git a/tests/generic/157 b/tests/generic/157
index 4d5e3cfe..cb914367 100755
--- a/tests/generic/157
+++ b/tests/generic/157
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/attr
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_scratch_reflink
 _require_mknod
diff --git a/tests/generic/158 b/tests/generic/158
index b9955265..171d3c0d 100755
--- a/tests/generic/158
+++ b/tests/generic/158
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/attr
 . ./common/reflink
 
-# real QA test starts here
 _require_test_dedupe
 _require_scratch_dedupe
 _require_mknod
diff --git a/tests/generic/159 b/tests/generic/159
index 725671ff..c4dec17c 100755
--- a/tests/generic/159
+++ b/tests/generic/159
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/attr
 . ./common/reflink
 
-# real QA test starts here
 _require_chattr i
 _require_test_reflink
 
diff --git a/tests/generic/160 b/tests/generic/160
index f83c815d..fc7a161e 100755
--- a/tests/generic/160
+++ b/tests/generic/160
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/attr
 . ./common/reflink
 
-# real QA test starts here
 _require_chattr i
 _require_test_dedupe
 
diff --git a/tests/generic/161 b/tests/generic/161
index 44d3d8f0..4be8ffac 100755
--- a/tests/generic/161
+++ b/tests/generic/161
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 
diff --git a/tests/generic/162 b/tests/generic/162
index 7b625e86..e23014f0 100755
--- a/tests/generic/162
+++ b/tests/generic/162
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_dedupe
 
 echo "Format and mount"
diff --git a/tests/generic/163 b/tests/generic/163
index 91da69d3..51a00e4b 100755
--- a/tests/generic/163
+++ b/tests/generic/163
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_dedupe
 
 echo "Format and mount"
diff --git a/tests/generic/164 b/tests/generic/164
index 8ab71c72..e5c8acd0 100755
--- a/tests/generic/164
+++ b/tests/generic/164
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 
diff --git a/tests/generic/165 b/tests/generic/165
index 6deb6623..0e565eb1 100755
--- a/tests/generic/165
+++ b/tests/generic/165
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_odirect
diff --git a/tests/generic/166 b/tests/generic/166
index 0eb2ec9c..16157571 100755
--- a/tests/generic/166
+++ b/tests/generic/166
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_odirect
diff --git a/tests/generic/167 b/tests/generic/167
index ae5fa5eb..0c3e20fe 100755
--- a/tests/generic/167
+++ b/tests/generic/167
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 
diff --git a/tests/generic/168 b/tests/generic/168
index bdc8f7a0..bd9859f7 100755
--- a/tests/generic/168
+++ b/tests/generic/168
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 
 echo "Format and mount"
diff --git a/tests/generic/169 b/tests/generic/169
index ea4c4d09..47bfa08a 100755
--- a/tests/generic/169
+++ b/tests/generic/169
@@ -21,8 +21,6 @@ _show_wrote_and_stat_only()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 
diff --git a/tests/generic/170 b/tests/generic/170
index 593cfbb7..35b278b9 100755
--- a/tests/generic/170
+++ b/tests/generic/170
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_odirect
 
diff --git a/tests/generic/171 b/tests/generic/171
index fb2a6f14..dd56aa79 100755
--- a/tests/generic/171
+++ b/tests/generic/171
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/attr
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 
diff --git a/tests/generic/172 b/tests/generic/172
index ab5122fa..c23a1228 100755
--- a/tests/generic/172
+++ b/tests/generic/172
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/attr
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 
diff --git a/tests/generic/173 b/tests/generic/173
index 0eb313e2..8df3c6df 100755
--- a/tests/generic/173
+++ b/tests/generic/173
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/attr
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 
diff --git a/tests/generic/174 b/tests/generic/174
index 1505453e..b9c29207 100755
--- a/tests/generic/174
+++ b/tests/generic/174
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/attr
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_odirect
diff --git a/tests/generic/175 b/tests/generic/175
index f827beb6..01d9d6d1 100755
--- a/tests/generic/175
+++ b/tests/generic/175
@@ -14,7 +14,6 @@ _begin_fstest auto clone
 . ./common/attr
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 
diff --git a/tests/generic/176 b/tests/generic/176
index 8d02c875..cb46213a 100755
--- a/tests/generic/176
+++ b/tests/generic/176
@@ -14,7 +14,6 @@ _begin_fstest auto clone punch
 . ./common/attr
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fpunch"
diff --git a/tests/generic/177 b/tests/generic/177
index ff55a79f..7a4fc776 100755
--- a/tests/generic/177
+++ b/tests/generic/177
@@ -26,8 +26,6 @@ _cleanup()
 . ./common/punch
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_xfs_io_command "fpunch"
 _require_xfs_io_command "fiemap"
diff --git a/tests/generic/178 b/tests/generic/178
index 9efb79aa..46c015a3 100755
--- a/tests/generic/178
+++ b/tests/generic/178
@@ -20,7 +20,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_cp_reflink
 _require_xfs_io_command "fpunch"
diff --git a/tests/generic/179 b/tests/generic/179
index d22eb714..e5527e27 100755
--- a/tests/generic/179
+++ b/tests/generic/179
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_cp_reflink
 _require_xfs_io_command "fpunch"
diff --git a/tests/generic/180 b/tests/generic/180
index b271ef3e..ecbee826 100755
--- a/tests/generic/180
+++ b/tests/generic/180
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_cp_reflink
 _require_xfs_io_command "fzero"
diff --git a/tests/generic/181 b/tests/generic/181
index 5e5883df..7b457585 100755
--- a/tests/generic/181
+++ b/tests/generic/181
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_cp_reflink
 
diff --git a/tests/generic/182 b/tests/generic/182
index 172f644a..cabc9ddc 100755
--- a/tests/generic/182
+++ b/tests/generic/182
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_dedupe
 
 testdir=$TEST_DIR/test-$seq
diff --git a/tests/generic/183 b/tests/generic/183
index c8614514..02d23d83 100755
--- a/tests/generic/183
+++ b/tests/generic/183
@@ -26,7 +26,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_odirect
 
diff --git a/tests/generic/184 b/tests/generic/184
index 9e8263e8..c82876d9 100755
--- a/tests/generic/184
+++ b/tests/generic/184
@@ -12,8 +12,6 @@ _begin_fstest metadata auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_mknod
 
diff --git a/tests/generic/185 b/tests/generic/185
index 75dbc6b8..42dd6fd8 100755
--- a/tests/generic/185
+++ b/tests/generic/185
@@ -26,7 +26,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 
 echo "Format and mount"
diff --git a/tests/generic/186 b/tests/generic/186
index 5f6959a7..1edab895 100755
--- a/tests/generic/186
+++ b/tests/generic/186
@@ -28,7 +28,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/187 b/tests/generic/187
index e9b37399..2a06aff3 100755
--- a/tests/generic/187
+++ b/tests/generic/187
@@ -28,7 +28,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 
 # btrfs can't fragment free space. This test is unreliable on NFS, as it
 # depends on the exported filesystem.
diff --git a/tests/generic/188 b/tests/generic/188
index 4a6346a7..53fde383 100755
--- a/tests/generic/188
+++ b/tests/generic/188
@@ -25,7 +25,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 _require_odirect
diff --git a/tests/generic/189 b/tests/generic/189
index 262ae671..f8e1e093 100755
--- a/tests/generic/189
+++ b/tests/generic/189
@@ -25,7 +25,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/190 b/tests/generic/190
index d95f071a..8369fb79 100755
--- a/tests/generic/190
+++ b/tests/generic/190
@@ -25,7 +25,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 _require_odirect
diff --git a/tests/generic/191 b/tests/generic/191
index 49d31dbc..6a67e6a2 100755
--- a/tests/generic/191
+++ b/tests/generic/191
@@ -25,7 +25,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/192 b/tests/generic/192
index 28254866..82e529fd 100755
--- a/tests/generic/192
+++ b/tests/generic/192
@@ -19,9 +19,7 @@ _access_time()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs generic
 _require_test
 _require_atime
 delay=5
diff --git a/tests/generic/193 b/tests/generic/193
index e2710b07..d251d3a5 100755
--- a/tests/generic/193
+++ b/tests/generic/193
@@ -46,8 +46,6 @@ _filter_files()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_user
diff --git a/tests/generic/194 b/tests/generic/194
index 93dc4778..ea3a248c 100755
--- a/tests/generic/194
+++ b/tests/generic/194
@@ -26,7 +26,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_scratch_delalloc
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/195 b/tests/generic/195
index 1262b185..fe944a7c 100755
--- a/tests/generic/195
+++ b/tests/generic/195
@@ -26,7 +26,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_scratch_delalloc
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/196 b/tests/generic/196
index e02ee24a..249202ae 100755
--- a/tests/generic/196
+++ b/tests/generic/196
@@ -25,7 +25,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 _require_odirect
diff --git a/tests/generic/197 b/tests/generic/197
index a057cac4..13469af7 100755
--- a/tests/generic/197
+++ b/tests/generic/197
@@ -25,7 +25,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/198 b/tests/generic/198
index 3c216c5d..6b457706 100755
--- a/tests/generic/198
+++ b/tests/generic/198
@@ -13,13 +13,11 @@ _begin_fstest auto aio quick
 # Import common functions.
 . ./common/filter
 
-_supported_fs generic
 _require_aiodio aiodio_sparse2
 _require_test
 
 echo "Silence is golden."
 
-# real QA test starts here
 
 rm -f "$TEST_DIR/aiodio_sparse*"
 $AIO_TEST "$TEST_DIR/aiodio_sparse"
diff --git a/tests/generic/199 b/tests/generic/199
index e20a2e28..859ed94a 100755
--- a/tests/generic/199
+++ b/tests/generic/199
@@ -29,7 +29,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_scratch_delalloc
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/200 b/tests/generic/200
index 3cd90aa4..565dc4c4 100755
--- a/tests/generic/200
+++ b/tests/generic/200
@@ -29,7 +29,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_scratch_delalloc
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/201 b/tests/generic/201
index faf168b2..24e6f68d 100755
--- a/tests/generic/201
+++ b/tests/generic/201
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/202 b/tests/generic/202
index 05354450..841fabf8 100755
--- a/tests/generic/202
+++ b/tests/generic/202
@@ -20,7 +20,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 
diff --git a/tests/generic/203 b/tests/generic/203
index b51969c8..0b61d777 100755
--- a/tests/generic/203
+++ b/tests/generic/203
@@ -20,7 +20,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_odirect
diff --git a/tests/generic/204 b/tests/generic/204
index a33a090f..9ef54e23 100755
--- a/tests/generic/204
+++ b/tests/generic/204
@@ -19,8 +19,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 
diff --git a/tests/generic/205 b/tests/generic/205
index 0412110c..0c385a98 100755
--- a/tests/generic/205
+++ b/tests/generic/205
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 
 pagesz=$(getconf PAGE_SIZE)
diff --git a/tests/generic/206 b/tests/generic/206
index 073fe48e..5e305d19 100755
--- a/tests/generic/206
+++ b/tests/generic/206
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_odirect
 
diff --git a/tests/generic/207 b/tests/generic/207
index a939d0be..7274ef1d 100755
--- a/tests/generic/207
+++ b/tests/generic/207
@@ -12,9 +12,7 @@ _begin_fstest auto aio quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs generic
 _require_test
 
 _run_aiodio aio-dio-extend-stat
diff --git a/tests/generic/208 b/tests/generic/208
index c5c171fa..dfddf66a 100755
--- a/tests/generic/208
+++ b/tests/generic/208
@@ -12,9 +12,7 @@ _begin_fstest auto aio
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs generic
 _require_test
 
 _run_aiodio aio-dio-invalidate-failure
diff --git a/tests/generic/209 b/tests/generic/209
index 6625a28c..0a64bd3a 100755
--- a/tests/generic/209
+++ b/tests/generic/209
@@ -12,9 +12,7 @@ _begin_fstest auto aio
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs generic
 _require_test
 
 _run_aiodio aio-dio-invalidate-readahead
diff --git a/tests/generic/210 b/tests/generic/210
index 1504809d..c5e86071 100755
--- a/tests/generic/210
+++ b/tests/generic/210
@@ -12,9 +12,7 @@ _begin_fstest auto aio quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs generic
 _require_test
 
 _run_aiodio aio-dio-subblock-eof-read
diff --git a/tests/generic/211 b/tests/generic/211
index 02edd22e..9868c600 100755
--- a/tests/generic/211
+++ b/tests/generic/211
@@ -12,9 +12,7 @@ _begin_fstest auto aio quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs generic
 _require_test
 
 _run_aiodio aio-free-ring-with-bogus-nr-pages
diff --git a/tests/generic/212 b/tests/generic/212
index 71e2724e..70900cc4 100755
--- a/tests/generic/212
+++ b/tests/generic/212
@@ -13,9 +13,7 @@ _begin_fstest auto aio quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs generic
 _require_test
 
 _run_aiodio aio-io-setup-with-nonwritable-context-pointer
diff --git a/tests/generic/213 b/tests/generic/213
index ad52fbb1..7744d346 100755
--- a/tests/generic/213
+++ b/tests/generic/213
@@ -17,9 +17,7 @@ tmp=$TEST_DIR/$$
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 # generic, but xfs_io's fallocate must work
-_supported_fs generic
 # only Linux supports fallocate
 
 [ -n "$XFS_IO_PROG" ] || _notrun "xfs_io executable not found"
diff --git a/tests/generic/214 b/tests/generic/214
index 34aa3a49..2543002c 100755
--- a/tests/generic/214
+++ b/tests/generic/214
@@ -22,9 +22,7 @@ tmp=$TEST_DIR/$$
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 # generic, but xfs_io's fallocate must work
-_supported_fs generic
 # only Linux supports fallocate
 _require_test
 
diff --git a/tests/generic/215 b/tests/generic/215
index fc3b8cef..6f51b26a 100755
--- a/tests/generic/215
+++ b/tests/generic/215
@@ -21,8 +21,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 
 testfile=$TEST_DIR/tst.mmap
diff --git a/tests/generic/216 b/tests/generic/216
index 2e40173d..7bfcdba9 100755
--- a/tests/generic/216
+++ b/tests/generic/216
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/217 b/tests/generic/217
index a5a8b35f..359aa2eb 100755
--- a/tests/generic/217
+++ b/tests/generic/217
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 _require_odirect
diff --git a/tests/generic/218 b/tests/generic/218
index 3e6bd18a..6a187f28 100755
--- a/tests/generic/218
+++ b/tests/generic/218
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/219 b/tests/generic/219
index 71da25e3..940b902e 100755
--- a/tests/generic/219
+++ b/tests/generic/219
@@ -14,8 +14,6 @@ _begin_fstest auto quota quick
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_quota
 _require_user
@@ -78,7 +76,6 @@ test_accounting()
 	repquota -$type $SCRATCH_MNT | grep "^$id" | check_usage 144 3
 }
 
-# real QA test starts here
 
 _scratch_unmount 2>/dev/null
 _scratch_mkfs >> $seqres.full 2>&1
diff --git a/tests/generic/220 b/tests/generic/220
index f3a53565..a263bebf 100755
--- a/tests/generic/220
+++ b/tests/generic/220
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 _require_odirect
diff --git a/tests/generic/221 b/tests/generic/221
index 1fb44273..7425f85f 100755
--- a/tests/generic/221
+++ b/tests/generic/221
@@ -14,8 +14,6 @@ _begin_fstest auto metadata quick
 
 # Import common functions.
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 
 echo "Silence is golden."
diff --git a/tests/generic/222 b/tests/generic/222
index bdb5bb1e..3a4d5aa4 100755
--- a/tests/generic/222
+++ b/tests/generic/222
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/223 b/tests/generic/223
index 0fb07e12..ccb17592 100755
--- a/tests/generic/223
+++ b/tests/generic/223
@@ -12,8 +12,6 @@ _begin_fstest auto quick prealloc
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/224 b/tests/generic/224
index 26055ea2..46ff512c 100755
--- a/tests/generic/224
+++ b/tests/generic/224
@@ -24,8 +24,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 
diff --git a/tests/generic/225 b/tests/generic/225
index a996889e..4f4f1353 100755
--- a/tests/generic/225
+++ b/tests/generic/225
@@ -12,8 +12,6 @@ _begin_fstest auto quick fiemap
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_odirect
 _require_xfs_io_command "fiemap"
diff --git a/tests/generic/226 b/tests/generic/226
index 34434730..5553b898 100755
--- a/tests/generic/226
+++ b/tests/generic/226
@@ -11,11 +11,9 @@ _begin_fstest auto enospc
 
 # Import common functions.
 
-_supported_fs generic
 _require_scratch
 _require_odirect
 
-# real QA test starts here
 
 _scratch_unmount 2>/dev/null
 echo "--> mkfs 256m filesystem"
diff --git a/tests/generic/227 b/tests/generic/227
index e7708db9..ec694317 100755
--- a/tests/generic/227
+++ b/tests/generic/227
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 _require_odirect
diff --git a/tests/generic/228 b/tests/generic/228
index 92338982..f1881f84 100755
--- a/tests/generic/228
+++ b/tests/generic/228
@@ -25,9 +25,7 @@ _register_cleanup "_cleanup" 25
 
 # Import common functions.
 
-# real QA test starts here
 # generic, but xfs_io's fallocate must work
-_supported_fs generic
 # only Linux supports fallocate
 _require_test
 
diff --git a/tests/generic/229 b/tests/generic/229
index c5c94184..120f031b 100755
--- a/tests/generic/229
+++ b/tests/generic/229
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/230 b/tests/generic/230
index e49e0da2..ba95fbe7 100755
--- a/tests/generic/230
+++ b/tests/generic/230
@@ -14,8 +14,6 @@ _begin_fstest auto quota quick
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_quota
 _require_user
@@ -94,7 +92,6 @@ cleanup_files()
 	rm -f $SCRATCH_MNT/file{1,2,3,4,5,6}
 }
 
-# real QA test starts here
 
 grace=2
 
diff --git a/tests/generic/231 b/tests/generic/231
index c2216659..ef3ea45d 100755
--- a/tests/generic/231
+++ b/tests/generic/231
@@ -40,8 +40,6 @@ _fsx()
 	return 0
 }
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_quota
 _require_user
diff --git a/tests/generic/232 b/tests/generic/232
index 4789de1e..35934cc1 100755
--- a/tests/generic/232
+++ b/tests/generic/232
@@ -41,8 +41,6 @@ _fsstress()
 	fi
 }
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_quota
 
diff --git a/tests/generic/233 b/tests/generic/233
index 358439d0..b4c804ff 100755
--- a/tests/generic/233
+++ b/tests/generic/233
@@ -51,8 +51,6 @@ _fsstress()
 	fi
 }
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_quota
 _require_user
diff --git a/tests/generic/234 b/tests/generic/234
index 8f127bb5..4b25fc65 100755
--- a/tests/generic/234
+++ b/tests/generic/234
@@ -61,12 +61,9 @@ test_setting()
 	echo "### done with testing"
 }
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_quota
 
-# real QA test starts here
 
 _scratch_mkfs >> $seqres.full 2>&1
 _scratch_mount "-o usrquota,grpquota"
diff --git a/tests/generic/235 b/tests/generic/235
index 813f268a..037c29e8 100755
--- a/tests/generic/235
+++ b/tests/generic/235
@@ -14,8 +14,6 @@ _begin_fstest auto quota quick
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_quota
 _require_user
@@ -25,7 +23,6 @@ do_repquota()
 	repquota -u -g $SCRATCH_MNT  | grep -v -E '^root|^$' | _filter_scratch
 }
 
-# real QA test starts here
 
 _scratch_mkfs >> $seqres.full 2>&1
 _scratch_mount "-o usrquota,grpquota"
diff --git a/tests/generic/236 b/tests/generic/236
index 76e2810c..f96f6bc4 100755
--- a/tests/generic/236
+++ b/tests/generic/236
@@ -18,8 +18,6 @@ _cleanup()
 
 # Import common functions.
 
-# real QA test starts here
-_supported_fs generic
 _require_hardlinks
 _require_test
 
diff --git a/tests/generic/237 b/tests/generic/237
index a12a4259..266b3d69 100755
--- a/tests/generic/237
+++ b/tests/generic/237
@@ -22,8 +22,6 @@ _cleanup()
 	[ -n "$TEST_DIR" ] && rm -rf $TEST_DIR/$seq.dir1
 }
 
-# real QA test starts here
-_supported_fs generic
 # only Linux supports fallocate
 _require_test
 _require_runas
diff --git a/tests/generic/238 b/tests/generic/238
index c8d12c19..4401a78a 100755
--- a/tests/generic/238
+++ b/tests/generic/238
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 _require_odirect
diff --git a/tests/generic/239 b/tests/generic/239
index dca2e16a..82b31e7e 100755
--- a/tests/generic/239
+++ b/tests/generic/239
@@ -20,7 +20,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-_supported_fs generic
 
 _require_test
 _require_sparse_files
diff --git a/tests/generic/240 b/tests/generic/240
index 27b5119e..a333873e 100755
--- a/tests/generic/240
+++ b/tests/generic/240
@@ -19,7 +19,6 @@ _begin_fstest auto aio quick rw
 # Import common functions.
 . ./common/filter
 
-_supported_fs generic
 
 _require_test
 _require_sparse_files
@@ -27,7 +26,6 @@ _require_aiodio aiodio_sparse2
 
 echo "Silence is golden."
 
-# real QA test starts here
 
 rm -f $TEST_DIR/aiodio_sparse
 
diff --git a/tests/generic/241 b/tests/generic/241
index 8abb525e..d4bb5600 100755
--- a/tests/generic/241
+++ b/tests/generic/241
@@ -14,14 +14,12 @@ _begin_fstest auto
 # Import common functions.
 . ./common/filter
 
-_supported_fs generic
 _require_test
 
 [ "$DBENCH_PROG" = "" ] && _notrun "dbench not found"
 
 echo "Silence is golden."
 
-# real QA test starts here
 
 rm -rf $TEST_DIR/dbench
 mkdir $TEST_DIR/dbench
diff --git a/tests/generic/242 b/tests/generic/242
index b6fd2490..b736763f 100755
--- a/tests/generic/242
+++ b/tests/generic/242
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 
diff --git a/tests/generic/243 b/tests/generic/243
index ca548e40..da4e22f5 100755
--- a/tests/generic/243
+++ b/tests/generic/243
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_odirect
diff --git a/tests/generic/244 b/tests/generic/244
index 50415077..b6803512 100755
--- a/tests/generic/244
+++ b/tests/generic/244
@@ -23,9 +23,7 @@ _cleanup()
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
 
-_supported_fs generic
 _require_quota
 _require_scratch
 
diff --git a/tests/generic/245 b/tests/generic/245
index 81ce4d4e..0bb2da05 100755
--- a/tests/generic/245
+++ b/tests/generic/245
@@ -14,8 +14,6 @@ _begin_fstest auto quick dir
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 
 dir=$TEST_DIR/test-mv
diff --git a/tests/generic/246 b/tests/generic/246
index 4d474cd2..ee5afac6 100755
--- a/tests/generic/246
+++ b/tests/generic/246
@@ -15,8 +15,6 @@ _begin_fstest auto quick rw
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 
 file=$TEST_DIR/mmap-writev
diff --git a/tests/generic/247 b/tests/generic/247
index becc89e7..47ff5c34 100755
--- a/tests/generic/247
+++ b/tests/generic/247
@@ -22,10 +22,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 
 # this test leaves a 512MB file around if we abort the test during the run via a
diff --git a/tests/generic/248 b/tests/generic/248
index 3c127a87..49089534 100755
--- a/tests/generic/248
+++ b/tests/generic/248
@@ -19,10 +19,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 
 TESTFILE=$TEST_DIR/test_file
diff --git a/tests/generic/249 b/tests/generic/249
index 61fcaf90..560fdf71 100755
--- a/tests/generic/249
+++ b/tests/generic/249
@@ -20,8 +20,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 
 echo "Feel the serenity."
diff --git a/tests/generic/250 b/tests/generic/250
index 97e9522f..196a34bb 100755
--- a/tests/generic/250
+++ b/tests/generic/250
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmerror
 
-# real QA test starts here
 _require_scratch
 _require_dm_target error
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/251 b/tests/generic/251
index b7a15f91..b432fb11 100755
--- a/tests/generic/251
+++ b/tests/generic/251
@@ -21,8 +21,6 @@ mypid=$$
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _scratch_mkfs >/dev/null 2>&1
 _scratch_mount
diff --git a/tests/generic/252 b/tests/generic/252
index 8c5adb53..39fa5531 100755
--- a/tests/generic/252
+++ b/tests/generic/252
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmerror
 
-# real QA test starts here
 _require_scratch
 _require_dm_target error
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/253 b/tests/generic/253
index 7d09dd06..d1a79a3e 100755
--- a/tests/generic/253
+++ b/tests/generic/253
@@ -16,7 +16,6 @@ _begin_fstest auto quick clone
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "truncate"
diff --git a/tests/generic/254 b/tests/generic/254
index e0e29da6..5f50b988 100755
--- a/tests/generic/254
+++ b/tests/generic/254
@@ -16,7 +16,6 @@ _begin_fstest auto quick clone punch
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fpunch"
diff --git a/tests/generic/255 b/tests/generic/255
index 39efb6b2..902ca2ef 100755
--- a/tests/generic/255
+++ b/tests/generic/255
@@ -13,9 +13,6 @@ _begin_fstest auto quick prealloc punch fiemap
 . ./common/filter
 . ./common/punch
 
-# real QA test starts here
-_supported_fs generic 
-
 _require_test
 _require_xfs_io_command "fpunch"
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/256 b/tests/generic/256
index ea6cc293..fe8be022 100755
--- a/tests/generic/256
+++ b/tests/generic/256
@@ -14,8 +14,6 @@ _begin_fstest auto quick punch
 . ./common/filter
 . ./common/punch
 
-# real QA test starts here
-_supported_fs generic
 
 _require_xfs_io_command "fpunch"
 _require_scratch
diff --git a/tests/generic/257 b/tests/generic/257
index 4faa2594..93055cb8 100755
--- a/tests/generic/257
+++ b/tests/generic/257
@@ -18,8 +18,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 
 mkdir $TEST_DIR/ttt
diff --git a/tests/generic/258 b/tests/generic/258
index 979889e2..9e08efb7 100755
--- a/tests/generic/258
+++ b/tests/generic/258
@@ -13,8 +13,6 @@ _begin_fstest auto quick bigtime
 
 # Import common functions.
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_negative_timestamps
 
diff --git a/tests/generic/259 b/tests/generic/259
index 46746c9f..7d202c5f 100755
--- a/tests/generic/259
+++ b/tests/generic/259
@@ -16,7 +16,6 @@ _begin_fstest auto quick clone zero
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fzero"
diff --git a/tests/generic/260 b/tests/generic/260
index 08fde468..b8597778 100755
--- a/tests/generic/260
+++ b/tests/generic/260
@@ -17,8 +17,6 @@ mypid=$$
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_math
 
 _require_scratch
diff --git a/tests/generic/261 b/tests/generic/261
index 93c1c349..1762e24d 100755
--- a/tests/generic/261
+++ b/tests/generic/261
@@ -16,7 +16,6 @@ _begin_fstest auto quick clone collapse
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fcollapse"
diff --git a/tests/generic/262 b/tests/generic/262
index 46e88f87..dfac679b 100755
--- a/tests/generic/262
+++ b/tests/generic/262
@@ -16,7 +16,6 @@ _begin_fstest auto quick clone insert
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "finsert"
diff --git a/tests/generic/263 b/tests/generic/263
index f4d29055..62eaec1d 100755
--- a/tests/generic/263
+++ b/tests/generic/263
@@ -12,8 +12,6 @@ _begin_fstest rw auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_odirect
 
diff --git a/tests/generic/264 b/tests/generic/264
index 1a7ccc84..593fbf50 100755
--- a/tests/generic/264
+++ b/tests/generic/264
@@ -16,7 +16,6 @@ _begin_fstest auto quick clone unshare
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "funshare"
diff --git a/tests/generic/265 b/tests/generic/265
index 8d0aab9a..3c84e2a8 100755
--- a/tests/generic/265
+++ b/tests/generic/265
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/reflink
 . ./common/dmerror
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_dm_target error
diff --git a/tests/generic/266 b/tests/generic/266
index 5438f0d4..d5675afb 100755
--- a/tests/generic/266
+++ b/tests/generic/266
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/reflink
 . ./common/dmerror
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_dm_target error
diff --git a/tests/generic/267 b/tests/generic/267
index 5a03957d..ddaf1064 100755
--- a/tests/generic/267
+++ b/tests/generic/267
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/reflink
 . ./common/dmerror
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_dm_target error
diff --git a/tests/generic/268 b/tests/generic/268
index 659fb80a..c6068cf4 100755
--- a/tests/generic/268
+++ b/tests/generic/268
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/reflink
 . ./common/dmerror
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_dm_target error
diff --git a/tests/generic/269 b/tests/generic/269
index 29f45373..341fcd22 100755
--- a/tests/generic/269
+++ b/tests/generic/269
@@ -38,8 +38,6 @@ _workout()
 	wait $pid
 }
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 
 _scratch_mkfs_sized $((512 * 1024 * 1024)) >> $seqres.full 2>&1
diff --git a/tests/generic/270 b/tests/generic/270
index e7329c2f..cf523f4e 100755
--- a/tests/generic/270
+++ b/tests/generic/270
@@ -52,8 +52,6 @@ _workout()
 	$KILLALL_PROG -w $tmp.fsstress.bin
 }
 
-# real QA test starts here
-_supported_fs generic
 _require_quota
 _require_user
 _require_scratch
diff --git a/tests/generic/271 b/tests/generic/271
index b77eed91..ce647d15 100755
--- a/tests/generic/271
+++ b/tests/generic/271
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/reflink
 . ./common/dmerror
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_dm_target error
diff --git a/tests/generic/272 b/tests/generic/272
index 3b817cd8..3d2cace9 100755
--- a/tests/generic/272
+++ b/tests/generic/272
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/reflink
 . ./common/dmerror
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_dm_target error
diff --git a/tests/generic/273 b/tests/generic/273
index 54c19996..e0ee0483 100755
--- a/tests/generic/273
+++ b/tests/generic/273
@@ -116,8 +116,6 @@ _do_workload()
 	wait $_pids
 }
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 
 echo "------------------------------"
diff --git a/tests/generic/274 b/tests/generic/274
index 8c0e420e..d526a9b7 100755
--- a/tests/generic/274
+++ b/tests/generic/274
@@ -25,8 +25,6 @@ _cleanup()
 
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_xfs_io_command "falloc" "-k"
 
diff --git a/tests/generic/275 b/tests/generic/275
index f3b05409..57de69b8 100755
--- a/tests/generic/275
+++ b/tests/generic/275
@@ -21,8 +21,6 @@ _cleanup()
 
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 
 # This test requires specific data space usage, skip if we have compression
diff --git a/tests/generic/276 b/tests/generic/276
index e304b3f1..3c3e75df 100755
--- a/tests/generic/276
+++ b/tests/generic/276
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/reflink
 . ./common/dmerror
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_dm_target error
diff --git a/tests/generic/277 b/tests/generic/277
index 79203327..1bf11fd7 100755
--- a/tests/generic/277
+++ b/tests/generic/277
@@ -19,8 +19,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_chattr A
 
diff --git a/tests/generic/278 b/tests/generic/278
index 8de74bf7..5d9778f9 100755
--- a/tests/generic/278
+++ b/tests/generic/278
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/reflink
 . ./common/dmerror
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_dm_target error
diff --git a/tests/generic/279 b/tests/generic/279
index 6d1ab0f2..f4dac950 100755
--- a/tests/generic/279
+++ b/tests/generic/279
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/reflink
 . ./common/dmerror
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_dm_target error
diff --git a/tests/generic/280 b/tests/generic/280
index 8e1ae4d2..3108fd23 100755
--- a/tests/generic/280
+++ b/tests/generic/280
@@ -29,10 +29,8 @@ _require_scratch
 _require_quota
 _require_freeze
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 
 _scratch_unmount 2>/dev/null
 _scratch_mkfs >> $seqres.full 2>&1
diff --git a/tests/generic/281 b/tests/generic/281
index f5a00de6..6d48c4b1 100755
--- a/tests/generic/281
+++ b/tests/generic/281
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/reflink
 . ./common/dmerror
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_dm_target error
diff --git a/tests/generic/282 b/tests/generic/282
index f085a97e..b3eb4806 100755
--- a/tests/generic/282
+++ b/tests/generic/282
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/reflink
 . ./common/dmerror
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_dm_target error
diff --git a/tests/generic/283 b/tests/generic/283
index ed41c31b..b9104fe6 100755
--- a/tests/generic/283
+++ b/tests/generic/283
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/reflink
 . ./common/dmerror
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_dm_target error
diff --git a/tests/generic/284 b/tests/generic/284
index dc9b8a9d..7a58b015 100755
--- a/tests/generic/284
+++ b/tests/generic/284
@@ -19,7 +19,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/285 b/tests/generic/285
index d1850021..d53bcfd7 100755
--- a/tests/generic/285
+++ b/tests/generic/285
@@ -16,7 +16,6 @@ _begin_fstest auto rw seek
 # Import common functions.
 . ./common/filter
 
-_supported_fs generic
 
 _require_test
 _require_seek_data_hole
diff --git a/tests/generic/286 b/tests/generic/286
index 629cb55b..fe3382f9 100755
--- a/tests/generic/286
+++ b/tests/generic/286
@@ -12,8 +12,6 @@ _begin_fstest auto quick other seek prealloc
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/287 b/tests/generic/287
index 14aea37c..78d55434 100755
--- a/tests/generic/287
+++ b/tests/generic/287
@@ -19,7 +19,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 _require_odirect
diff --git a/tests/generic/288 b/tests/generic/288
index 41eeb216..193608d6 100755
--- a/tests/generic/288
+++ b/tests/generic/288
@@ -15,8 +15,6 @@ status=0
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 
diff --git a/tests/generic/289 b/tests/generic/289
index 3ce234c3..549a7ec5 100755
--- a/tests/generic/289
+++ b/tests/generic/289
@@ -21,7 +21,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/290 b/tests/generic/290
index 13e09878..841fcb8a 100755
--- a/tests/generic/290
+++ b/tests/generic/290
@@ -21,7 +21,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 _require_odirect
diff --git a/tests/generic/291 b/tests/generic/291
index f61ae5a3..a47bfbab 100755
--- a/tests/generic/291
+++ b/tests/generic/291
@@ -21,7 +21,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/292 b/tests/generic/292
index 40566cec..d646d1e5 100755
--- a/tests/generic/292
+++ b/tests/generic/292
@@ -21,7 +21,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 _require_odirect
diff --git a/tests/generic/293 b/tests/generic/293
index 99500b41..3e66de16 100755
--- a/tests/generic/293
+++ b/tests/generic/293
@@ -22,7 +22,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_scratch_delalloc
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/294 b/tests/generic/294
index 408cbd39..54b89a26 100755
--- a/tests/generic/294
+++ b/tests/generic/294
@@ -13,7 +13,6 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # NFS will optimize away the on-the-wire lookup before attempting to
 # create a new file (since that means an extra round trip).
diff --git a/tests/generic/295 b/tests/generic/295
index 7ab95803..3182ec47 100755
--- a/tests/generic/295
+++ b/tests/generic/295
@@ -22,7 +22,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_scratch_delalloc
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/296 b/tests/generic/296
index ab348acf..431d2db5 100755
--- a/tests/generic/296
+++ b/tests/generic/296
@@ -14,7 +14,6 @@ _begin_fstest auto quick clone
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 
diff --git a/tests/generic/297 b/tests/generic/297
index 54c2ac21..317f34f6 100755
--- a/tests/generic/297
+++ b/tests/generic/297
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/attr
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_command "$TIMEOUT_PROG" "timeout"
diff --git a/tests/generic/298 b/tests/generic/298
index 115a9bf7..ba548a2a 100755
--- a/tests/generic/298
+++ b/tests/generic/298
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/attr
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_command "$TIMEOUT_PROG" "timeout"
diff --git a/tests/generic/299 b/tests/generic/299
index 0cd12202..63306681 100755
--- a/tests/generic/299
+++ b/tests/generic/299
@@ -17,8 +17,6 @@ fio_out=$tmp.fio.out
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_scratch
 _require_odirect
diff --git a/tests/generic/300 b/tests/generic/300
index 5ff141d3..2698cf03 100755
--- a/tests/generic/300
+++ b/tests/generic/300
@@ -17,8 +17,6 @@ fio_out=$tmp.fio.out
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_odirect
 _require_aio
diff --git a/tests/generic/301 b/tests/generic/301
index 3f895ff8..0303f25d 100755
--- a/tests/generic/301
+++ b/tests/generic/301
@@ -16,7 +16,6 @@ _begin_fstest auto quick clone fiemap
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fiemap"
diff --git a/tests/generic/302 b/tests/generic/302
index 9c305abe..e6b463f0 100755
--- a/tests/generic/302
+++ b/tests/generic/302
@@ -16,7 +16,6 @@ _begin_fstest auto quick clone fiemap
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fiemap"
diff --git a/tests/generic/303 b/tests/generic/303
index 95679569..908b4a87 100755
--- a/tests/generic/303
+++ b/tests/generic/303
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/attr
 . ./common/reflink
 
-# real QA test starts here
 _require_test_reflink
 _require_cp_reflink
 
diff --git a/tests/generic/304 b/tests/generic/304
index 2261f214..f742b402 100755
--- a/tests/generic/304
+++ b/tests/generic/304
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/attr
 . ./common/reflink
 
-# real QA test starts here
 _require_test_dedupe
 _require_cp_reflink
 
diff --git a/tests/generic/305 b/tests/generic/305
index b46d5127..c89bd821 100755
--- a/tests/generic/305
+++ b/tests/generic/305
@@ -15,7 +15,6 @@ _begin_fstest auto quick clone fiemap
 . ./common/reflink
 . ./common/quota
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fiemap"
diff --git a/tests/generic/306 b/tests/generic/306
index d67185e8..a6ea654b 100755
--- a/tests/generic/306
+++ b/tests/generic/306
@@ -20,10 +20,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch
 _require_test
 _require_symlinks
diff --git a/tests/generic/307 b/tests/generic/307
index c4e213e1..1f00f797 100755
--- a/tests/generic/307
+++ b/tests/generic/307
@@ -29,8 +29,6 @@ _cleanup()
 
 testfile=$SCRATCH_MNT/testfile.$seq
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_acls
 
diff --git a/tests/generic/308 b/tests/generic/308
index 6466d332..8e6cadfb 100755
--- a/tests/generic/308
+++ b/tests/generic/308
@@ -22,8 +22,6 @@ _cleanup()
 
 testfile=$TEST_DIR/testfile.$seq
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 
 echo "Silence is golden"
diff --git a/tests/generic/309 b/tests/generic/309
index bfd3e04f..2701d706 100755
--- a/tests/generic/309
+++ b/tests/generic/309
@@ -26,8 +26,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 
 echo "Silence is golden"
diff --git a/tests/generic/310 b/tests/generic/310
index a71d0ba7..15e87aec 100755
--- a/tests/generic/310
+++ b/tests/generic/310
@@ -35,8 +35,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_command "$KILLALL_PROG" killall
 
diff --git a/tests/generic/311 b/tests/generic/311
index d83da5a4..5d21752f 100755
--- a/tests/generic/311
+++ b/tests/generic/311
@@ -30,8 +30,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_nocheck
 _require_odirect
 _require_dm_target flakey
diff --git a/tests/generic/312 b/tests/generic/312
index 1926deb8..bbf9031e 100755
--- a/tests/generic/312
+++ b/tests/generic/312
@@ -15,8 +15,6 @@ _begin_fstest auto quick prealloc enospc
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_xfs_io_command "falloc"
 _require_scratch
 
diff --git a/tests/generic/313 b/tests/generic/313
index d4b1256d..d76b768f 100755
--- a/tests/generic/313
+++ b/tests/generic/313
@@ -22,8 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 
 testfile=$TEST_DIR/testfile.$seq
diff --git a/tests/generic/314 b/tests/generic/314
index dd617089..5fbc6424 100755
--- a/tests/generic/314
+++ b/tests/generic/314
@@ -12,8 +12,6 @@ _begin_fstest auto quick perms
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_user
 _require_chown
diff --git a/tests/generic/315 b/tests/generic/315
index 3a87d330..83f46655 100755
--- a/tests/generic/315
+++ b/tests/generic/315
@@ -17,10 +17,8 @@ status=0	# success is the default!
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 _require_xfs_io_command "falloc" "-k"
 
diff --git a/tests/generic/316 b/tests/generic/316
index 5b890126..5f1d58a4 100755
--- a/tests/generic/316
+++ b/tests/generic/316
@@ -13,8 +13,6 @@ _begin_fstest auto quick punch fiemap
 . ./common/filter
 . ./common/punch
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_xfs_io_command "fpunch"
diff --git a/tests/generic/317 b/tests/generic/317
index 39cccc8b..177d8852 100755
--- a/tests/generic/317
+++ b/tests/generic/317
@@ -27,8 +27,6 @@ _cleanup()
 
 file=$SCRATCH_MNT/file1
 
-# real QA test starts here
-_supported_fs generic
 # only Linux supports user namespace
 
 [ -x $lstat64 ] || _notrun "$lstat64 executable not found"
diff --git a/tests/generic/318 b/tests/generic/318
index 71ee7666..d31ad2b1 100755
--- a/tests/generic/318
+++ b/tests/generic/318
@@ -29,8 +29,6 @@ _cleanup()
 nsexec=$here/src/nsexec
 file=$SCRATCH_MNT/file1
 
-# real QA test starts here
-_supported_fs generic
 # only Linux supports user namespace
 
 _require_scratch
diff --git a/tests/generic/319 b/tests/generic/319
index 0efb46be..1b3f9356 100755
--- a/tests/generic/319
+++ b/tests/generic/319
@@ -18,8 +18,6 @@ _begin_fstest acl auto quick perms
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs generic
 _require_acls
 _require_scratch
 
diff --git a/tests/generic/320 b/tests/generic/320
index ea65537f..33f0b8ae 100755
--- a/tests/generic/320
+++ b/tests/generic/320
@@ -18,8 +18,6 @@ _begin_fstest auto rw
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 
 threads=100
diff --git a/tests/generic/321 b/tests/generic/321
index e9fc6483..73a89233 100755
--- a/tests/generic/321
+++ b/tests/generic/321
@@ -19,8 +19,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_nocheck
 _require_dm_target flakey
 
diff --git a/tests/generic/322 b/tests/generic/322
index bcdb4882..5cb77cbf 100755
--- a/tests/generic/322
+++ b/tests/generic/322
@@ -19,8 +19,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_nocheck
 _require_dm_target flakey
 
diff --git a/tests/generic/323 b/tests/generic/323
index ffeeae40..457253fe 100755
--- a/tests/generic/323
+++ b/tests/generic/323
@@ -15,9 +15,7 @@ _begin_fstest auto aio stress
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs generic
 _require_test
 
 _require_aiodio aio-last-ref-held-by-io
diff --git a/tests/generic/324 b/tests/generic/324
index 523d1f04..e3fa8fba 100755
--- a/tests/generic/324
+++ b/tests/generic/324
@@ -15,7 +15,6 @@ PIDS=""
 . ./common/filter
 . ./common/defrag
 
-# real QA test starts here
 _require_scratch
 _require_defrag
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/325 b/tests/generic/325
index 0b2d5c6f..8fbd0d1d 100755
--- a/tests/generic/325
+++ b/tests/generic/325
@@ -28,8 +28,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_dm_target flakey
 
diff --git a/tests/generic/326 b/tests/generic/326
index f5c557b3..1783fbf2 100755
--- a/tests/generic/326
+++ b/tests/generic/326
@@ -15,7 +15,6 @@ _begin_fstest auto quick clone fiemap
 . ./common/reflink
 . ./common/quota
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fiemap"
diff --git a/tests/generic/327 b/tests/generic/327
index 92540b19..2323e1e6 100755
--- a/tests/generic/327
+++ b/tests/generic/327
@@ -14,7 +14,6 @@ _begin_fstest auto quick clone fiemap
 . ./common/reflink
 . ./common/quota
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fiemap"
diff --git a/tests/generic/328 b/tests/generic/328
index db7fd3db..0c8e1986 100755
--- a/tests/generic/328
+++ b/tests/generic/328
@@ -14,7 +14,6 @@ _begin_fstest auto quick clone fiemap
 . ./common/reflink
 . ./common/quota
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fiemap"
diff --git a/tests/generic/329 b/tests/generic/329
index c2ba3108..e29a8ca4 100755
--- a/tests/generic/329
+++ b/tests/generic/329
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/reflink
 . ./common/dmerror
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_dm_target error
diff --git a/tests/generic/330 b/tests/generic/330
index 9cd7b8b1..83e1459f 100755
--- a/tests/generic/330
+++ b/tests/generic/330
@@ -20,7 +20,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_aiodio "aiocp"
diff --git a/tests/generic/331 b/tests/generic/331
index 492abedf..c1949e1b 100755
--- a/tests/generic/331
+++ b/tests/generic/331
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/reflink
 . ./common/dmerror
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_dm_target error
diff --git a/tests/generic/332 b/tests/generic/332
index 61147590..4a61e4a0 100755
--- a/tests/generic/332
+++ b/tests/generic/332
@@ -20,7 +20,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_aiodio "aiocp"
diff --git a/tests/generic/333 b/tests/generic/333
index bf1967ce..03a7bcd0 100755
--- a/tests/generic/333
+++ b/tests/generic/333
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_odirect
diff --git a/tests/generic/334 b/tests/generic/334
index b9c14b87..3f971847 100755
--- a/tests/generic/334
+++ b/tests/generic/334
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 
diff --git a/tests/generic/335 b/tests/generic/335
index 196ada64..280cf853 100755
--- a/tests/generic/335
+++ b/tests/generic/335
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_dm_target flakey
 
diff --git a/tests/generic/336 b/tests/generic/336
index ec9629ec..47808197 100755
--- a/tests/generic/336
+++ b/tests/generic/336
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_hardlinks
 _require_dm_target flakey
diff --git a/tests/generic/337 b/tests/generic/337
index d0dffcb9..a666cf92 100755
--- a/tests/generic/337
+++ b/tests/generic/337
@@ -14,8 +14,6 @@ _begin_fstest auto quick attr metadata
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_attrs
 
diff --git a/tests/generic/338 b/tests/generic/338
index a75577f2..d138c023 100755
--- a/tests/generic/338
+++ b/tests/generic/338
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmerror
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_nocheck # fs went down with a dirty log, don't check it
 _require_dm_target error
 # If SCRATCH_DEV is not a valid block device, FSTYP cannot be mkfs'ed either
diff --git a/tests/generic/339 b/tests/generic/339
index 4da10c55..bf8f7729 100755
--- a/tests/generic/339
+++ b/tests/generic/339
@@ -14,8 +14,6 @@ _begin_fstest auto dir
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_test_program "dirhash_collide"
 
diff --git a/tests/generic/340 b/tests/generic/340
index e4e3b5de..631324f1 100755
--- a/tests/generic/340
+++ b/tests/generic/340
@@ -11,8 +11,6 @@ _begin_fstest auto
 
 # get standard environment and checks
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_test_program "holetest"
 
diff --git a/tests/generic/341 b/tests/generic/341
index a25835ec..bea36e26 100755
--- a/tests/generic/341
+++ b/tests/generic/341
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_dm_target flakey
 
diff --git a/tests/generic/342 b/tests/generic/342
index cdffaaf3..3f5aca67 100755
--- a/tests/generic/342
+++ b/tests/generic/342
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_dm_target flakey
 
diff --git a/tests/generic/343 b/tests/generic/343
index 9e21763a..6659f198 100755
--- a/tests/generic/343
+++ b/tests/generic/343
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_hardlinks
 _require_dm_target flakey
diff --git a/tests/generic/344 b/tests/generic/344
index 7a8aa852..e6a3a5fe 100755
--- a/tests/generic/344
+++ b/tests/generic/344
@@ -12,8 +12,6 @@ _begin_fstest auto
 
 # get standard environment and checks
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_test_program "holetest"
 
diff --git a/tests/generic/345 b/tests/generic/345
index def39998..cc1080f3 100755
--- a/tests/generic/345
+++ b/tests/generic/345
@@ -11,8 +11,6 @@ _begin_fstest auto
 
 # get standard environment and checks
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_test_program "holetest"
 
diff --git a/tests/generic/346 b/tests/generic/346
index 009db54f..89652ea5 100755
--- a/tests/generic/346
+++ b/tests/generic/346
@@ -11,8 +11,6 @@ _begin_fstest auto quick rw
 
 # get standard environment and checks
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_test_program "holetest"
 
diff --git a/tests/generic/347 b/tests/generic/347
index 6799b8da..7e1ea5d9 100755
--- a/tests/generic/347
+++ b/tests/generic/347
@@ -49,7 +49,6 @@ _workout()
 # Import common functions.
 . ./common/dmthin
 
-_supported_fs generic
 _require_scratch_nocheck
 _require_dm_target thin-pool
 
diff --git a/tests/generic/348 b/tests/generic/348
index e938f817..eb0587d2 100755
--- a/tests/generic/348
+++ b/tests/generic/348
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_symlinks
 _require_dm_target flakey
diff --git a/tests/generic/349 b/tests/generic/349
index da331b95..72fbda41 100755
--- a/tests/generic/349
+++ b/tests/generic/349
@@ -16,7 +16,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/filter
 . ./common/scsi_debug
 
-# real QA test starts here
 _require_scsi_debug
 _require_xfs_io_command "fzero"
 
diff --git a/tests/generic/350 b/tests/generic/350
index d8b2f272..6079a8d5 100755
--- a/tests/generic/350
+++ b/tests/generic/350
@@ -16,7 +16,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/filter
 . ./common/scsi_debug
 
-# real QA test starts here
 _require_scsi_debug
 _require_xfs_io_command "fpunch"
 
diff --git a/tests/generic/351 b/tests/generic/351
index c4e87675..e73b70e4 100755
--- a/tests/generic/351
+++ b/tests/generic/351
@@ -19,7 +19,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/filter
 . ./common/scsi_debug
 
-# real QA test starts here
 _require_scsi_debug
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "finsert"
diff --git a/tests/generic/352 b/tests/generic/352
index 3a18f076..838803eb 100755
--- a/tests/generic/352
+++ b/tests/generic/352
@@ -18,10 +18,8 @@ _begin_fstest auto clone fiemap
 . ./common/reflink
 . ./common/punch
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch_reflink
 _require_xfs_io_command "fiemap"
 
diff --git a/tests/generic/353 b/tests/generic/353
index c5639725..ac5b9788 100755
--- a/tests/generic/353
+++ b/tests/generic/353
@@ -19,10 +19,8 @@ _begin_fstest auto quick clone fiemap
 . ./common/reflink
 . ./common/punch
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch_reflink
 _require_xfs_io_command "fiemap"
 
diff --git a/tests/generic/354 b/tests/generic/354
index 425a2f9d..43d4705c 100755
--- a/tests/generic/354
+++ b/tests/generic/354
@@ -12,8 +12,6 @@ _begin_fstest auto
 
 # get standard environment and checks
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_test_program "holetest"
 
diff --git a/tests/generic/355 b/tests/generic/355
index 7c108d1b..b0f8fc45 100755
--- a/tests/generic/355
+++ b/tests/generic/355
@@ -12,8 +12,6 @@ _begin_fstest auto quick perms
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_user
 _require_odirect
diff --git a/tests/generic/356 b/tests/generic/356
index ffc7bed5..c03414e5 100755
--- a/tests/generic/356
+++ b/tests/generic/356
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_swapfile
 _require_scratch_reflink
 _require_cp_reflink
diff --git a/tests/generic/357 b/tests/generic/357
index 0f3e02d5..8db31f8b 100755
--- a/tests/generic/357
+++ b/tests/generic/357
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 
 # For NFS, a reflink is just a CLONE operation, and after that
 # point it's dealt with by the server.
diff --git a/tests/generic/358 b/tests/generic/358
index 91fe5e2b..e4e0849d 100755
--- a/tests/generic/358
+++ b/tests/generic/358
@@ -27,7 +27,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 
 echo "Format and mount"
diff --git a/tests/generic/359 b/tests/generic/359
index 8ef4f846..4b6bfa2d 100755
--- a/tests/generic/359
+++ b/tests/generic/359
@@ -29,7 +29,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 
 echo "Format and mount"
diff --git a/tests/generic/360 b/tests/generic/360
index 5fb227ff..e259bb61 100755
--- a/tests/generic/360
+++ b/tests/generic/360
@@ -12,8 +12,6 @@ _begin_fstest auto quick metadata
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_symlinks
 
diff --git a/tests/generic/361 b/tests/generic/361
index d76d2635..c5615739 100755
--- a/tests/generic/361
+++ b/tests/generic/361
@@ -25,8 +25,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_block_device $SCRATCH_DEV
 _require_loop
diff --git a/tests/generic/371 b/tests/generic/371
index a2fdaf7b..b312c450 100755
--- a/tests/generic/371
+++ b/tests/generic/371
@@ -15,7 +15,6 @@ _begin_fstest auto quick enospc prealloc
 . ./common/filter
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch
 _require_xfs_io_command "falloc"
 test "$FSTYP" = "xfs" && _require_xfs_io_command "extsize"
diff --git a/tests/generic/372 b/tests/generic/372
index dac51dec..2b88c151 100755
--- a/tests/generic/372
+++ b/tests/generic/372
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "fiemap"
diff --git a/tests/generic/373 b/tests/generic/373
index e85308c7..3bd46963 100755
--- a/tests/generic/373
+++ b/tests/generic/373
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_reflink
 _require_cp_reflink
 
diff --git a/tests/generic/374 b/tests/generic/374
index f66d1397..acb23d17 100755
--- a/tests/generic/374
+++ b/tests/generic/374
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_dedupe
 
 echo "Format and mount"
diff --git a/tests/generic/375 b/tests/generic/375
index 438184b3..eb675144 100755
--- a/tests/generic/375
+++ b/tests/generic/375
@@ -14,8 +14,6 @@ _begin_fstest auto quick acl perms
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_runas
 _require_acls
diff --git a/tests/generic/376 b/tests/generic/376
index 70491d2f..cecd4e0d 100755
--- a/tests/generic/376
+++ b/tests/generic/376
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_dm_target flakey
 
diff --git a/tests/generic/377 b/tests/generic/377
index 720ecf73..add0b7bb 100755
--- a/tests/generic/377
+++ b/tests/generic/377
@@ -13,8 +13,6 @@ _begin_fstest attr auto quick metadata
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_attrs
 _require_test_program "listxattr"
diff --git a/tests/generic/378 b/tests/generic/378
index 2caff94f..5a6bd2b0 100755
--- a/tests/generic/378
+++ b/tests/generic/378
@@ -18,8 +18,6 @@ _begin_fstest auto quick metadata
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_user
 _require_hardlinks
diff --git a/tests/generic/379 b/tests/generic/379
index 007fc0d9..4c7fc939 100755
--- a/tests/generic/379
+++ b/tests/generic/379
@@ -21,8 +21,6 @@ _cleanup()
 	rm -f $tmp.*
 }
 
-# real QA test starts here
-_supported_fs generic
 
 cp /dev/null $seqres.full
 chmod ugo+rwx $seqres.full
diff --git a/tests/generic/380 b/tests/generic/380
index 21b789dd..8d772a96 100755
--- a/tests/generic/380
+++ b/tests/generic/380
@@ -15,10 +15,8 @@ _begin_fstest quota auto quick
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 
 _require_scratch
 _require_quota
diff --git a/tests/generic/381 b/tests/generic/381
index 7519491c..411c9c7d 100755
--- a/tests/generic/381
+++ b/tests/generic/381
@@ -15,8 +15,6 @@ _begin_fstest auto quick quota
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_quota
 _require_xfs_quota_foreign
diff --git a/tests/generic/382 b/tests/generic/382
index 49775917..162da41d 100755
--- a/tests/generic/382
+++ b/tests/generic/382
@@ -20,8 +20,6 @@ _begin_fstest auto quick quota
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_quota
 _require_xfs_quota_foreign
diff --git a/tests/generic/383 b/tests/generic/383
index 91e27840..21f084bd 100755
--- a/tests/generic/383
+++ b/tests/generic/383
@@ -15,8 +15,6 @@ qa_user=""
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_quota
 _require_xfs_quota_foreign
diff --git a/tests/generic/384 b/tests/generic/384
index 8d93b781..f2344380 100755
--- a/tests/generic/384
+++ b/tests/generic/384
@@ -22,8 +22,6 @@ _cleanup()
 	rm -f $tmp.*
 }
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_quota
diff --git a/tests/generic/385 b/tests/generic/385
index bbbf8816..ae10b285 100755
--- a/tests/generic/385
+++ b/tests/generic/385
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_quota
diff --git a/tests/generic/386 b/tests/generic/386
index 0d902702..f8e804cb 100755
--- a/tests/generic/386
+++ b/tests/generic/386
@@ -27,12 +27,10 @@ qlimit_meg=500	# 500M limit imposed = 500 * 1024 * 1024 bytes
 
 echo "Silence is golden."
 
-# real QA test starts here
 
 proj_dir="$SCRATCH_MNT/test"
 
 # Modify as appropriate.
-_supported_fs generic
 
 _require_quota
 _require_xfs_quota_foreign
diff --git a/tests/generic/387 b/tests/generic/387
index 25ca86bb..544e7552 100755
--- a/tests/generic/387
+++ b/tests/generic/387
@@ -15,7 +15,6 @@ _begin_fstest auto clone
 . ./common/reflink
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch_reflink
 
 #btrfs needs 256mb to create default blockgroup fs
diff --git a/tests/generic/388 b/tests/generic/388
index 4a5be669..89ddda31 100755
--- a/tests/generic/388
+++ b/tests/generic/388
@@ -29,7 +29,6 @@ _cleanup()
 # Import common functions.
 
 # Modify as appropriate.
-_supported_fs generic
 
 _require_scratch
 _require_local_device $SCRATCH_DEV
diff --git a/tests/generic/389 b/tests/generic/389
index e59446f3..949d5a1c 100755
--- a/tests/generic/389
+++ b/tests/generic/389
@@ -14,8 +14,6 @@ _begin_fstest auto quick acl
 . ./common/attr
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_xfs_io_command "-T"
diff --git a/tests/generic/390 b/tests/generic/390
index 9a5feeb1..02f6c5ee 100755
--- a/tests/generic/390
+++ b/tests/generic/390
@@ -26,11 +26,9 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 echo "Silence is golden"
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch
 _require_freeze
 _require_test_program "feature"
diff --git a/tests/generic/391 b/tests/generic/391
index cd99ee2e..d19c4826 100755
--- a/tests/generic/391
+++ b/tests/generic/391
@@ -22,9 +22,7 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs generic
 _require_test
 _require_xfs_io_command "falloc"
 _require_test_program "dio-interleaved"
diff --git a/tests/generic/392 b/tests/generic/392
index 0c9efb6d..da5ca260 100755
--- a/tests/generic/392
+++ b/tests/generic/392
@@ -17,8 +17,6 @@ status=0	# failure will be detected in runtime!
 . ./common/filter
 . ./common/punch
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_scratch_shutdown
diff --git a/tests/generic/393 b/tests/generic/393
index 206dee00..ec91af18 100755
--- a/tests/generic/393
+++ b/tests/generic/393
@@ -22,7 +22,6 @@ _begin_fstest auto quick rw
 # Import common functions.
 . ./common/filter
 
-_supported_fs generic
 _require_scratch
 
 testfile=$SCRATCH_MNT/testfile
diff --git a/tests/generic/394 b/tests/generic/394
index cbc2ce13..39931de3 100755
--- a/tests/generic/394
+++ b/tests/generic/394
@@ -26,8 +26,6 @@ do_truncate()
 	$XFS_IO_PROG -fc "truncate $1" $2
 }
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 
 # set max file size to 1G (in block number of 1k blocks), so it should be big
diff --git a/tests/generic/395 b/tests/generic/395
index ab2ad612..45787fff 100755
--- a/tests/generic/395
+++ b/tests/generic/395
@@ -13,8 +13,6 @@ _begin_fstest auto quick encrypt
 . ./common/filter
 . ./common/encrypt
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_encryption
 _require_xfs_io_command "get_encpolicy"
 _require_user
diff --git a/tests/generic/396 b/tests/generic/396
index caa1d677..2c5ee6f2 100755
--- a/tests/generic/396
+++ b/tests/generic/396
@@ -14,8 +14,6 @@ _begin_fstest auto quick encrypt
 . ./common/filter
 . ./common/encrypt
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_encryption
 
 _scratch_mkfs_encrypted &>> $seqres.full
diff --git a/tests/generic/397 b/tests/generic/397
index 6c03f274..f1306d45 100755
--- a/tests/generic/397
+++ b/tests/generic/397
@@ -17,8 +17,6 @@ _begin_fstest auto quick encrypt
 . ./common/filter
 . ./common/encrypt
 
-# real QA test starts here
-_supported_fs generic
 _require_symlinks
 _require_scratch_encryption
 _require_command "$KEYCTL_PROG" keyctl
diff --git a/tests/generic/398 b/tests/generic/398
index e2cbad54..40d7b6e3 100755
--- a/tests/generic/398
+++ b/tests/generic/398
@@ -19,8 +19,6 @@ _begin_fstest auto quick encrypt
 . ./common/encrypt
 . ./common/renameat2
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_encryption
 _require_renameat2 exchange
 
diff --git a/tests/generic/399 b/tests/generic/399
index a5aa7107..f0a45591 100755
--- a/tests/generic/399
+++ b/tests/generic/399
@@ -23,8 +23,6 @@ _begin_fstest auto encrypt
 . ./common/filter
 . ./common/encrypt
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_encryption
 _require_symlinks
 _require_command "$XZ_PROG" xz
diff --git a/tests/generic/400 b/tests/generic/400
index f9ec84cd..77970da6 100755
--- a/tests/generic/400
+++ b/tests/generic/400
@@ -16,9 +16,7 @@ _begin_fstest auto quick quota
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
 
-_supported_fs generic
 _require_quota
 _require_scratch
 
diff --git a/tests/generic/401 b/tests/generic/401
index dc8e9fa6..672de286 100755
--- a/tests/generic/401
+++ b/tests/generic/401
@@ -21,8 +21,6 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_symlinks
 _require_mknod
diff --git a/tests/generic/402 b/tests/generic/402
index 89afb959..5feca4aa 100755
--- a/tests/generic/402
+++ b/tests/generic/402
@@ -17,7 +17,6 @@ _begin_fstest auto quick rw bigtime
 . ./common/attr
 
 # Prerequisites for the test run.
-_supported_fs generic
 _require_scratch
 _require_check_dmesg
 _require_xfs_io_command utimes
diff --git a/tests/generic/403 b/tests/generic/403
index 6b07ccb0..12159fa0 100755
--- a/tests/generic/403
+++ b/tests/generic/403
@@ -14,10 +14,8 @@ _begin_fstest auto quick attr
 # Import common functions.
 . ./common/attr
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch
 _require_attrs trusted
 
diff --git a/tests/generic/404 b/tests/generic/404
index ddbc04d5..f0ea1136 100755
--- a/tests/generic/404
+++ b/tests/generic/404
@@ -61,10 +61,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "finsert"
diff --git a/tests/generic/405 b/tests/generic/405
index ab5a5523..c90190c8 100755
--- a/tests/generic/405
+++ b/tests/generic/405
@@ -27,8 +27,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmthin
 
-# real QA test starts here
-_supported_fs generic
 # $SCRATCH_DEV won't be directly created filesystem on, so fsck isn't required
 _require_scratch_nocheck
 _require_dm_target thin-pool
diff --git a/tests/generic/406 b/tests/generic/406
index 49279a00..d36e833f 100755
--- a/tests/generic/406
+++ b/tests/generic/406
@@ -16,10 +16,8 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch
 _require_odirect
 
diff --git a/tests/generic/407 b/tests/generic/407
index 90ccaef0..48b3e65a 100755
--- a/tests/generic/407
+++ b/tests/generic/407
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_test_reflink
diff --git a/tests/generic/408 b/tests/generic/408
index c5e6e413..010f44d9 100755
--- a/tests/generic/408
+++ b/tests/generic/408
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_test_dedupe
diff --git a/tests/generic/409 b/tests/generic/409
index 432befac..b7edc2ac 100755
--- a/tests/generic/409
+++ b/tests/generic/409
@@ -35,8 +35,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_scratch
 _require_local_device $SCRATCH_DEV
diff --git a/tests/generic/410 b/tests/generic/410
index 5fb5441a..902f2714 100755
--- a/tests/generic/410
+++ b/tests/generic/410
@@ -43,8 +43,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_scratch
 _require_local_device $SCRATCH_DEV
diff --git a/tests/generic/411 b/tests/generic/411
index b2b8d550..c35436c8 100755
--- a/tests/generic/411
+++ b/tests/generic/411
@@ -24,8 +24,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_scratch
 _require_local_device $SCRATCH_DEV
diff --git a/tests/generic/412 b/tests/generic/412
index f1778cf8..1c330f9d 100755
--- a/tests/generic/412
+++ b/tests/generic/412
@@ -15,8 +15,6 @@ _begin_fstest auto quick metadata
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_odirect
 
diff --git a/tests/generic/413 b/tests/generic/413
index bd1b04a6..c9274e44 100755
--- a/tests/generic/413
+++ b/tests/generic/413
@@ -12,7 +12,6 @@ _begin_fstest auto quick dax prealloc
 # Import common functions.
 . ./common/filter
 
-_supported_fs generic
 _require_hugepages
 _require_test
 _require_scratch_dax_mountopt "dax"
diff --git a/tests/generic/414 b/tests/generic/414
index 684b2bf2..a37e5b47 100755
--- a/tests/generic/414
+++ b/tests/generic/414
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "fiemap"
diff --git a/tests/generic/415 b/tests/generic/415
index c435e626..11923450 100755
--- a/tests/generic/415
+++ b/tests/generic/415
@@ -15,8 +15,6 @@ status=0    # success is the default!
 # Import common functions.
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fpunch"
diff --git a/tests/generic/416 b/tests/generic/416
index 0f6e3bc9..31a85c83 100755
--- a/tests/generic/416
+++ b/tests/generic/416
@@ -15,10 +15,8 @@ _begin_fstest auto enospc
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch
 
 fs_size=$((128 * 1024 * 1024))
diff --git a/tests/generic/417 b/tests/generic/417
index 8923a695..ed99c97f 100755
--- a/tests/generic/417
+++ b/tests/generic/417
@@ -15,8 +15,6 @@ _begin_fstest auto quick shutdown log
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_scratch_shutdown
 _require_metadata_journaling $SCRATCH_DEV
diff --git a/tests/generic/418 b/tests/generic/418
index 501b2912..4321e298 100755
--- a/tests/generic/418
+++ b/tests/generic/418
@@ -20,8 +20,6 @@ _begin_fstest auto rw
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_odirect
 _require_block_device $TEST_DEV
diff --git a/tests/generic/419 b/tests/generic/419
index 5d56d64f..ffc173fa 100755
--- a/tests/generic/419
+++ b/tests/generic/419
@@ -18,8 +18,6 @@ _begin_fstest auto quick encrypt
 . ./common/encrypt
 . ./common/renameat2
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_encryption
 _require_command "$KEYCTL_PROG" keyctl
 _require_renameat2 exchange
diff --git a/tests/generic/420 b/tests/generic/420
index 5c67490d..edd9655f 100755
--- a/tests/generic/420
+++ b/tests/generic/420
@@ -13,10 +13,8 @@ _begin_fstest auto quick punch
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 _require_xfs_io_command fpunch
 
diff --git a/tests/generic/421 b/tests/generic/421
index 0c4fa8e3..6eeae607 100755
--- a/tests/generic/421
+++ b/tests/generic/421
@@ -15,8 +15,6 @@ _begin_fstest auto quick encrypt dangerous
 . ./common/filter
 . ./common/encrypt
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_encryption
 _require_command "$KEYCTL_PROG" keyctl
 
diff --git a/tests/generic/422 b/tests/generic/422
index 455d7aeb..71a0e5a8 100755
--- a/tests/generic/422
+++ b/tests/generic/422
@@ -14,8 +14,6 @@ _begin_fstest auto quick prealloc
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_scratch
 _require_xfs_io_command "falloc" "-k"
diff --git a/tests/generic/423 b/tests/generic/423
index 69c1c3bc..9d41f7a8 100755
--- a/tests/generic/423
+++ b/tests/generic/423
@@ -20,10 +20,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 _require_test_program "stat_test"
 _require_test_program "af_unix"
diff --git a/tests/generic/424 b/tests/generic/424
index 0ed0e4aa..e54babf5 100755
--- a/tests/generic/424
+++ b/tests/generic/424
@@ -21,10 +21,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 _require_test_program stat_test
 _require_statx
diff --git a/tests/generic/425 b/tests/generic/425
index b43294f9..3367a956 100755
--- a/tests/generic/425
+++ b/tests/generic/425
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs generic
 
 [ $FSTYP = bcachefs ] && _notrun "bcachefs does not store xattrs in blocks"
 
diff --git a/tests/generic/426 b/tests/generic/426
index 45e4a6d8..25909f22 100755
--- a/tests/generic/426
+++ b/tests/generic/426
@@ -13,10 +13,8 @@ _begin_fstest auto quick exportfs
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 # _require_exportfs already requires open_by_handle, but let's not count on it
 _require_test_program "open_by_handle"
diff --git a/tests/generic/427 b/tests/generic/427
index 26385d36..bddfdb87 100755
--- a/tests/generic/427
+++ b/tests/generic/427
@@ -14,10 +14,8 @@ _begin_fstest auto quick aio rw
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch
 _require_test_program "feature"
 _require_aiodio aio-dio-eof-race
diff --git a/tests/generic/428 b/tests/generic/428
index 4073afc4..c2c78778 100755
--- a/tests/generic/428
+++ b/tests/generic/428
@@ -15,11 +15,9 @@ _begin_fstest auto quick dax
 . ./common/filter
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 _require_test_program "t_mmap_stale_pmd"
 
-# real QA test starts here
 $here/src/t_mmap_stale_pmd $TEST_DIR/testfile
 
 # success, all done
diff --git a/tests/generic/429 b/tests/generic/429
index 2cf12316..345d5caa 100755
--- a/tests/generic/429
+++ b/tests/generic/429
@@ -26,8 +26,6 @@ _begin_fstest auto encrypt
 . ./common/filter
 . ./common/encrypt
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_encryption
 _require_command "$KEYCTL_PROG" keyctl
 _require_test_program "t_encrypted_d_revalidate"
diff --git a/tests/generic/430 b/tests/generic/430
index 697c83ce..4411e544 100755
--- a/tests/generic/430
+++ b/tests/generic/430
@@ -16,8 +16,6 @@ _begin_fstest auto quick copy_range
 # get standard environment
 . common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_xfs_io_command "copy_range"
 _require_test
diff --git a/tests/generic/431 b/tests/generic/431
index 0ec398c7..876e49f5 100755
--- a/tests/generic/431
+++ b/tests/generic/431
@@ -13,8 +13,6 @@ _begin_fstest auto quick copy_range
 # get standard environment
 . common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_xfs_io_command "copy_range"
 _require_test
diff --git a/tests/generic/432 b/tests/generic/432
index 402c5f23..2b0b4dce 100755
--- a/tests/generic/432
+++ b/tests/generic/432
@@ -15,8 +15,6 @@ _begin_fstest auto quick copy_range
 # get standard environment
 . common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_xfs_io_command "copy_range"
 _require_test
diff --git a/tests/generic/433 b/tests/generic/433
index 0d26a64c..6f0a0c5a 100755
--- a/tests/generic/433
+++ b/tests/generic/433
@@ -15,8 +15,6 @@ _begin_fstest auto quick copy_range
 # get standard environment
 . common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_xfs_io_command "copy_range"
 _require_test
diff --git a/tests/generic/434 b/tests/generic/434
index fbd9e408..5404eedb 100755
--- a/tests/generic/434
+++ b/tests/generic/434
@@ -11,8 +11,6 @@ _begin_fstest auto quick copy_range
 # get standard environment
 . common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_xfs_io_command "copy_range"
 _require_test
diff --git a/tests/generic/435 b/tests/generic/435
index bb1cbb62..05a4590f 100755
--- a/tests/generic/435
+++ b/tests/generic/435
@@ -22,8 +22,6 @@ _begin_fstest auto encrypt
 . ./common/filter
 . ./common/encrypt
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_encryption
 _require_command "$KEYCTL_PROG" keyctl
 
diff --git a/tests/generic/436 b/tests/generic/436
index d54af436..0d13e090 100755
--- a/tests/generic/436
+++ b/tests/generic/436
@@ -22,7 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-_supported_fs generic
 
 _require_test
 _require_seek_data_hole
diff --git a/tests/generic/437 b/tests/generic/437
index 1bfc6dbc..afba4731 100755
--- a/tests/generic/437
+++ b/tests/generic/437
@@ -16,11 +16,9 @@ _begin_fstest auto quick dax
 . ./common/filter
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 _require_test_program "t_mmap_cow_race"
 
-# real QA test starts here
 $here/src/t_mmap_cow_race $TEST_DIR/testfile
 
 # success, all done
diff --git a/tests/generic/438 b/tests/generic/438
index 60a76eae..df9c23d2 100755
--- a/tests/generic/438
+++ b/tests/generic/438
@@ -28,11 +28,9 @@ _cleanup()
 . ./common/filter
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 _require_test_program "t_mmap_fallocate"
 
-# real QA test starts here
 FILE=$TEST_DIR/testfile_fallocate
 # Make sure file exists
 echo >$FILE
diff --git a/tests/generic/439 b/tests/generic/439
index 4a4f821f..5c502359 100755
--- a/tests/generic/439
+++ b/tests/generic/439
@@ -16,8 +16,6 @@ _begin_fstest auto quick punch
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_scratch
 _require_xfs_io_command "fpunch"
diff --git a/tests/generic/440 b/tests/generic/440
index 5850a8fe..1c8e3e8f 100755
--- a/tests/generic/440
+++ b/tests/generic/440
@@ -18,8 +18,6 @@ _begin_fstest auto quick encrypt
 . ./common/filter
 . ./common/encrypt
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_encryption
 _require_symlinks
 _require_command "$KEYCTL_PROG" keyctl
diff --git a/tests/generic/441 b/tests/generic/441
index 85f29a3a..9851ac21 100755
--- a/tests/generic/441
+++ b/tests/generic/441
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmerror
 
-# real QA test starts here
 _require_scratch
 
 # Generally, we want to avoid journal errors on the extended testcase. Only
diff --git a/tests/generic/442 b/tests/generic/442
index c57a0567..c1182b5a 100755
--- a/tests/generic/442
+++ b/tests/generic/442
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmerror
 
-# real QA test starts here
 _require_scratch
 _require_dm_target error
 _require_test_program fsync-err
diff --git a/tests/generic/443 b/tests/generic/443
index 16baf14d..0667f69c 100755
--- a/tests/generic/443
+++ b/tests/generic/443
@@ -12,8 +12,6 @@ _begin_fstest auto quick rw
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_test_program "writev_on_pagefault"
 
diff --git a/tests/generic/444 b/tests/generic/444
index 71d2f6af..31e0e43e 100755
--- a/tests/generic/444
+++ b/tests/generic/444
@@ -14,8 +14,6 @@ _begin_fstest auto quick acl perms
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_runas
 _require_acls
diff --git a/tests/generic/445 b/tests/generic/445
index d9e9f84b..5784bee1 100755
--- a/tests/generic/445
+++ b/tests/generic/445
@@ -22,7 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-_supported_fs generic
 
 _require_test
 _require_seek_data_hole
diff --git a/tests/generic/446 b/tests/generic/446
index b69502cb..c0d32e4e 100755
--- a/tests/generic/446
+++ b/tests/generic/446
@@ -17,7 +17,6 @@ _begin_fstest auto quick rw punch
 # get standard environment and checks
 . ./common/filter
 
-# real QA test starts here
 _require_scratch
 _require_xfs_io_command "truncate"
 _require_xfs_io_command "fpunch"
diff --git a/tests/generic/447 b/tests/generic/447
index 16b814ee..6a1d486d 100755
--- a/tests/generic/447
+++ b/tests/generic/447
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/attr
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 _require_test_program "punch-alternating"
diff --git a/tests/generic/448 b/tests/generic/448
index 11945549..ba540a26 100755
--- a/tests/generic/448
+++ b/tests/generic/448
@@ -21,7 +21,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-_supported_fs generic
 
 _require_test
 _require_seek_data_hole
diff --git a/tests/generic/449 b/tests/generic/449
index 2b77a6a4..9cf814ad 100755
--- a/tests/generic/449
+++ b/tests/generic/449
@@ -15,10 +15,8 @@ _begin_fstest auto quick acl attr enospc
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch
 _require_test
 _require_acls
diff --git a/tests/generic/450 b/tests/generic/450
index 160097cf..96e559da 100755
--- a/tests/generic/450
+++ b/tests/generic/450
@@ -27,8 +27,6 @@ _cleanup()
 
 # Import common functions.
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_odirect
 
diff --git a/tests/generic/451 b/tests/generic/451
index 1792383a..f45d1ba7 100755
--- a/tests/generic/451
+++ b/tests/generic/451
@@ -12,8 +12,6 @@ _begin_fstest auto quick rw aio
 
 # Import common functions.
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_test_program "feature"
 _require_aiodio aio-dio-cycle-write
diff --git a/tests/generic/452 b/tests/generic/452
index 6e14a1c4..a19a7962 100755
--- a/tests/generic/452
+++ b/tests/generic/452
@@ -15,13 +15,11 @@ _begin_fstest auto quick dax
 . ./common/filter
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch
 
 # we need to be able to execute binaries on scratch
 _exclude_scratch_mount_option "noexec"
 
-# real QA test starts here
 # format and mount
 _scratch_mkfs > $seqres.full 2>&1
 _scratch_mount >> $seqres.full 2>&1
diff --git a/tests/generic/455 b/tests/generic/455
index 6dce8a65..31f84346 100755
--- a/tests/generic/455
+++ b/tests/generic/455
@@ -21,8 +21,6 @@ _cleanup()
 . ./common/dmthin
 . ./common/dmlogwrites
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_scratch_nocheck
 _require_no_logdev
diff --git a/tests/generic/456 b/tests/generic/456
index a77ff4e8..0123508c 100755
--- a/tests/generic/456
+++ b/tests/generic/456
@@ -29,8 +29,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_xfs_io_command "falloc"
 _require_dm_target flakey
diff --git a/tests/generic/457 b/tests/generic/457
index 03aeb814..defa73cf 100755
--- a/tests/generic/457
+++ b/tests/generic/457
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/dmthin
 . ./common/dmlogwrites
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_scratch_reflink
 _require_no_logdev
diff --git a/tests/generic/458 b/tests/generic/458
index 5a6a7e10..8acec687 100755
--- a/tests/generic/458
+++ b/tests/generic/458
@@ -17,8 +17,6 @@ _begin_fstest auto quick clone collapse insert zero
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fzero"
diff --git a/tests/generic/459 b/tests/generic/459
index c3f0b2b0..98177f6b 100755
--- a/tests/generic/459
+++ b/tests/generic/459
@@ -36,11 +36,9 @@ _cleanup()
 
 # Import common functions.
 
-# real QA test starts here
 
 # This tests for filesystem lockup not consistency, so don't check for fs
 # consistency after test
-_supported_fs generic
 _require_scratch_nolvm
 _require_dm_target thin-pool
 _require_dm_target snapshot
diff --git a/tests/generic/460 b/tests/generic/460
index 68720d3a..5e855f9b 100755
--- a/tests/generic/460
+++ b/tests/generic/460
@@ -56,8 +56,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 # test with scratch device, because test is known to corrupt fs, we don't want
 # the corruption affect subsequent tests
 _require_scratch
diff --git a/tests/generic/461 b/tests/generic/461
index 24d4ae2e..468ce46f 100755
--- a/tests/generic/461
+++ b/tests/generic/461
@@ -22,8 +22,6 @@ _cleanup()
 	rm -f $tmp.*
 }
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch_nocheck
 _require_scratch_shutdown
diff --git a/tests/generic/462 b/tests/generic/462
index eb44553b..42f18ad2 100755
--- a/tests/generic/462
+++ b/tests/generic/462
@@ -18,7 +18,6 @@ _begin_fstest auto quick dax
 . ./common/filter
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 _require_scratch_dax_mountopt "dax"
 _require_test_program "t_mmap_write_ro"
@@ -26,7 +25,6 @@ _require_test_program "t_mmap_write_ro"
 # this bug, just trying to test more.
 _require_user
 
-# real QA test starts here
 
 _scratch_mkfs >>$seqres.full 2>&1
 _scratch_mount "-o dax"
diff --git a/tests/generic/463 b/tests/generic/463
index 719e98c5..2e9306ce 100755
--- a/tests/generic/463
+++ b/tests/generic/463
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-_supported_fs generic
 
 _require_test
 _require_test_reflink
diff --git a/tests/generic/464 b/tests/generic/464
index cf9caac2..f114208f 100755
--- a/tests/generic/464
+++ b/tests/generic/464
@@ -55,8 +55,6 @@ do_writeback()
 	$XFS_IO_PROG -c "sync_range -w 0 0" `getfile` >/dev/null 2>&1
 }
 
-# real QA test starts here
-_supported_fs generic
 # do fsck after each iteration in test
 _require_scratch_nocheck
 _require_xfs_io_command "sync_range"
diff --git a/tests/generic/465 b/tests/generic/465
index 0745d6a1..eba3629a 100755
--- a/tests/generic/465
+++ b/tests/generic/465
@@ -20,7 +20,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _supported_fs ^nfs
 
 _require_aiodio aio-dio-append-write-read-race
diff --git a/tests/generic/466 b/tests/generic/466
index 05bfd501..64083290 100755
--- a/tests/generic/466
+++ b/tests/generic/466
@@ -12,8 +12,6 @@ _begin_fstest auto quick rw
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_nocheck
 _require_block_device $SCRATCH_DEV
 
diff --git a/tests/generic/467 b/tests/generic/467
index 2a86ea76..c48f9d55 100755
--- a/tests/generic/467
+++ b/tests/generic/467
@@ -18,10 +18,8 @@ _begin_fstest auto quick exportfs
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 # _require_exportfs already requires open_by_handle, but let's not count on it
 _require_test_program "open_by_handle"
diff --git a/tests/generic/468 b/tests/generic/468
index f8d537f9..5471b7df 100755
--- a/tests/generic/468
+++ b/tests/generic/468
@@ -23,8 +23,6 @@ _begin_fstest shutdown auto quick metadata prealloc
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_scratch_shutdown
diff --git a/tests/generic/469 b/tests/generic/469
index 81573972..1352c324 100755
--- a/tests/generic/469
+++ b/tests/generic/469
@@ -28,8 +28,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_xfs_io_command "falloc" "-k"
 _require_xfs_io_command "fpunch"
diff --git a/tests/generic/470 b/tests/generic/470
index 6da2ec22..aef262c8 100755
--- a/tests/generic/470
+++ b/tests/generic/470
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmlogwrites
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_no_logdev
 _require_log_writes_dax_mountopt "dax"
diff --git a/tests/generic/471 b/tests/generic/471
index 6d40d0e2..e98e3f00 100755
--- a/tests/generic/471
+++ b/tests/generic/471
@@ -20,7 +20,6 @@ _cleanup()
 	rm -fr $target_dir
 }
 
-_supported_fs generic
 _require_test
 _require_test_program rewinddir-test
 
diff --git a/tests/generic/472 b/tests/generic/472
index 7d11ba37..70b580a8 100755
--- a/tests/generic/472
+++ b/tests/generic/472
@@ -20,8 +20,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_swapfile
 _require_test_program mkswap
 _require_test_program swapon
diff --git a/tests/generic/473 b/tests/generic/473
index 125b9518..92cb7e2a 100755
--- a/tests/generic/473
+++ b/tests/generic/473
@@ -14,7 +14,6 @@ _begin_fstest broken fiemap
 # Import common functions.
 . ./common/punch
 
-# real QA test starts here
 
 # Modify as appropriate.
 _require_test
diff --git a/tests/generic/474 b/tests/generic/474
index 69fb49b5..2fa087a8 100755
--- a/tests/generic/474
+++ b/tests/generic/474
@@ -21,9 +21,7 @@ status=0
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs generic
 _require_fssum
 _require_scratch
 _require_scratch_shutdown
diff --git a/tests/generic/475 b/tests/generic/475
index ce7fe013..4b854f9a 100755
--- a/tests/generic/475
+++ b/tests/generic/475
@@ -28,7 +28,6 @@ _cleanup()
 . ./common/dmerror
 
 # Modify as appropriate.
-_supported_fs generic
 
 _require_scratch
 _require_dm_target error
diff --git a/tests/generic/476 b/tests/generic/476
index b1ae4df4..cf7402a1 100755
--- a/tests/generic/476
+++ b/tests/generic/476
@@ -21,7 +21,6 @@ _cleanup()
 # Import common functions.
 
 # Modify as appropriate.
-_supported_fs generic
 
 _require_scratch
 _require_command "$KILLALL_PROG" "killall"
diff --git a/tests/generic/477 b/tests/generic/477
index d1fce7ed..42e7bf9c 100755
--- a/tests/generic/477
+++ b/tests/generic/477
@@ -15,10 +15,8 @@ _begin_fstest auto quick exportfs
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 # _require_exportfs already requires open_by_handle, but let's not count on it
 _require_test_program "open_by_handle"
diff --git a/tests/generic/478 b/tests/generic/478
index 419acc94..42b4bb93 100755
--- a/tests/generic/478
+++ b/tests/generic/478
@@ -90,11 +90,9 @@ _begin_fstest auto quick
 . ./common/filter
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 _require_ofd_locks
 
-# real QA test starts here
 # prepare a 4k testfile in TEST_DIR
 $XFS_IO_PROG -f -c "pwrite -S 0xFF 0 4096" \
 	$TEST_DIR/testfile >> $seqres.full 2>&1
diff --git a/tests/generic/479 b/tests/generic/479
index 9322a33a..7f4aab4e 100755
--- a/tests/generic/479
+++ b/tests/generic/479
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_symlinks
 _require_mknod
diff --git a/tests/generic/480 b/tests/generic/480
index 2805a3ac..975c990f 100755
--- a/tests/generic/480
+++ b/tests/generic/480
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_hardlinks
 _require_dm_target flakey
diff --git a/tests/generic/481 b/tests/generic/481
index 11d4da6e..5c980cf0 100755
--- a/tests/generic/481
+++ b/tests/generic/481
@@ -25,8 +25,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_dm_target flakey
 
diff --git a/tests/generic/482 b/tests/generic/482
index c647d24c..04026c4c 100755
--- a/tests/generic/482
+++ b/tests/generic/482
@@ -44,10 +44,8 @@ _cleanup()
 . ./common/dmthin
 . ./common/dmlogwrites
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 
 _require_no_logdev
 _require_command "$KILLALL_PROG" killall
diff --git a/tests/generic/483 b/tests/generic/483
index 2b35f285..60f9b109 100755
--- a/tests/generic/483
+++ b/tests/generic/483
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/dmflakey
 . ./common/punch
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_dm_target flakey
 _require_xfs_io_command "falloc" "-k"
diff --git a/tests/generic/484 b/tests/generic/484
index 4f413352..09c2c559 100755
--- a/tests/generic/484
+++ b/tests/generic/484
@@ -29,7 +29,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmerror
 
-# real QA test starts here
 _require_scratch_nocheck
 _require_dm_target error
 _require_xfs_io_command "syncfs"
diff --git a/tests/generic/485 b/tests/generic/485
index 8bab450b..36b13a7a 100755
--- a/tests/generic/485
+++ b/tests/generic/485
@@ -21,8 +21,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_math
 _require_xfs_io_command "falloc" "-k"
diff --git a/tests/generic/486 b/tests/generic/486
index 7dbfcb98..cb9b9783 100755
--- a/tests/generic/486
+++ b/tests/generic/486
@@ -27,8 +27,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs generic
 _require_test_program "attr_replace_test"
 _require_attrs
 _require_scratch
diff --git a/tests/generic/487 b/tests/generic/487
index 3c9b2233..364f7eb4 100755
--- a/tests/generic/487
+++ b/tests/generic/487
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmerror
 
-# real QA test starts here
 _require_scratch_nocheck
 
 sflag='-s'
diff --git a/tests/generic/488 b/tests/generic/488
index 7b9dcc18..0a7e3a4b 100755
--- a/tests/generic/488
+++ b/tests/generic/488
@@ -12,7 +12,6 @@ _begin_fstest auto quick
 
 . ./common/filter
 
-_supported_fs generic
 _require_scratch
 _require_test_program "multi_open_unlink"
 
diff --git a/tests/generic/489 b/tests/generic/489
index ec42950c..62aa45a8 100755
--- a/tests/generic/489
+++ b/tests/generic/489
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/dmflakey
 . ./common/attr
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_dm_target flakey
 _require_attrs
diff --git a/tests/generic/490 b/tests/generic/490
index f4fb67be..56eafd7b 100755
--- a/tests/generic/490
+++ b/tests/generic/490
@@ -15,7 +15,6 @@ _begin_fstest auto quick rw seek
 # Import common functions.
 . ./common/filter
 
-_supported_fs generic
 
 _require_test
 _require_seek_data_hole
diff --git a/tests/generic/491 b/tests/generic/491
index 5a586c12..f5030a18 100755
--- a/tests/generic/491
+++ b/tests/generic/491
@@ -24,8 +24,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_freeze
 _require_command "$TIMEOUT_PROG" "timeout"
diff --git a/tests/generic/492 b/tests/generic/492
index c488c8ba..51a46b51 100755
--- a/tests/generic/492
+++ b/tests/generic/492
@@ -12,9 +12,7 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs generic
 _require_scratch
 _require_xfs_io_command "label"
 _require_label_get_max
diff --git a/tests/generic/493 b/tests/generic/493
index c2fd72f6..bf977b18 100755
--- a/tests/generic/493
+++ b/tests/generic/493
@@ -12,7 +12,6 @@ _begin_fstest auto quick swap dedupe
 . ./common/filter
 . ./common/reflink
 
-_supported_fs generic
 _require_scratch_swapfile
 _require_scratch_dedupe
 
diff --git a/tests/generic/494 b/tests/generic/494
index b41c938d..f1731e51 100755
--- a/tests/generic/494
+++ b/tests/generic/494
@@ -11,7 +11,6 @@ _begin_fstest auto quick swap punch
 
 . ./common/filter
 
-_supported_fs generic
 _require_scratch_swapfile
 _require_xfs_io_command "fpunch"
 
diff --git a/tests/generic/495 b/tests/generic/495
index 84547f18..dd18693b 100755
--- a/tests/generic/495
+++ b/tests/generic/495
@@ -12,7 +12,6 @@ _begin_fstest auto quick swap
 # Import common functions.
 . ./common/filter
 
-_supported_fs generic
 _require_scratch_swapfile
 _require_test_program mkswap
 _require_test_program swapon
diff --git a/tests/generic/496 b/tests/generic/496
index 12f1bc4f..344a4f5b 100755
--- a/tests/generic/496
+++ b/tests/generic/496
@@ -21,8 +21,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_swapfile
 _require_test_program mkswap
 _require_test_program swapon
diff --git a/tests/generic/497 b/tests/generic/497
index 05e368ab..53ae0424 100755
--- a/tests/generic/497
+++ b/tests/generic/497
@@ -21,8 +21,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_swapfile
 _require_test_program mkswap
 _require_test_program swapon
diff --git a/tests/generic/498 b/tests/generic/498
index 5ba21399..f58c9ed5 100755
--- a/tests/generic/498
+++ b/tests/generic/498
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_hardlinks
 _require_dm_target flakey
diff --git a/tests/generic/499 b/tests/generic/499
index 4b39c48b..9145c1c5 100755
--- a/tests/generic/499
+++ b/tests/generic/499
@@ -13,8 +13,6 @@ _begin_fstest auto quick rw collapse zero prealloc
 # Import common functions.
 . ./common/punch
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_xfs_io_command "falloc" "-k"
 _require_xfs_io_command "fcollapse"
diff --git a/tests/generic/500 b/tests/generic/500
index 1151c8f2..ba6e902e 100755
--- a/tests/generic/500
+++ b/tests/generic/500
@@ -34,7 +34,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmthin
 
-# real QA test starts here
 _require_scratch_nocheck
 _require_dm_target thin-pool
 
diff --git a/tests/generic/501 b/tests/generic/501
index cb158ba5..4444016b 100755
--- a/tests/generic/501
+++ b/tests/generic/501
@@ -25,8 +25,6 @@ _cleanup()
 . ./common/reflink
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_reflink
 _require_dm_target flakey
 
diff --git a/tests/generic/502 b/tests/generic/502
index b5589b81..f6374f67 100755
--- a/tests/generic/502
+++ b/tests/generic/502
@@ -26,8 +26,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_hardlinks
 _require_dm_target flakey
diff --git a/tests/generic/503 b/tests/generic/503
index a01d3327..f9796e69 100755
--- a/tests/generic/503
+++ b/tests/generic/503
@@ -20,7 +20,6 @@ _begin_fstest auto quick dax punch collapse zero prealloc
 . ./common/filter
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 _require_scratch
 _require_test_program "t_mmap_collision"
@@ -42,7 +41,6 @@ blksize=$(_get_file_block_size $SCRATCH_MNT)
 test $blksize -eq $(getconf PAGE_SIZE) || \
 	_notrun "file block size must match page size"
 
-# real QA test starts here
 $here/src/t_mmap_collision $TEST_DIR/testfile $SCRATCH_MNT/testfile
 
 # success, all done
diff --git a/tests/generic/504 b/tests/generic/504
index 038ab0f2..271c040e 100755
--- a/tests/generic/504
+++ b/tests/generic/504
@@ -24,8 +24,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_command "$FLOCK_PROG" "flock"
 
diff --git a/tests/generic/505 b/tests/generic/505
index 5b6a9b90..a2596735 100755
--- a/tests/generic/505
+++ b/tests/generic/505
@@ -23,8 +23,6 @@ _begin_fstest shutdown auto quick metadata
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_scratch_shutdown
diff --git a/tests/generic/506 b/tests/generic/506
index d4aac68b..9a41e563 100755
--- a/tests/generic/506
+++ b/tests/generic/506
@@ -23,8 +23,6 @@ _begin_fstest shutdown auto quick metadata quota
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_quota
diff --git a/tests/generic/507 b/tests/generic/507
index 6a4a3833..6678e50f 100755
--- a/tests/generic/507
+++ b/tests/generic/507
@@ -36,8 +36,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_command "$LSATTR_PROG" lasttr
 _require_command "$CHATTR_PROG" chattr
diff --git a/tests/generic/508 b/tests/generic/508
index 46649340..4e234160 100755
--- a/tests/generic/508
+++ b/tests/generic/508
@@ -23,8 +23,6 @@ _begin_fstest shutdown auto quick metadata
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test_lsattr
 _require_statx
diff --git a/tests/generic/509 b/tests/generic/509
index 26010de3..5025c0d7 100755
--- a/tests/generic/509
+++ b/tests/generic/509
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_xfs_io_command "-T"
 _require_dm_target flakey
diff --git a/tests/generic/510 b/tests/generic/510
index 20bd87ee..5ea0e067 100755
--- a/tests/generic/510
+++ b/tests/generic/510
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_dm_target flakey
 
diff --git a/tests/generic/511 b/tests/generic/511
index 61c21e42..7c903fb0 100755
--- a/tests/generic/511
+++ b/tests/generic/511
@@ -13,8 +13,6 @@ _begin_fstest auto quick rw zero prealloc
 # Import common functions.
 . ./common/punch
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_xfs_io_command "falloc" "-k"
 _require_xfs_io_command "fzero"
diff --git a/tests/generic/512 b/tests/generic/512
index ec367405..8965d9d6 100755
--- a/tests/generic/512
+++ b/tests/generic/512
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_xfs_io_command "falloc"
 _require_dm_target flakey
diff --git a/tests/generic/513 b/tests/generic/513
index 7ff845ce..7f870b5d 100755
--- a/tests/generic/513
+++ b/tests/generic/513
@@ -14,8 +14,6 @@ _begin_fstest auto quick clone
 . ./common/reflink
 . ./common/attr
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_reflink
 _require_command "$GETCAP_PROG" getcap
 _require_command "$SETCAP_PROG" setcap
diff --git a/tests/generic/514 b/tests/generic/514
index 5b837718..7f3d9c16 100755
--- a/tests/generic/514
+++ b/tests/generic/514
@@ -13,8 +13,6 @@ _begin_fstest auto quick clone
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_reflink
 _require_user
 
diff --git a/tests/generic/515 b/tests/generic/515
index 1d537dec..37033955 100755
--- a/tests/generic/515
+++ b/tests/generic/515
@@ -16,8 +16,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/516 b/tests/generic/516
index 47af6237..b8d1753a 100755
--- a/tests/generic/516
+++ b/tests/generic/516
@@ -22,7 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_dedupe
 
 testdir=$TEST_DIR/test-$seq
diff --git a/tests/generic/517 b/tests/generic/517
index cf3031ed..3f7027a8 100755
--- a/tests/generic/517
+++ b/tests/generic/517
@@ -15,8 +15,6 @@ _begin_fstest auto quick dedupe clone
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_dedupe
 
 _scratch_mkfs >>$seqres.full 2>&1
diff --git a/tests/generic/518 b/tests/generic/518
index f3cb5868..20773bae 100755
--- a/tests/generic/518
+++ b/tests/generic/518
@@ -17,8 +17,6 @@ _begin_fstest auto quick clone
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_reflink
 
 _scratch_mkfs >>$seqres.full 2>&1
diff --git a/tests/generic/519 b/tests/generic/519
index 0839c6b8..3539b19b 100755
--- a/tests/generic/519
+++ b/tests/generic/519
@@ -13,8 +13,6 @@ _begin_fstest auto quick fiemap
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_fibmap
 _require_filefrag_options "es"
diff --git a/tests/generic/520 b/tests/generic/520
index ad6764c7..00fa050e 100755
--- a/tests/generic/520
+++ b/tests/generic/520
@@ -27,8 +27,6 @@ _cleanup()
 # 256MB in byte
 fssize=$((2**20 * 256))
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_nocheck
 _require_dm_target flakey
 
diff --git a/tests/generic/521 b/tests/generic/521
index 0956e501..24eab834 100755
--- a/tests/generic/521
+++ b/tests/generic/521
@@ -12,10 +12,8 @@ _begin_fstest soak long_rw smoketest
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 _require_odirect
 
diff --git a/tests/generic/522 b/tests/generic/522
index 0e4e6009..bdc77cbf 100755
--- a/tests/generic/522
+++ b/tests/generic/522
@@ -12,10 +12,8 @@ _begin_fstest soak long_rw smoketest
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 
 # Run fsx for a million ops or more
diff --git a/tests/generic/523 b/tests/generic/523
index 0792a39f..c1e91205 100755
--- a/tests/generic/523
+++ b/tests/generic/523
@@ -13,8 +13,6 @@ _begin_fstest auto quick attr
 . ./common/attr
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_attrs
 
diff --git a/tests/generic/524 b/tests/generic/524
index 80907a4c..abe4fbfe 100755
--- a/tests/generic/524
+++ b/tests/generic/524
@@ -18,10 +18,8 @@ _begin_fstest auto quick
 
 # Import common functions.
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch
 _require_test_program "feature"
 _require_xfs_io_command "sync_range"
diff --git a/tests/generic/525 b/tests/generic/525
index 431ba2cd..0107bacd 100755
--- a/tests/generic/525
+++ b/tests/generic/525
@@ -17,8 +17,6 @@ _begin_fstest auto quick rw
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 
 _scratch_mkfs >>$seqres.full 2>&1
diff --git a/tests/generic/526 b/tests/generic/526
index ada4dbee..7d47cf11 100755
--- a/tests/generic/526
+++ b/tests/generic/526
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_hardlinks
 _require_dm_target flakey
diff --git a/tests/generic/527 b/tests/generic/527
index de09d171..2ba1f319 100755
--- a/tests/generic/527
+++ b/tests/generic/527
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_hardlinks
 _require_dm_target flakey
diff --git a/tests/generic/528 b/tests/generic/528
index a63827b1..14c4f856 100755
--- a/tests/generic/528
+++ b/tests/generic/528
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/attr
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_xfs_io_command "statx" "-r"
 _require_btime
diff --git a/tests/generic/529 b/tests/generic/529
index 05be2c4f..1fd3418b 100755
--- a/tests/generic/529
+++ b/tests/generic/529
@@ -13,8 +13,6 @@ _begin_fstest auto quick acl attr
 # Import common functions.
 . ./common/attr
 
-# real QA test starts here
-_supported_fs generic
 _require_acls
 _require_scratch
 _require_test_program "t_attr_corruption"
diff --git a/tests/generic/530 b/tests/generic/530
index 692a813e..2e47c3e0 100755
--- a/tests/generic/530
+++ b/tests/generic/530
@@ -17,8 +17,6 @@ testfile=$TEST_DIR/$seq.txt
 
 # Import common functions.
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_scratch_shutdown
 _require_metadata_journaling
diff --git a/tests/generic/531 b/tests/generic/531
index e5f3dddd..0e3564fd 100755
--- a/tests/generic/531
+++ b/tests/generic/531
@@ -17,8 +17,6 @@ testfile=$TEST_DIR/$seq.txt
 
 # Import common functions.
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_xfs_io_command "-T"
 _require_test_program "t_open_tmpfiles"
diff --git a/tests/generic/532 b/tests/generic/532
index d356b0da..9b4b217c 100755
--- a/tests/generic/532
+++ b/tests/generic/532
@@ -20,8 +20,6 @@ _cleanup()
 
 # Import common functions.
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 
 get_attributes() {
diff --git a/tests/generic/533 b/tests/generic/533
index 85b39fb1..4a59a0df 100755
--- a/tests/generic/533
+++ b/tests/generic/533
@@ -27,8 +27,6 @@ setfattr()
 . ./common/attr
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_attrs
diff --git a/tests/generic/534 b/tests/generic/534
index 1e569419..f1cd90c0 100755
--- a/tests/generic/534
+++ b/tests/generic/534
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_dm_target flakey
 
diff --git a/tests/generic/535 b/tests/generic/535
index 3b734742..c2338da6 100755
--- a/tests/generic/535
+++ b/tests/generic/535
@@ -32,8 +32,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_dm_target flakey
diff --git a/tests/generic/536 b/tests/generic/536
index 986ea1ee..726120e6 100755
--- a/tests/generic/536
+++ b/tests/generic/536
@@ -13,10 +13,8 @@ _begin_fstest auto quick rw shutdown
 
 # Import common functions.
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch
 _require_scratch_shutdown
 
diff --git a/tests/generic/537 b/tests/generic/537
index f90a2a34..f57bc156 100755
--- a/tests/generic/537
+++ b/tests/generic/537
@@ -19,8 +19,6 @@ _begin_fstest auto quick trim
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_fstrim
 
diff --git a/tests/generic/538 b/tests/generic/538
index f6f5496b..d6933cbb 100755
--- a/tests/generic/538
+++ b/tests/generic/538
@@ -24,8 +24,6 @@ _begin_fstest auto quick aio
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_aiodio aio-dio-write-verify
 
diff --git a/tests/generic/539 b/tests/generic/539
index f6feda11..521a16a0 100755
--- a/tests/generic/539
+++ b/tests/generic/539
@@ -11,7 +11,6 @@ _begin_fstest auto quick punch seek
 
 # Import common functions.
 
-_supported_fs generic
 
 _require_test
 _require_seek_data_hole
diff --git a/tests/generic/540 b/tests/generic/540
index 290e05d0..7e797a2f 100755
--- a/tests/generic/540
+++ b/tests/generic/540
@@ -23,8 +23,6 @@ _begin_fstest auto quick clone fiemap prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_reflink
 _require_scratch_delalloc
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/541 b/tests/generic/541
index e6f0fa3c..aef8b466 100755
--- a/tests/generic/541
+++ b/tests/generic/541
@@ -23,8 +23,6 @@ _begin_fstest auto quick clone fiemap prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_reflink
 _require_scratch_delalloc
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/542 b/tests/generic/542
index 4d907d8a..c8bab86a 100755
--- a/tests/generic/542
+++ b/tests/generic/542
@@ -23,8 +23,6 @@ _begin_fstest auto quick clone fiemap prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_reflink
 _require_scratch_delalloc
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/543 b/tests/generic/543
index 928b761f..7fe8eca4 100755
--- a/tests/generic/543
+++ b/tests/generic/543
@@ -23,8 +23,6 @@ _begin_fstest auto quick clone fiemap prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_reflink
 _require_scratch_delalloc
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/544 b/tests/generic/544
index a4f654af..8fd7ffaf 100755
--- a/tests/generic/544
+++ b/tests/generic/544
@@ -17,8 +17,6 @@ _begin_fstest auto quick clone
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_reflink
 _require_cp_reflink
 
diff --git a/tests/generic/545 b/tests/generic/545
index 6f6dcd26..2005165d 100755
--- a/tests/generic/545
+++ b/tests/generic/545
@@ -26,8 +26,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_chattr i
diff --git a/tests/generic/546 b/tests/generic/546
index 2eb99543..97288685 100755
--- a/tests/generic/546
+++ b/tests/generic/546
@@ -27,10 +27,8 @@ _cleanup()
 . ./common/reflink
 . ./common/dmflakey
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_xfs_io_command "falloc"
 _require_scratch_reflink
 _require_dm_target flakey
diff --git a/tests/generic/547 b/tests/generic/547
index e8ccab52..1e3881db 100755
--- a/tests/generic/547
+++ b/tests/generic/547
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_scratch
 _require_fssum
diff --git a/tests/generic/548 b/tests/generic/548
index 638c5c76..7800a474 100755
--- a/tests/generic/548
+++ b/tests/generic/548
@@ -14,8 +14,6 @@ _begin_fstest auto quick encrypt
 . ./common/filter
 . ./common/encrypt
 
-# real QA test starts here
-_supported_fs generic
 
 _verify_ciphertext_for_encryption_policy AES-256-XTS AES-256-CTS-CBC
 
diff --git a/tests/generic/549 b/tests/generic/549
index f8faf11b..0aa4be82 100755
--- a/tests/generic/549
+++ b/tests/generic/549
@@ -14,8 +14,6 @@ _begin_fstest auto quick encrypt
 . ./common/filter
 . ./common/encrypt
 
-# real QA test starts here
-_supported_fs generic
 
 _verify_ciphertext_for_encryption_policy AES-128-CBC-ESSIV AES-128-CTS-CBC
 
diff --git a/tests/generic/550 b/tests/generic/550
index aa792089..053cedc0 100755
--- a/tests/generic/550
+++ b/tests/generic/550
@@ -14,8 +14,6 @@ _begin_fstest auto quick encrypt
 . ./common/filter
 . ./common/encrypt
 
-# real QA test starts here
-_supported_fs generic
 
 # Test both with and without the DIRECT_KEY flag.
 _verify_ciphertext_for_encryption_policy Adiantum Adiantum
diff --git a/tests/generic/551 b/tests/generic/551
index 58c7f9a5..f2907ac2 100755
--- a/tests/generic/551
+++ b/tests/generic/551
@@ -12,8 +12,6 @@ _begin_fstest auto stress aio
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_aiodio aio-dio-write-verify
 
diff --git a/tests/generic/552 b/tests/generic/552
index 727bec85..9f3d7fde 100755
--- a/tests/generic/552
+++ b/tests/generic/552
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_odirect
 _require_dm_target flakey
diff --git a/tests/generic/553 b/tests/generic/553
index 4a3d3953..919f5be9 100755
--- a/tests/generic/553
+++ b/tests/generic/553
@@ -26,8 +26,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_xfs_io_command "copy_range"
diff --git a/tests/generic/554 b/tests/generic/554
index b9efee0d..e0a14745 100755
--- a/tests/generic/554
+++ b/tests/generic/554
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_scratch
 _require_xfs_io_command "copy_range"
diff --git a/tests/generic/555 b/tests/generic/555
index d243dccf..8ee5faec 100755
--- a/tests/generic/555
+++ b/tests/generic/555
@@ -29,8 +29,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_xfs_io_command "chattr" "ia"
diff --git a/tests/generic/556 b/tests/generic/556
index 404a3243..51d2d482 100755
--- a/tests/generic/556
+++ b/tests/generic/556
@@ -12,7 +12,6 @@ _begin_fstest auto quick casefold
 . ./common/casefold
 . ./common/attr
 
-_supported_fs generic
 _require_scratch_nocheck
 _require_scratch_casefold
 _require_symlinks
diff --git a/tests/generic/557 b/tests/generic/557
index c547d537..742180e2 100755
--- a/tests/generic/557
+++ b/tests/generic/557
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_dm_target flakey
 
diff --git a/tests/generic/558 b/tests/generic/558
index 510b06f2..a8e3f7ff 100755
--- a/tests/generic/558
+++ b/tests/generic/558
@@ -27,8 +27,6 @@ create_file()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_inode_limits
 _require_scratch
 
diff --git a/tests/generic/559 b/tests/generic/559
index 98ab4474..28cf2e1a 100755
--- a/tests/generic/559
+++ b/tests/generic/559
@@ -13,8 +13,6 @@ _begin_fstest auto stress dedupe
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_duperemove
 
 fssize=$((2 * 1024 * 1024 * 1024))
diff --git a/tests/generic/560 b/tests/generic/560
index e3f28667..62983d69 100755
--- a/tests/generic/560
+++ b/tests/generic/560
@@ -15,8 +15,6 @@ _begin_fstest auto stress dedupe
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_duperemove
 
 _scratch_mkfs > $seqres.full 2>&1
diff --git a/tests/generic/561 b/tests/generic/561
index 44f07802..39e5977a 100755
--- a/tests/generic/561
+++ b/tests/generic/561
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_duperemove
 _require_command "$KILLALL_PROG" killall
 
diff --git a/tests/generic/562 b/tests/generic/562
index 7d98e569..91360c41 100755
--- a/tests/generic/562
+++ b/tests/generic/562
@@ -15,8 +15,6 @@ _begin_fstest auto clone punch
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_reflink
 _require_test_program "punch-alternating"
 _require_xfs_io_command "fpunch"
diff --git a/tests/generic/563 b/tests/generic/563
index f98c6e42..0a8129a6 100755
--- a/tests/generic/563
+++ b/tests/generic/563
@@ -29,10 +29,8 @@ _cleanup()
 . ./common/filter
 . ./common/cgroup2
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch_nocheck
 _require_cgroup2 io
 _require_loop
diff --git a/tests/generic/564 b/tests/generic/564
index 7ed5ccc1..647472d7 100755
--- a/tests/generic/564
+++ b/tests/generic/564
@@ -25,8 +25,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_loop
diff --git a/tests/generic/565 b/tests/generic/565
index fd71d1e3..3c65493f 100755
--- a/tests/generic/565
+++ b/tests/generic/565
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 
 _require_test
 _require_scratch
diff --git a/tests/generic/566 b/tests/generic/566
index 52b01f6d..a41e0485 100755
--- a/tests/generic/566
+++ b/tests/generic/566
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/quota
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_quota
 _require_xfs_quota_foreign
diff --git a/tests/generic/567 b/tests/generic/567
index 40a97d2d..fc109d0d 100755
--- a/tests/generic/567
+++ b/tests/generic/567
@@ -16,8 +16,6 @@ _begin_fstest auto quick rw punch
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_xfs_io_command "fpunch"
 
diff --git a/tests/generic/568 b/tests/generic/568
index 958e5e94..03dee60b 100755
--- a/tests/generic/568
+++ b/tests/generic/568
@@ -21,8 +21,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_xfs_io_command "falloc"
 
 testfile="$TEST_DIR/falloctest-$seq"
diff --git a/tests/generic/569 b/tests/generic/569
index eeaf3f16..345e4744 100755
--- a/tests/generic/569
+++ b/tests/generic/569
@@ -20,8 +20,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_xfs_io_command "falloc"
 _require_test_program swapon
 _require_scratch_swapfile
diff --git a/tests/generic/570 b/tests/generic/570
index 2143c742..6b50303c 100755
--- a/tests/generic/570
+++ b/tests/generic/570
@@ -20,8 +20,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test_program swapon
 _require_scratch_nocheck
 _require_block_device $SCRATCH_DEV
diff --git a/tests/generic/571 b/tests/generic/571
index bd5737fa..10d1622c 100755
--- a/tests/generic/571
+++ b/tests/generic/571
@@ -13,8 +13,6 @@ _begin_fstest auto quick
 . ./common/filter
 . ./common/locktest
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_test_fcntl_advisory_locks
 _require_test_fcntl_setlease
diff --git a/tests/generic/572 b/tests/generic/572
index d8071a34..80356760 100755
--- a/tests/generic/572
+++ b/tests/generic/572
@@ -26,8 +26,6 @@ _cleanup()
 . ./common/filter
 . ./common/verity
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_verity
 _disable_fsverity_signatures
 
diff --git a/tests/generic/573 b/tests/generic/573
index ca0f27f9..b310fccb 100755
--- a/tests/generic/573
+++ b/tests/generic/573
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/verity
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_verity
 _require_user
 _require_chattr ia
diff --git a/tests/generic/574 b/tests/generic/574
index bc0b17a0..cf287d2b 100755
--- a/tests/generic/574
+++ b/tests/generic/574
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/verity
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_verity
 _disable_fsverity_signatures
 _require_fsverity_corruption
diff --git a/tests/generic/575 b/tests/generic/575
index 344fd2b9..ce0c1732 100755
--- a/tests/generic/575
+++ b/tests/generic/575
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/verity
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_verity
 _disable_fsverity_signatures
 
diff --git a/tests/generic/576 b/tests/generic/576
index c8862de2..c9979c75 100755
--- a/tests/generic/576
+++ b/tests/generic/576
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/verity
 . ./common/encrypt
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_verity
 _require_scratch_encryption
 _require_command "$KEYCTL_PROG" keyctl
diff --git a/tests/generic/577 b/tests/generic/577
index bbbfdb0a..a32ef376 100755
--- a/tests/generic/577
+++ b/tests/generic/577
@@ -21,8 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/verity
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_verity
 _require_fsverity_builtin_signatures
 
diff --git a/tests/generic/578 b/tests/generic/578
index e8bb97f7..347f6f97 100755
--- a/tests/generic/578
+++ b/tests/generic/578
@@ -20,8 +20,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs generic
 _require_test_program "mmap-write-concurrent"
 _require_command "$FILEFRAG_PROG" filefrag
 _require_xfs_io_command "fiemap"
diff --git a/tests/generic/579 b/tests/generic/579
index 2667585c..3191342b 100755
--- a/tests/generic/579
+++ b/tests/generic/579
@@ -28,8 +28,6 @@ _cleanup()
 . ./common/filter
 . ./common/verity
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_verity
 _require_command "$KILLALL_PROG" killall
 _disable_fsverity_signatures
diff --git a/tests/generic/580 b/tests/generic/580
index 73f32ff9..eff3f210 100755
--- a/tests/generic/580
+++ b/tests/generic/580
@@ -16,8 +16,6 @@ echo
 . ./common/filter
 . ./common/encrypt
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_encryption -v 2
 
 _scratch_mkfs_encrypted &>> $seqres.full
diff --git a/tests/generic/581 b/tests/generic/581
index cabc7e1c..2773c910 100755
--- a/tests/generic/581
+++ b/tests/generic/581
@@ -28,8 +28,6 @@ _cleanup()
 . ./common/filter
 . ./common/encrypt
 
-# real QA test starts here
-_supported_fs generic
 _require_user
 _require_scratch_encryption -v 2
 
diff --git a/tests/generic/582 b/tests/generic/582
index bd7d2ea6..294ecbcd 100755
--- a/tests/generic/582
+++ b/tests/generic/582
@@ -16,8 +16,6 @@ _begin_fstest auto quick encrypt
 . ./common/filter
 . ./common/encrypt
 
-# real QA test starts here
-_supported_fs generic
 
 _verify_ciphertext_for_encryption_policy AES-256-XTS AES-256-CTS-CBC v2
 
diff --git a/tests/generic/583 b/tests/generic/583
index 771ecd1e..ac0a538c 100755
--- a/tests/generic/583
+++ b/tests/generic/583
@@ -16,8 +16,6 @@ _begin_fstest auto quick encrypt
 . ./common/filter
 . ./common/encrypt
 
-# real QA test starts here
-_supported_fs generic
 
 _verify_ciphertext_for_encryption_policy AES-128-CBC-ESSIV AES-128-CTS-CBC v2
 
diff --git a/tests/generic/584 b/tests/generic/584
index adafec6a..601dddc9 100755
--- a/tests/generic/584
+++ b/tests/generic/584
@@ -16,8 +16,6 @@ _begin_fstest auto quick encrypt
 . ./common/filter
 . ./common/encrypt
 
-# real QA test starts here
-_supported_fs generic
 
 # Test both with and without the DIRECT_KEY flag.
 _verify_ciphertext_for_encryption_policy Adiantum Adiantum v2
diff --git a/tests/generic/585 b/tests/generic/585
index 05762b23..fb675c8d 100755
--- a/tests/generic/585
+++ b/tests/generic/585
@@ -14,8 +14,6 @@ _begin_fstest auto rename
 . ./common/filter
 . ./common/renameat2
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_renameat2 whiteout
 
diff --git a/tests/generic/586 b/tests/generic/586
index 8fe6567f..22c3ad9c 100755
--- a/tests/generic/586
+++ b/tests/generic/586
@@ -20,8 +20,6 @@ _cleanup()
 
 # Import common functions.
 
-# real QA test starts here
-_supported_fs generic
 _require_aiodio "aio-dio-append-write-fallocate-race"
 _require_test
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/587 b/tests/generic/587
index ebfeea1d..46659679 100755
--- a/tests/generic/587
+++ b/tests/generic/587
@@ -19,8 +19,6 @@ _begin_fstest auto quick rw prealloc quota
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
-_supported_fs generic
 _require_user
 _require_quota
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/588 b/tests/generic/588
index a915a73e..0ee9f001 100755
--- a/tests/generic/588
+++ b/tests/generic/588
@@ -25,8 +25,6 @@ _cleanup()
 . ./common/reflink
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_reflink
 _require_dm_target flakey
 
diff --git a/tests/generic/589 b/tests/generic/589
index bfc7407a..0ce16556 100755
--- a/tests/generic/589
+++ b/tests/generic/589
@@ -38,8 +38,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_scratch
 _require_local_device $SCRATCH_DEV
diff --git a/tests/generic/590 b/tests/generic/590
index 5f84d004..2b7ccfb5 100755
--- a/tests/generic/590
+++ b/tests/generic/590
@@ -23,7 +23,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs generic
 _require_scratch_nocheck
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/591 b/tests/generic/591
index 4de50e2a..c22dc701 100755
--- a/tests/generic/591
+++ b/tests/generic/591
@@ -18,8 +18,6 @@ _cleanup()
 
 # Import common functions.
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_odirect
 _require_test_program "splice-test"
diff --git a/tests/generic/592 b/tests/generic/592
index e74d2e12..6c207f29 100755
--- a/tests/generic/592
+++ b/tests/generic/592
@@ -15,8 +15,6 @@ _begin_fstest auto quick encrypt
 . ./common/filter
 . ./common/encrypt
 
-# real QA test starts here
-_supported_fs generic
 
 _verify_ciphertext_for_encryption_policy AES-256-XTS AES-256-CTS-CBC \
 	v2 iv_ino_lblk_64
diff --git a/tests/generic/593 b/tests/generic/593
index 2dda5d76..05f868f9 100755
--- a/tests/generic/593
+++ b/tests/generic/593
@@ -15,8 +15,6 @@ _begin_fstest auto quick encrypt
 . ./common/filter
 . ./common/encrypt
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_encryption -v 2
 _require_command "$KEYCTL_PROG" keyctl
 
diff --git a/tests/generic/594 b/tests/generic/594
index 88f9a0dc..2c9be806 100755
--- a/tests/generic/594
+++ b/tests/generic/594
@@ -14,8 +14,6 @@ _begin_fstest auto quick quota
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_setquota_project
 # V4 XFS doesn't support to mount project and group quota together
diff --git a/tests/generic/595 b/tests/generic/595
index d559e3bb..afdbe0d3 100755
--- a/tests/generic/595
+++ b/tests/generic/595
@@ -27,8 +27,6 @@ _cleanup()
 . ./common/filter
 . ./common/encrypt
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_encryption -v 2
 _require_command "$KEYCTL_PROG" keyctl
 
diff --git a/tests/generic/596 b/tests/generic/596
index 2113d7f1..e6bca883 100755
--- a/tests/generic/596
+++ b/tests/generic/596
@@ -21,8 +21,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_bsd_process_accounting
 _require_chattr S
 _require_test
diff --git a/tests/generic/597 b/tests/generic/597
index a3035489..b97265fb 100755
--- a/tests/generic/597
+++ b/tests/generic/597
@@ -24,10 +24,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 _require_sysctl_variable fs.protected_symlinks
 _require_sysctl_variable fs.protected_hardlinks
diff --git a/tests/generic/598 b/tests/generic/598
index 31b7fde4..5b9db69e 100755
--- a/tests/generic/598
+++ b/tests/generic/598
@@ -24,10 +24,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 _require_sysctl_variable fs.protected_regular
 _require_sysctl_variable fs.protected_fifos
diff --git a/tests/generic/599 b/tests/generic/599
index 3fc86056..e1454584 100755
--- a/tests/generic/599
+++ b/tests/generic/599
@@ -15,8 +15,6 @@ status=0
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_fssum
 _require_scratch
 _require_scratch_shutdown
diff --git a/tests/generic/600 b/tests/generic/600
index a4233ecc..43f75376 100755
--- a/tests/generic/600
+++ b/tests/generic/600
@@ -17,8 +17,6 @@ _begin_fstest auto quick quota
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_quota
 _require_user
diff --git a/tests/generic/601 b/tests/generic/601
index f3f3ec9e..9860505b 100755
--- a/tests/generic/601
+++ b/tests/generic/601
@@ -17,8 +17,6 @@ _begin_fstest auto quick quota
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_quota
 _require_user
diff --git a/tests/generic/602 b/tests/generic/602
index c5072fab..6b21c948 100755
--- a/tests/generic/602
+++ b/tests/generic/602
@@ -15,8 +15,6 @@ _begin_fstest auto quick encrypt
 . ./common/filter
 . ./common/encrypt
 
-# real QA test starts here
-_supported_fs generic
 
 _verify_ciphertext_for_encryption_policy AES-256-XTS AES-256-CTS-CBC \
 	v2 iv_ino_lblk_32
diff --git a/tests/generic/603 b/tests/generic/603
index 08ddcbf2..32dcaeb9 100755
--- a/tests/generic/603
+++ b/tests/generic/603
@@ -104,8 +104,6 @@ test_grace()
 	cleanup_files $dir
 }
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 # xfs requires v5 format to support all three quota types at the same time
 if [ "$FSTYP" = "xfs" ]; then
diff --git a/tests/generic/604 b/tests/generic/604
index 1109a52c..c2e03c2e 100755
--- a/tests/generic/604
+++ b/tests/generic/604
@@ -13,10 +13,8 @@ _begin_fstest auto quick mount
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch
 
 _scratch_mkfs > /dev/null 2>&1
diff --git a/tests/generic/605 b/tests/generic/605
index 7e814d5b..2c372db7 100755
--- a/tests/generic/605
+++ b/tests/generic/605
@@ -12,7 +12,6 @@ _begin_fstest auto attr quick dax prealloc
 # Import common functions.
 . ./common/filter
 
-_supported_fs generic
 _require_hugepages
 _require_scratch_dax_mountopt "dax=always"
 _require_test_program "feature"
diff --git a/tests/generic/606 b/tests/generic/606
index e066d93a..8fdf07a0 100755
--- a/tests/generic/606
+++ b/tests/generic/606
@@ -19,7 +19,6 @@ _begin_fstest auto attr quick dax
 # Import common functions.
 . ./common/filter
 
-_supported_fs generic
 _require_scratch_dax_mountopt "dax=always"
 _require_dax_iflag
 _require_xfs_io_command "statx" "-r"
diff --git a/tests/generic/607 b/tests/generic/607
index 2cfe0773..d746d9dd 100755
--- a/tests/generic/607
+++ b/tests/generic/607
@@ -16,7 +16,6 @@ _begin_fstest auto attr quick dax
 # Import common functions.
 . ./common/filter
 
-_supported_fs generic
 _require_scratch
 _require_dax_iflag
 _require_xfs_io_command "lsattr" "-v"
diff --git a/tests/generic/608 b/tests/generic/608
index e36829c3..809f3987 100755
--- a/tests/generic/608
+++ b/tests/generic/608
@@ -20,7 +20,6 @@ _begin_fstest auto attr quick dax
 # Import common functions.
 . ./common/filter
 
-_supported_fs generic
 _require_scratch_dax_mountopt "dax=always"
 _require_dax_iflag
 _require_xfs_io_command "lsattr" "-v"
diff --git a/tests/generic/609 b/tests/generic/609
index f955e986..5cb6210a 100755
--- a/tests/generic/609
+++ b/tests/generic/609
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 _require_xfs_io_command "pwrite"
 _require_odirect
diff --git a/tests/generic/610 b/tests/generic/610
index 18cfcfff..22f28c6d 100755
--- a/tests/generic/610
+++ b/tests/generic/610
@@ -14,8 +14,6 @@ _begin_fstest auto quick prealloc zero punch
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_xfs_io_command "fzero"
 _require_xfs_io_command "fpunch"
diff --git a/tests/generic/611 b/tests/generic/611
index 3dfeb02b..cefc3942 100755
--- a/tests/generic/611
+++ b/tests/generic/611
@@ -17,9 +17,7 @@ _begin_fstest auto quick attr
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 
-_supported_fs generic
 _require_scratch
 _require_attrs
 
diff --git a/tests/generic/612 b/tests/generic/612
index 9c023a65..3c7209a0 100755
--- a/tests/generic/612
+++ b/tests/generic/612
@@ -18,10 +18,8 @@ _begin_fstest auto quick clone
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 _require_test_reflink
 
diff --git a/tests/generic/613 b/tests/generic/613
index 4cf5ccc6..499af18e 100755
--- a/tests/generic/613
+++ b/tests/generic/613
@@ -20,8 +20,6 @@ _begin_fstest auto quick encrypt
 . ./common/filter
 . ./common/encrypt
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_encryption -v 2
 _require_get_encryption_nonce_support
 _require_command "$XZ_PROG" xz
diff --git a/tests/generic/614 b/tests/generic/614
index 3e2a587c..2299c133 100755
--- a/tests/generic/614
+++ b/tests/generic/614
@@ -13,8 +13,6 @@ _begin_fstest auto quick rw
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_scratch_delalloc
 
diff --git a/tests/generic/615 b/tests/generic/615
index 94112298..71cdb9ac 100755
--- a/tests/generic/615
+++ b/tests/generic/615
@@ -14,8 +14,6 @@ _begin_fstest auto rw
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_odirect
 
diff --git a/tests/generic/616 b/tests/generic/616
index 5b0b02c5..0fe63c95 100755
--- a/tests/generic/616
+++ b/tests/generic/616
@@ -13,10 +13,8 @@ _begin_fstest auto rw io_uring stress soak
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 _require_io_uring
 
diff --git a/tests/generic/617 b/tests/generic/617
index a9778700..eb50a2da 100755
--- a/tests/generic/617
+++ b/tests/generic/617
@@ -13,10 +13,8 @@ _begin_fstest auto rw io_uring stress soak
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 _require_odirect
 _require_io_uring
diff --git a/tests/generic/618 b/tests/generic/618
index 992b8457..9af5b37b 100755
--- a/tests/generic/618
+++ b/tests/generic/618
@@ -18,9 +18,7 @@ _begin_fstest auto quick attr
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 
-_supported_fs generic
 _require_scratch
 _require_attrs user
 
diff --git a/tests/generic/619 b/tests/generic/619
index c4bdfbce..c2446d9d 100755
--- a/tests/generic/619
+++ b/tests/generic/619
@@ -43,7 +43,6 @@ MIX_FILE_SIZE=$((2048 * 1024))  # (BIG + SMALL small file size)
 . ./common/filter
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch
 _require_test_program "t_enospc"
 _require_xfs_io_command "falloc"
@@ -181,7 +180,6 @@ declare -a TEST_VECTORS=(
 "Mix-file-ftruncate-test:$MIX_FILE_SIZE:0.75,0.25:$FACT:$FTRUNCATE:3"
 )
 
-# real QA test starts here
 for i in "${TEST_VECTORS[@]}"; do
 	run_testcase $i
 done
diff --git a/tests/generic/620 b/tests/generic/620
index b052376f..bf97328d 100755
--- a/tests/generic/620
+++ b/tests/generic/620
@@ -31,7 +31,6 @@ _cleanup()
 . ./common/dmhugedisk
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch_size_nocheck $((4 * 1024 * 1024)) #kB
 _require_scratch_16T_support
 _require_dmhugedisk
diff --git a/tests/generic/621 b/tests/generic/621
index 8c204eb8..e5f92894 100755
--- a/tests/generic/621
+++ b/tests/generic/621
@@ -50,7 +50,6 @@ _cleanup()
 . ./common/encrypt
 . ./common/renameat2
 
-_supported_fs generic
 _require_scratch_encryption -v 2
 _require_renameat2 noreplace
 
diff --git a/tests/generic/622 b/tests/generic/622
index e03fdd71..0c744fde 100755
--- a/tests/generic/622
+++ b/tests/generic/622
@@ -74,7 +74,6 @@ _cleanup()
 
 . ./common/filter
 
-_supported_fs generic
 # This test uses the shutdown command, so it has to use the scratch filesystem
 # rather than the test filesystem.
 _require_scratch
diff --git a/tests/generic/623 b/tests/generic/623
index ea016d91..6487ccb8 100755
--- a/tests/generic/623
+++ b/tests/generic/623
@@ -11,7 +11,6 @@ _begin_fstest auto quick shutdown
 
 . ./common/filter
 
-_supported_fs generic
 _fixed_by_kernel_commit e4826691cc7e \
 	"xfs: restore shutdown check in mapped write fault path"
 
diff --git a/tests/generic/624 b/tests/generic/624
index db4b6731..da383f46 100755
--- a/tests/generic/624
+++ b/tests/generic/624
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/verity
 
-_supported_fs generic
 _require_scratch_verity
 _disable_fsverity_signatures
 fsv_orig_file=$SCRATCH_MNT/file
diff --git a/tests/generic/625 b/tests/generic/625
index 8903b9b5..0a99def0 100755
--- a/tests/generic/625
+++ b/tests/generic/625
@@ -16,7 +16,6 @@ _begin_fstest auto quick verity
 . ./common/filter
 . ./common/verity
 
-_supported_fs generic
 _require_scratch_verity
 _require_fsverity_builtin_signatures
 
diff --git a/tests/generic/626 b/tests/generic/626
index 7e577798..71db4476 100755
--- a/tests/generic/626
+++ b/tests/generic/626
@@ -17,8 +17,6 @@ _begin_fstest auto quick rename enospc
 . ./common/populate
 . ./common/renameat2
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_renameat2 whiteout
 
diff --git a/tests/generic/627 b/tests/generic/627
index 9a7359e6..527ec6bb 100755
--- a/tests/generic/627
+++ b/tests/generic/627
@@ -25,8 +25,6 @@ fio_out=$tmp.fio.out
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_scratch
 _require_odirect
diff --git a/tests/generic/628 b/tests/generic/628
index 380a7f0b..8fd44364 100755
--- a/tests/generic/628
+++ b/tests/generic/628
@@ -27,8 +27,6 @@ _cleanup()
 . ./common/reflink
 . ./common/dmerror
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_reflink
 _require_dm_target error
 _require_xfs_io_command "chattr" "s"
diff --git a/tests/generic/629 b/tests/generic/629
index dbd7ada8..92b7839a 100755
--- a/tests/generic/629
+++ b/tests/generic/629
@@ -26,8 +26,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmerror
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_dm_target error
 _require_xfs_io_command "chattr" "s"
diff --git a/tests/generic/630 b/tests/generic/630
index f1ea6b17..b2cbdcf0 100755
--- a/tests/generic/630
+++ b/tests/generic/630
@@ -14,8 +14,6 @@ _begin_fstest auto quick rw dedupe clone
 # Import common functions.
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_dedupe
 _require_test_program "deduperace"
 
diff --git a/tests/generic/631 b/tests/generic/631
index ff1bb113..c7c95e56 100755
--- a/tests/generic/631
+++ b/tests/generic/631
@@ -35,7 +35,6 @@ _cleanup()
 # Import common functions.
 . ./common/attr
 
-# real QA test starts here
 _require_scratch
 _require_attrs trusted
 _supported_fs ^overlay
diff --git a/tests/generic/632 b/tests/generic/632
index 4d6928a6..c7a1f1fa 100755
--- a/tests/generic/632
+++ b/tests/generic/632
@@ -19,7 +19,6 @@
 . ./common/preamble
 _begin_fstest auto quick mount
 
-_supported_fs generic
 _require_test
 _require_test_program "detached_mounts_propagation"
 
diff --git a/tests/generic/633 b/tests/generic/633
index 9b29dbf1..3bd18df6 100755
--- a/tests/generic/633
+++ b/tests/generic/633
@@ -12,9 +12,7 @@ _begin_fstest auto quick atime attr cap idmapped io_uring mount perms rw unlink
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs generic
 _require_test
 
 echo "Silence is golden"
diff --git a/tests/generic/634 b/tests/generic/634
index 5cdae584..8a4210a3 100755
--- a/tests/generic/634
+++ b/tests/generic/634
@@ -23,8 +23,6 @@ _begin_fstest auto quick atime bigtime
 
 # Import common functions.
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 
 _scratch_mkfs > $seqres.full
diff --git a/tests/generic/635 b/tests/generic/635
index 198278c4..4a811630 100755
--- a/tests/generic/635
+++ b/tests/generic/635
@@ -24,8 +24,6 @@ _begin_fstest auto quick atime bigtime shutdown
 
 # Import common functions.
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_scratch_shutdown
 
diff --git a/tests/generic/636 b/tests/generic/636
index afb9df98..2ae74310 100755
--- a/tests/generic/636
+++ b/tests/generic/636
@@ -13,7 +13,6 @@ _begin_fstest auto quick swap
 # Import common functions.
 . ./common/filter
 
-_supported_fs generic
 _require_scratch_swapfile
 _require_test_program mkswap
 _require_test_program swapon
diff --git a/tests/generic/637 b/tests/generic/637
index 8805a171..e63fc0ba 100755
--- a/tests/generic/637
+++ b/tests/generic/637
@@ -11,8 +11,6 @@ _begin_fstest auto quick dir
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 
 testdir=$TEST_DIR/test-$seq
diff --git a/tests/generic/638 b/tests/generic/638
index fff25e66..3de9801c 100755
--- a/tests/generic/638
+++ b/tests/generic/638
@@ -25,8 +25,6 @@ _begin_fstest auto quick rw
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_test_program "t_mmap_writev_overlap"
 
diff --git a/tests/generic/639 b/tests/generic/639
index abb91c80..9ef67bc5 100755
--- a/tests/generic/639
+++ b/tests/generic/639
@@ -16,8 +16,6 @@ _begin_fstest auto quick rw
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 
 testfile="$TEST_DIR/test_write_begin.$$"
diff --git a/tests/generic/640 b/tests/generic/640
index a9346d5b..038dde97 100755
--- a/tests/generic/640
+++ b/tests/generic/640
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_dm_target flakey
 
diff --git a/tests/generic/641 b/tests/generic/641
index 124f2e1d..a6efcd4c 100755
--- a/tests/generic/641
+++ b/tests/generic/641
@@ -14,8 +14,6 @@ _begin_fstest auto quick swap collapse
 # Import common functions
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_scratch_swapfile
 _require_test_program mkswap
diff --git a/tests/generic/642 b/tests/generic/642
index 4d0c41fd..a7112a08 100755
--- a/tests/generic/642
+++ b/tests/generic/642
@@ -18,7 +18,6 @@ _cleanup()
 }
 
 # Modify as appropriate.
-_supported_fs generic
 
 _require_scratch
 _require_command "$KILLALL_PROG" "killall"
diff --git a/tests/generic/643 b/tests/generic/643
index 9a0ec2c3..e407ae3e 100755
--- a/tests/generic/643
+++ b/tests/generic/643
@@ -26,8 +26,6 @@ _cleanup()
 
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_swapfile
 
 _scratch_mkfs >> $seqres.full
diff --git a/tests/generic/644 b/tests/generic/644
index c48338d8..e273ffc8 100755
--- a/tests/generic/644
+++ b/tests/generic/644
@@ -12,9 +12,7 @@ _begin_fstest auto quick cap idmapped mount
 # get standard environment, filters and checks
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs generic
 _require_idmapped_mounts
 _require_test
 
diff --git a/tests/generic/645 b/tests/generic/645
index 249e9cc0..068a46a9 100755
--- a/tests/generic/645
+++ b/tests/generic/645
@@ -12,9 +12,7 @@ _begin_fstest auto quick idmapped mount
 # get standard environment, filters and checks
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs generic
 _require_idmapped_mounts
 _require_test
 _wants_kernel_commit dacfd001eaf2 \
diff --git a/tests/generic/646 b/tests/generic/646
index 027df557..dc73aeb3 100755
--- a/tests/generic/646
+++ b/tests/generic/646
@@ -14,8 +14,6 @@
 . ./common/preamble
 _begin_fstest auto quick recoveryloop shutdown
 
-# real QA test starts here
-_supported_fs generic
 _fixed_by_kernel_commit 50d25484bebe \
 	"xfs: sync lazy sb accounting on quiesce of read-only mounts"
 
diff --git a/tests/generic/647 b/tests/generic/647
index 8484fa8d..99b13b38 100755
--- a/tests/generic/647
+++ b/tests/generic/647
@@ -20,9 +20,7 @@ _cleanup()
 # get standard environment, filters and checks
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs generic
 _require_test
 _require_odirect
 _require_test_program mmap-rw-fault
diff --git a/tests/generic/648 b/tests/generic/648
index 3b3544ff..29d1b470 100755
--- a/tests/generic/648
+++ b/tests/generic/648
@@ -33,7 +33,6 @@ _cleanup()
 . ./common/reflink
 
 # Modify as appropriate.
-_supported_fs generic
 
 _require_scratch_reflink
 _require_cp_reflink
diff --git a/tests/generic/649 b/tests/generic/649
index 2e156dfe..a33b13ea 100755
--- a/tests/generic/649
+++ b/tests/generic/649
@@ -29,10 +29,8 @@ _cleanup()
 . ./common/reflink
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _fixed_by_kernel_commit 72a048c1056a \
 	"xfs: only set IOMAP_F_SHARED when providing a srcmap to a write"
 
diff --git a/tests/generic/650 b/tests/generic/650
index e152c398..5d2cb897 100755
--- a/tests/generic/650
+++ b/tests/generic/650
@@ -38,7 +38,6 @@ exercise_cpu_hotplug()
 	done
 }
 
-_supported_fs generic
 _require_test
 _require_command "$KILLALL_PROG" "killall"
 
diff --git a/tests/generic/651 b/tests/generic/651
index cc239f48..0d79f3f2 100755
--- a/tests/generic/651
+++ b/tests/generic/651
@@ -16,7 +16,6 @@ _begin_fstest auto quick clone
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 
 pagesz=$(getconf PAGE_SIZE)
diff --git a/tests/generic/652 b/tests/generic/652
index d7b74e0e..e45dbbd2 100755
--- a/tests/generic/652
+++ b/tests/generic/652
@@ -16,7 +16,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/653 b/tests/generic/653
index a63c7138..bd3896cb 100755
--- a/tests/generic/653
+++ b/tests/generic/653
@@ -16,7 +16,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/654 b/tests/generic/654
index f73ae81b..4b2986ec 100755
--- a/tests/generic/654
+++ b/tests/generic/654
@@ -16,7 +16,6 @@ _begin_fstest auto quick clone fiemap prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/655 b/tests/generic/655
index a131b1d1..e2a503b4 100755
--- a/tests/generic/655
+++ b/tests/generic/655
@@ -17,7 +17,6 @@ _begin_fstest auto quick clone fiemap prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/656 b/tests/generic/656
index 5c090cfa..cd49c4f6 100755
--- a/tests/generic/656
+++ b/tests/generic/656
@@ -14,9 +14,7 @@ _begin_fstest auto attr cap idmapped mount perms
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs generic
 _require_idmapped_mounts
 _require_test
 _require_user fsgqa
diff --git a/tests/generic/657 b/tests/generic/657
index e0fecd54..df45afcb 100755
--- a/tests/generic/657
+++ b/tests/generic/657
@@ -18,7 +18,6 @@ _begin_fstest auto quick clone
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 
 echo "Format and mount"
diff --git a/tests/generic/658 b/tests/generic/658
index a5cbadaa..03d5a7a1 100755
--- a/tests/generic/658
+++ b/tests/generic/658
@@ -18,7 +18,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/659 b/tests/generic/659
index ccc2d795..cef2b232 100755
--- a/tests/generic/659
+++ b/tests/generic/659
@@ -18,7 +18,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/660 b/tests/generic/660
index bc17dc5e..650e5e83 100755
--- a/tests/generic/660
+++ b/tests/generic/660
@@ -18,7 +18,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/661 b/tests/generic/661
index 788dae7e..74c080ab 100755
--- a/tests/generic/661
+++ b/tests/generic/661
@@ -19,7 +19,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_scratch_delalloc
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/662 b/tests/generic/662
index 3fdfb4e0..54405b98 100755
--- a/tests/generic/662
+++ b/tests/generic/662
@@ -23,7 +23,6 @@ _begin_fstest auto quick clone punch prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_scratch_delalloc
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/663 b/tests/generic/663
index 658a5b70..2129805c 100755
--- a/tests/generic/663
+++ b/tests/generic/663
@@ -19,7 +19,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/664 b/tests/generic/664
index 3009101f..fdedc486 100755
--- a/tests/generic/664
+++ b/tests/generic/664
@@ -21,7 +21,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/665 b/tests/generic/665
index 86ba5787..b0676dc8 100755
--- a/tests/generic/665
+++ b/tests/generic/665
@@ -21,7 +21,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 
diff --git a/tests/generic/666 b/tests/generic/666
index 5e4f3062..8575c06c 100755
--- a/tests/generic/666
+++ b/tests/generic/666
@@ -22,7 +22,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_scratch_delalloc
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/667 b/tests/generic/667
index 9f1cb1be..40655098 100755
--- a/tests/generic/667
+++ b/tests/generic/667
@@ -22,7 +22,6 @@ _begin_fstest auto quick clone punch prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_scratch_delalloc
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/668 b/tests/generic/668
index 41e03ae8..aab39575 100755
--- a/tests/generic/668
+++ b/tests/generic/668
@@ -22,7 +22,6 @@ _begin_fstest auto quick clone punch prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_scratch_delalloc
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/669 b/tests/generic/669
index c8816042..aa7b0d55 100755
--- a/tests/generic/669
+++ b/tests/generic/669
@@ -22,7 +22,6 @@ _begin_fstest auto quick clone punch prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_scratch_delalloc
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/670 b/tests/generic/670
index 67de1674..67a8f6fe 100755
--- a/tests/generic/670
+++ b/tests/generic/670
@@ -15,7 +15,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 
diff --git a/tests/generic/671 b/tests/generic/671
index b6cc0573..f2006911 100755
--- a/tests/generic/671
+++ b/tests/generic/671
@@ -15,7 +15,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_cp_reflink
 
diff --git a/tests/generic/672 b/tests/generic/672
index 9e3a97ec..832907de 100755
--- a/tests/generic/672
+++ b/tests/generic/672
@@ -15,7 +15,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 
 echo "Format and mount"
diff --git a/tests/generic/673 b/tests/generic/673
index ac8b8c09..1230b51e 100755
--- a/tests/generic/673
+++ b/tests/generic/673
@@ -13,10 +13,8 @@ _begin_fstest auto clone quick perms
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_user
 _require_scratch_reflink
 
diff --git a/tests/generic/674 b/tests/generic/674
index 2ed022df..2e395290 100755
--- a/tests/generic/674
+++ b/tests/generic/674
@@ -13,10 +13,8 @@ _begin_fstest auto clone quick perms dedupe
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_user
 _require_scratch_dedupe
 _require_xfs_io_command dedupe
diff --git a/tests/generic/675 b/tests/generic/675
index cc4309e4..7c062db8 100755
--- a/tests/generic/675
+++ b/tests/generic/675
@@ -14,10 +14,8 @@ _begin_fstest auto clone quick
 . ./common/reflink
 . ./common/attr
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_user
 _require_command "$GETCAP_PROG" getcap
 _require_command "$SETCAP_PROG" setcap
diff --git a/tests/generic/676 b/tests/generic/676
index 7a9d5386..45b27698 100755
--- a/tests/generic/676
+++ b/tests/generic/676
@@ -22,10 +22,8 @@ _cleanup()
 # Import common functions.
 # . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 _require_test_program "t_readdir_3"
 
diff --git a/tests/generic/677 b/tests/generic/677
index 84146c5e..f2081c34 100755
--- a/tests/generic/677
+++ b/tests/generic/677
@@ -22,9 +22,7 @@ _cleanup()
 . ./common/dmflakey
 . ./common/punch
 
-# real QA test starts here
 
-_supported_fs generic
 _require_scratch
 _require_dm_target flakey
 _require_xfs_io_command "falloc" "-k"
diff --git a/tests/generic/678 b/tests/generic/678
index 3c3c05b7..8396c49d 100755
--- a/tests/generic/678
+++ b/tests/generic/678
@@ -24,9 +24,7 @@ _cleanup()
 # get standard environment, filters and checks
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs generic
 _require_test
 _require_odirect
 _require_io_uring
diff --git a/tests/generic/679 b/tests/generic/679
index ddf975a2..4c74101c 100755
--- a/tests/generic/679
+++ b/tests/generic/679
@@ -14,7 +14,6 @@ _begin_fstest auto quick prealloc fiemap
 . ./common/filter
 . ./common/punch
 
-# real QA test starts here
 
 _require_scratch
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/680 b/tests/generic/680
index 909f7592..07048db5 100755
--- a/tests/generic/680
+++ b/tests/generic/680
@@ -11,8 +11,6 @@
 . ./common/preamble
 _begin_fstest auto quick
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_user
 _require_chmod
diff --git a/tests/generic/681 b/tests/generic/681
index f4164774..aef54205 100755
--- a/tests/generic/681
+++ b/tests/generic/681
@@ -18,10 +18,8 @@ _begin_fstest auto quick quota
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_quota
 _require_user
 _require_scratch
diff --git a/tests/generic/682 b/tests/generic/682
index 41759880..3572af17 100755
--- a/tests/generic/682
+++ b/tests/generic/682
@@ -18,10 +18,8 @@ _begin_fstest auto quick quota
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_quota
 _require_user
 _require_scratch
diff --git a/tests/generic/683 b/tests/generic/683
index 304b1a48..cf1ebbc4 100755
--- a/tests/generic/683
+++ b/tests/generic/683
@@ -20,10 +20,8 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_user
 _require_test
 verb=falloc
diff --git a/tests/generic/684 b/tests/generic/684
index 1ebffb01..e1eb4e11 100755
--- a/tests/generic/684
+++ b/tests/generic/684
@@ -20,10 +20,8 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_user
 _require_test
 verb=fpunch
diff --git a/tests/generic/685 b/tests/generic/685
index e4ada8e7..bec2c5a0 100755
--- a/tests/generic/685
+++ b/tests/generic/685
@@ -20,10 +20,8 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_user
 _require_test
 verb=fzero
diff --git a/tests/generic/686 b/tests/generic/686
index d56aa7cc..efcc3f61 100755
--- a/tests/generic/686
+++ b/tests/generic/686
@@ -20,10 +20,8 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_user
 _require_test
 verb=finsert
diff --git a/tests/generic/687 b/tests/generic/687
index 3a7f1fd5..e05f0fdc 100755
--- a/tests/generic/687
+++ b/tests/generic/687
@@ -20,10 +20,8 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_user
 _require_test
 verb=fcollapse
diff --git a/tests/generic/688 b/tests/generic/688
index e2bf12b4..9c19356d 100755
--- a/tests/generic/688
+++ b/tests/generic/688
@@ -20,10 +20,8 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_user
 _require_command "$GETCAP_PROG" getcap
 _require_command "$SETCAP_PROG" setcap
diff --git a/tests/generic/689 b/tests/generic/689
index 6aff9695..36c74cd7 100755
--- a/tests/generic/689
+++ b/tests/generic/689
@@ -16,9 +16,7 @@ _begin_fstest auto quick perms idmapped
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs generic
 _require_test
 _require_idmapped_mounts
 _require_user fsgqa
diff --git a/tests/generic/690 b/tests/generic/690
index cef8d6e8..ba0da30d 100755
--- a/tests/generic/690
+++ b/tests/generic/690
@@ -27,9 +27,7 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
 
-_supported_fs generic
 _require_scratch
 _require_symlinks
 _require_dm_target flakey
diff --git a/tests/generic/691 b/tests/generic/691
index 6432834f..25ce92bc 100755
--- a/tests/generic/691
+++ b/tests/generic/691
@@ -27,8 +27,6 @@ _cleanup()
 # Import common functions.
 . ./common/quota
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_quota
 _require_user
diff --git a/tests/generic/692 b/tests/generic/692
index 3fb8ac01..5af89a6e 100755
--- a/tests/generic/692
+++ b/tests/generic/692
@@ -27,8 +27,6 @@ _cleanup()
 . ./common/filter
 . ./common/verity
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_math
 _require_scratch_verity
diff --git a/tests/generic/693 b/tests/generic/693
index 1596865e..1f3250d5 100755
--- a/tests/generic/693
+++ b/tests/generic/693
@@ -17,8 +17,6 @@ _begin_fstest auto quick encrypt
 . ./common/filter
 . ./common/encrypt
 
-# real QA test starts here
-_supported_fs generic
 
 _verify_ciphertext_for_encryption_policy AES-256-XTS AES-256-HCTR2 v2
 _verify_ciphertext_for_encryption_policy AES-256-XTS AES-256-HCTR2 \
diff --git a/tests/generic/694 b/tests/generic/694
index c96c2154..02253ef7 100755
--- a/tests/generic/694
+++ b/tests/generic/694
@@ -20,7 +20,6 @@ _cleanup()
 	rm -r -f $tmp.* $junk_dir
 }
 
-_supported_fs generic
 _fixed_by_kernel_commit 0c336d6e33f4 \
 	"exfat: fix incorrect loading of i_blocks for large file"
 
diff --git a/tests/generic/695 b/tests/generic/695
index d53457dc..8179d59a 100755
--- a/tests/generic/695
+++ b/tests/generic/695
@@ -25,7 +25,6 @@ _cleanup()
 . ./common/dmflakey
 . ./common/punch
 
-_supported_fs generic
 _fixed_by_kernel_commit e6e3dec6c3c288 \
         "btrfs: update generation of hole file extent item when merging holes"
 _require_scratch
diff --git a/tests/generic/696 b/tests/generic/696
index 55a2fd5a..d06e86ee 100755
--- a/tests/generic/696
+++ b/tests/generic/696
@@ -17,9 +17,7 @@ _begin_fstest auto quick cap idmapped mount perms rw unlink
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs generic
 _require_test
 _require_scratch
 _fixed_by_kernel_commit ac6800e279a2 \
diff --git a/tests/generic/697 b/tests/generic/697
index 8d7ad651..355753d2 100755
--- a/tests/generic/697
+++ b/tests/generic/697
@@ -17,9 +17,7 @@ _begin_fstest auto quick cap acl idmapped mount perms rw unlink
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 
-_supported_fs generic
 _require_test
 _require_acls
 _fixed_by_kernel_commit 1639a49ccdce \
diff --git a/tests/generic/698 b/tests/generic/698
index 143490b2..28928b2f 100755
--- a/tests/generic/698
+++ b/tests/generic/698
@@ -22,8 +22,6 @@ _cleanup()
 	rm -r -f $tmp.*
 }
 
-# real QA test starts here
-_supported_fs generic
 _fixed_by_kernel_commit 168f91289340 \
 	"fs: account for group membership"
 _require_scratch
diff --git a/tests/generic/699 b/tests/generic/699
index 82e83644..67730753 100755
--- a/tests/generic/699
+++ b/tests/generic/699
@@ -21,7 +21,6 @@ _cleanup()
 	rm -r -f $tmp.*
 }
 
-# real QA test starts here
 _supported_fs ^overlay
 _require_extra_fs overlay
 _require_scratch
diff --git a/tests/generic/700 b/tests/generic/700
index fcf4e3fe..052cfbd6 100755
--- a/tests/generic/700
+++ b/tests/generic/700
@@ -15,8 +15,6 @@ _begin_fstest auto quick rename attr whiteout
 . ./common/attr
 . ./common/renameat2
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_attrs
 _require_renameat2 whiteout
diff --git a/tests/generic/701 b/tests/generic/701
index 26dec403..527bba34 100755
--- a/tests/generic/701
+++ b/tests/generic/701
@@ -22,7 +22,6 @@ _cleanup()
 	rm -r -f $tmp.* $junk_dir
 }
 
-_supported_fs generic
 _fixed_by_kernel_commit 92fba084b79e \
 	"exfat: fix i_blocks for files truncated over 4 GiB"
 
diff --git a/tests/generic/702 b/tests/generic/702
index f93bc946..a506e07d 100755
--- a/tests/generic/702
+++ b/tests/generic/702
@@ -17,7 +17,6 @@ _begin_fstest auto quick clone fiemap
 _fixed_by_kernel_commit ac3c0d36a2a2f7 \
 	"btrfs: make fiemap more efficient and accurate reporting extent sharedness"
 
-_supported_fs generic
 _require_scratch_reflink
 _require_xfs_io_command "fiemap"
 
diff --git a/tests/generic/703 b/tests/generic/703
index 7afb7466..8ee1d558 100755
--- a/tests/generic/703
+++ b/tests/generic/703
@@ -27,7 +27,6 @@ test_file="${SCRATCH_MNT}/foo"
 	_fixed_by_kernel_commit 8184620ae212 \
 	"btrfs: fix lost file sync on direct IO write with nowait and dsync iocb"
 
-_supported_fs generic
 # We allocate 256M of data for the test file, so require a higher size of 512M
 # which gives a margin of safety for a COW filesystem like btrfs (where metadata
 # is always COWed).
diff --git a/tests/generic/704 b/tests/generic/704
index 6cc4bb4a..f39d4706 100755
--- a/tests/generic/704
+++ b/tests/generic/704
@@ -21,8 +21,6 @@ _cleanup()
 # Import common functions.
 . ./common/scsi_debug
 
-# real QA test starts here
-_supported_fs generic
 _fixed_by_kernel_commit 7c71ee78031c "xfs: allow logical-sector sized O_DIRECT"
 _require_scsi_debug
 # If TEST_DEV is block device, make sure current fs is a localfs which can be
diff --git a/tests/generic/705 b/tests/generic/705
index 7b6e5570..9c27fbbc 100755
--- a/tests/generic/705
+++ b/tests/generic/705
@@ -10,8 +10,6 @@
 . ./common/preamble
 _begin_fstest auto shutdown
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_scratch_shutdown
 _require_command "$FILEFRAG_PROG" filefrag
diff --git a/tests/generic/706 b/tests/generic/706
index b3e7aa7c..ce248814 100755
--- a/tests/generic/706
+++ b/tests/generic/706
@@ -14,7 +14,6 @@ _begin_fstest auto quick seek
 	_fixed_by_kernel_commit 2f2e84ca6066 \
 	"btrfs: fix off-by-one in delalloc search during lseek"
 
-_supported_fs generic
 _require_test
 _require_seek_data_hole
 _require_test_program "seek_sanity_test"
diff --git a/tests/generic/707 b/tests/generic/707
index da9dc5b6..fd02eacf 100755
--- a/tests/generic/707
+++ b/tests/generic/707
@@ -11,7 +11,6 @@
 . ./common/preamble
 _begin_fstest auto
 
-_supported_fs generic
 _require_scratch
 
 _fixed_by_kernel_commit f950fd052913 \
diff --git a/tests/generic/708 b/tests/generic/708
index 6809a50c..53bb0ee4 100755
--- a/tests/generic/708
+++ b/tests/generic/708
@@ -17,8 +17,6 @@ _begin_fstest quick auto
 	_fixed_by_kernel_commit b73a6fd1b1ef \
 		"btrfs: split partial dio bios before submit"
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_odirect
 _require_test_program dio-buf-fault
diff --git a/tests/generic/709 b/tests/generic/709
index f3b827cb..e3994d00 100755
--- a/tests/generic/709
+++ b/tests/generic/709
@@ -13,7 +13,6 @@ _begin_fstest auto quick fiexchange quota
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
 _require_xfs_io_command exchangerange
 _require_user
 _require_nobody
diff --git a/tests/generic/710 b/tests/generic/710
index c344bd89..072cddf5 100755
--- a/tests/generic/710
+++ b/tests/generic/710
@@ -13,7 +13,6 @@ _begin_fstest auto quick fiexchange quota
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
 _require_xfs_io_command exchangerange
 _require_user
 _require_nobody
diff --git a/tests/generic/711 b/tests/generic/711
index 79213630..9c85b745 100755
--- a/tests/generic/711
+++ b/tests/generic/711
@@ -20,7 +20,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _require_xfs_io_command swapext
 _require_test
 
diff --git a/tests/generic/712 b/tests/generic/712
index a5f2ac26..fa85ef1b 100755
--- a/tests/generic/712
+++ b/tests/generic/712
@@ -19,7 +19,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _require_test_program punch-alternating
 _require_xfs_io_command exchangerange
 _require_test
diff --git a/tests/generic/713 b/tests/generic/713
index b0165b1d..5541aee0 100755
--- a/tests/generic/713
+++ b/tests/generic/713
@@ -20,7 +20,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_xfs_io_command exchangerange ' -s 64k -l 64k'
 _require_xfs_io_command "falloc"
 _require_test
diff --git a/tests/generic/714 b/tests/generic/714
index 4d2d4a0b..66de1fb0 100755
--- a/tests/generic/714
+++ b/tests/generic/714
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_xfs_io_command exchangerange
 _require_xfs_io_command "falloc"
 _require_test_reflink
diff --git a/tests/generic/715 b/tests/generic/715
index 60a5381e..9713038f 100755
--- a/tests/generic/715
+++ b/tests/generic/715
@@ -20,7 +20,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_xfs_io_command exchangerange ' -s 64k -l 64k'
 _require_test
 
diff --git a/tests/generic/716 b/tests/generic/716
index dbfa4263..a2b86225 100755
--- a/tests/generic/716
+++ b/tests/generic/716
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_xfs_io_command exchangerange
 _require_xfs_io_command startupdate
 _require_test_reflink
diff --git a/tests/generic/717 b/tests/generic/717
index 7bc917e5..4378e964 100755
--- a/tests/generic/717
+++ b/tests/generic/717
@@ -20,7 +20,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_xfs_io_command exchangerange
 _require_xfs_io_command startupdate
 _require_test
diff --git a/tests/generic/718 b/tests/generic/718
index ab81dbec..ed3a1fee 100755
--- a/tests/generic/718
+++ b/tests/generic/718
@@ -20,7 +20,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_xfs_io_command exchangerange
 _require_test
 
diff --git a/tests/generic/719 b/tests/generic/719
index 1f8da3a9..c82cf955 100755
--- a/tests/generic/719
+++ b/tests/generic/719
@@ -22,7 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _require_xfs_io_command exchangerange
 _require_xfs_io_command startupdate '-e'
 _require_test
diff --git a/tests/generic/720 b/tests/generic/720
index b4449888..9f6f1889 100755
--- a/tests/generic/720
+++ b/tests/generic/720
@@ -19,7 +19,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _require_xfs_io_command exchangerange
 _require_test_program punch-alternating
 _require_test
diff --git a/tests/generic/721 b/tests/generic/721
index 406e2b68..98505aac 100755
--- a/tests/generic/721
+++ b/tests/generic/721
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_xfs_io_command startupdate
 _require_test_reflink
 _require_test
diff --git a/tests/generic/722 b/tests/generic/722
index 85afa2e0..5542c045 100755
--- a/tests/generic/722
+++ b/tests/generic/722
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_program "punch-alternating"
 _require_xfs_io_command exchangerange
 _require_scratch
diff --git a/tests/generic/723 b/tests/generic/723
index f1df1e53..795f8ea2 100755
--- a/tests/generic/723
+++ b/tests/generic/723
@@ -20,7 +20,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_test_program "punch-alternating"
 _require_xfs_io_command exchangerange
 _require_scratch
diff --git a/tests/generic/724 b/tests/generic/724
index 2d58ccb9..da202c6e 100755
--- a/tests/generic/724
+++ b/tests/generic/724
@@ -21,7 +21,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _require_xfs_io_command exchangerange
 _require_scratch
 
diff --git a/tests/generic/725 b/tests/generic/725
index e5e2139c..e1db83b5 100755
--- a/tests/generic/725
+++ b/tests/generic/725
@@ -21,7 +21,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _require_xfs_io_command exchangerange
 _require_xfs_io_command startupdate '-e'
 _require_scratch
diff --git a/tests/generic/726 b/tests/generic/726
index 3b186ab6..00071b1d 100755
--- a/tests/generic/726
+++ b/tests/generic/726
@@ -20,10 +20,8 @@ _begin_fstest auto fiexchange quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_user
 _require_xfs_io_command exchangerange
 _require_xfs_io_command startupdate
diff --git a/tests/generic/727 b/tests/generic/727
index f737d4dd..dbed1d45 100755
--- a/tests/generic/727
+++ b/tests/generic/727
@@ -21,10 +21,8 @@ _begin_fstest auto fiexchange quick
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_user
 _require_command "$GETCAP_PROG" getcap
 _require_command "$SETCAP_PROG" setcap
diff --git a/tests/generic/728 b/tests/generic/728
index fe3486be..9a204279 100755
--- a/tests/generic/728
+++ b/tests/generic/728
@@ -13,8 +13,6 @@ _begin_fstest auto quick attr
 # Import common functions
 . ./common/attr
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_attrs
 
diff --git a/tests/generic/729 b/tests/generic/729
index 66242ed2..e0cd18d8 100755
--- a/tests/generic/729
+++ b/tests/generic/729
@@ -27,9 +27,7 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs generic
 _require_test
 _require_odirect
 _require_test_program mmap-rw-fault
diff --git a/tests/generic/730 b/tests/generic/730
index 988c47e1..062314ea 100755
--- a/tests/generic/730
+++ b/tests/generic/730
@@ -20,7 +20,6 @@ _cleanup()
 . ./common/filter
 . ./common/scsi_debug
 
-_supported_fs generic
 
 # We don't actually use the test device, but we need a block based fs
 _require_test
diff --git a/tests/generic/731 b/tests/generic/731
index b279e3f7..cd39e8b0 100755
--- a/tests/generic/731
+++ b/tests/generic/731
@@ -24,7 +24,6 @@ _cleanup()
 # We don't actually use the test device, but we need a block based fs
 _require_test
 _require_block_device $TEST_DEV
-_supported_fs generic
 _require_scsi_debug
 
 size=$(_small_fs_size_mb 256)
diff --git a/tests/generic/732 b/tests/generic/732
index 7a40f49b..a571f0f5 100755
--- a/tests/generic/732
+++ b/tests/generic/732
@@ -21,7 +21,6 @@ _cleanup()
 	rm -r -f $tmp.*
 }
 
-# real QA test starts here
 _supported_fs ^nfs ^overlay
 
 _require_test
diff --git a/tests/generic/733 b/tests/generic/733
index f6ee7f71..aa7ad994 100755
--- a/tests/generic/733
+++ b/tests/generic/733
@@ -18,8 +18,6 @@ _begin_fstest auto clone punch
 . ./common/attr
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fpunch"
diff --git a/tests/generic/734 b/tests/generic/734
index 93c2ad90..6eb9eb95 100755
--- a/tests/generic/734
+++ b/tests/generic/734
@@ -19,7 +19,6 @@ _cleanup()
 	rm -r -f $tmp.* $testdir
 }
 
-# real QA test starts here
 
 # Import common functions.
 . ./common/filter
@@ -28,8 +27,6 @@ _cleanup()
 _fixed_by_git_commit kernel 35d30c9cf127 \
 	"iomap: don't skip reading in !uptodate folios when unsharing a range"
 
-# real QA test starts here
-_supported_fs generic
 _require_test_reflink
 _require_cp_reflink
 _require_xfs_io_command "funshare"
diff --git a/tests/generic/735 b/tests/generic/735
index 89107a61..1aeeb9a4 100755
--- a/tests/generic/735
+++ b/tests/generic/735
@@ -14,7 +14,6 @@
 . ./common/populate
 _begin_fstest auto quick insert prealloc
 
-# real QA test starts here
 if [[ "$FSTYP" =~ ext[0-9]+ ]]; then
 	_fixed_by_kernel_commit bc056e7163ac "ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow"
 	_fixed_by_kernel_commit 2dcf5fde6dff "ext4: prevent the normalized size from exceeding EXT_MAX_BLOCKS"
diff --git a/tests/generic/736 b/tests/generic/736
index d2432a82..2fe7ba8e 100755
--- a/tests/generic/736
+++ b/tests/generic/736
@@ -18,7 +18,6 @@ _cleanup()
 	rm -fr $target_dir
 }
 
-_supported_fs generic
 _require_test
 _require_test_program readdir-while-renames
 
diff --git a/tests/generic/737 b/tests/generic/737
index 4563b1bd..99ca1f39 100755
--- a/tests/generic/737
+++ b/tests/generic/737
@@ -11,8 +11,6 @@
 . ./common/preamble
 _begin_fstest auto quick shutdown aio
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_scratch_shutdown
 _require_aiodio aio-dio-write-verify
diff --git a/tests/generic/738 b/tests/generic/738
index 2b37b1e7..4da2d887 100755
--- a/tests/generic/738
+++ b/tests/generic/738
@@ -17,7 +17,6 @@ _cleanup()
 	rm -r -f $tmp.*
 }
 
-_supported_fs generic
 _require_scratch
 _require_freeze
 
diff --git a/tests/generic/739 b/tests/generic/739
index 0941dd31..a7c972ec 100755
--- a/tests/generic/739
+++ b/tests/generic/739
@@ -15,7 +15,6 @@ _begin_fstest auto quick encrypt
 . ./common/filter
 . ./common/encrypt
 
-_supported_fs generic
 _wants_kernel_commit 5b1188847180 \
 	"fscrypt: support crypto data unit size less than filesystem block size"
 
diff --git a/tests/generic/741 b/tests/generic/741
index ad1592a10..4b480b5a 100755
--- a/tests/generic/741
+++ b/tests/generic/741
@@ -25,8 +25,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_scratch
 _require_dm_target flakey
diff --git a/tests/generic/742 b/tests/generic/742
index aad57f2d..68cf20e4 100755
--- a/tests/generic/742
+++ b/tests/generic/742
@@ -24,8 +24,6 @@ _cleanup()
 	rm -r -f $tmp.*
 }
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_test_program "fiemap-fault"
 _require_test_program "punch-alternating"
diff --git a/tests/generic/743 b/tests/generic/743
index 769ce706..228ba764 100755
--- a/tests/generic/743
+++ b/tests/generic/743
@@ -26,10 +26,8 @@ _cleanup()
 _fixed_by_kernel_commit 631426ba1d45 \
 	"mm/madvise: make MADV_POPULATE_(READ|WRITE) handle VM_FAULT_RETRY properly"
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_xfs_io_command madvise -R
 _require_scratch
 _require_dm_target error
diff --git a/tests/generic/744 b/tests/generic/744
index ef1de82d..a31d8d7a 100755
--- a/tests/generic/744
+++ b/tests/generic/744
@@ -26,7 +26,6 @@ _cleanup()
 . ./common/reflink
 
 # Modify as appropriate.
-_supported_fs generic
 _require_duplicate_fsid
 _require_test
 _require_block_device $TEST_DEV
diff --git a/tests/generic/746 b/tests/generic/746
index b13fd98a..651affe0 100755
--- a/tests/generic/746
+++ b/tests/generic/746
@@ -9,7 +9,6 @@
 . ./common/preamble
 _begin_fstest auto trim fiemap
 
-_supported_fs generic
 _require_test
 _require_loop
 _require_fstrim
diff --git a/tests/generic/747 b/tests/generic/747
index bae1c842..b92098f9 100755
--- a/tests/generic/747
+++ b/tests/generic/747
@@ -14,8 +14,6 @@
 . ./common/preamble
 _begin_fstest auto
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 
 # This test requires specific data space usage, skip if we have compression
diff --git a/tests/generic/748 b/tests/generic/748
index 428d4a33..062e29aa 100755
--- a/tests/generic/748
+++ b/tests/generic/748
@@ -12,7 +12,6 @@
 . ./common/attr
 _begin_fstest auto quick log preallocrw dangerous
 
-_supported_fs generic
 _require_scratch
 _require_attrs
 _require_odirect
diff --git a/tests/generic/749 b/tests/generic/749
index 2dcced4e..8b2c7fef 100755
--- a/tests/generic/749
+++ b/tests/generic/749
@@ -21,8 +21,6 @@ _begin_fstest auto quick prealloc
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch_nocheck
 _require_test
 _require_xfs_io_command "truncate"
diff --git a/tests/generic/750 b/tests/generic/750
index 3057937d..dba8021d 100755
--- a/tests/generic/750
+++ b/tests/generic/750
@@ -22,9 +22,7 @@ _cleanup()
 
 # Import common functions.
 
-# real QA test starts here
 
-_supported_fs generic
 
 _require_scratch
 _require_vm_compaction
diff --git a/tests/generic/751 b/tests/generic/751
index 962d8d58..eac2d230 100755
--- a/tests/generic/751
+++ b/tests/generic/751
@@ -77,8 +77,6 @@ fio_config=$tmp.fio
 fio_out=$tmp.fio.out
 fio_err=$tmp.fio.err
 
-# real QA test starts here
-_supported_fs generic
 _require_test
 _require_scratch
 _require_split_huge_pages_knob
diff --git a/tests/generic/752 b/tests/generic/752
index 2cdb2c7e..12e8c09f 100755
--- a/tests/generic/752
+++ b/tests/generic/752
@@ -20,7 +20,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 _require_xfs_io_command exchangerange
 _require_test
 
diff --git a/tests/generic/753 b/tests/generic/753
index bb547a68..e427d62d 100755
--- a/tests/generic/753
+++ b/tests/generic/753
@@ -27,7 +27,6 @@ _cleanup()
 . ./common/dmerror
 
 # Modify as appropriate.
-_supported_fs generic
 
 _require_scratch
 _require_dm_target error
diff --git a/tests/generic/754 b/tests/generic/754
index e0dcb866..f73d1ed6 100755
--- a/tests/generic/754
+++ b/tests/generic/754
@@ -11,7 +11,6 @@
 . ./common/preamble
 _begin_fstest auto
 
-_supported_fs generic
 _require_scratch
 
 test $FSTYP = "xfs" && \
diff --git a/tests/nfs/001 b/tests/nfs/001
index 5b5f0828..c7dbd616 100755
--- a/tests/nfs/001
+++ b/tests/nfs/001
@@ -22,8 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs nfs
 _require_test_nfs_version 4
 _require_command $NFS4_SETFACL_PROG "nfs4_setfacl"
 _require_command $NFS4_GETFACL_PROG "nfs4_getfacl"
diff --git a/tests/ocfs2/001 b/tests/ocfs2/001
index 76c6b9dc..164a7890 100755
--- a/tests/ocfs2/001
+++ b/tests/ocfs2/001
@@ -13,8 +13,6 @@ _begin_fstest auto quick clone
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs ocfs2
 _require_scratch_reflink
 _require_cp_reflink
 
diff --git a/tests/overlay/001 b/tests/overlay/001
index c24d37a9..00462f05 100755
--- a/tests/overlay/001
+++ b/tests/overlay/001
@@ -15,8 +15,6 @@ _begin_fstest auto quick copyup
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch
 
 # Remove all files from previous tests
diff --git a/tests/overlay/002 b/tests/overlay/002
index 11300edf..6d9be852 100755
--- a/tests/overlay/002
+++ b/tests/overlay/002
@@ -17,8 +17,6 @@ _begin_fstest auto quick metadata
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch
 
 # Remove all files from previous tests
diff --git a/tests/overlay/003 b/tests/overlay/003
index 9ee69398..41ad99e7 100755
--- a/tests/overlay/003
+++ b/tests/overlay/003
@@ -18,10 +18,8 @@ _begin_fstest auto quick whiteout
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs overlay
 _require_scratch
 
 # Remove all files from previous tests
diff --git a/tests/overlay/004 b/tests/overlay/004
index f03f628a..bea4bb54 100755
--- a/tests/overlay/004
+++ b/tests/overlay/004
@@ -13,7 +13,6 @@ _begin_fstest attr auto copyup quick perms
 . ./common/filter
 
 # Modify as appropriate.
-_supported_fs overlay
 _require_scratch
 _require_user
 
diff --git a/tests/overlay/005 b/tests/overlay/005
index a2b9c1d3..4c11d5e1 100755
--- a/tests/overlay/005
+++ b/tests/overlay/005
@@ -25,10 +25,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs overlay
 # Use non-default scratch underlying overlay dirs, we need to check
 # them explicity after test.
 _require_scratch_nocheck
diff --git a/tests/overlay/006 b/tests/overlay/006
index 73eb80c9..0903f76b 100755
--- a/tests/overlay/006
+++ b/tests/overlay/006
@@ -16,8 +16,6 @@ _begin_fstest auto quick copyup whiteout
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch
 
 echo "Silence is golden"
diff --git a/tests/overlay/007 b/tests/overlay/007
index 5cd97de8..1705ce45 100755
--- a/tests/overlay/007
+++ b/tests/overlay/007
@@ -23,8 +23,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _require_test
 
 rm -rf $TEST_DIR/$seq
diff --git a/tests/overlay/008 b/tests/overlay/008
index 7bab4fbe..8570360a 100755
--- a/tests/overlay/008
+++ b/tests/overlay/008
@@ -16,8 +16,6 @@ _begin_fstest auto quick whiteout perms
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch
 _require_user
 
diff --git a/tests/overlay/009 b/tests/overlay/009
index d85ef16e..8e585d27 100755
--- a/tests/overlay/009
+++ b/tests/overlay/009
@@ -15,8 +15,6 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _fixed_by_kernel_commit a4859d75944a \
 	"ovl: fix dentry leak for default_permissions"
 
diff --git a/tests/overlay/010 b/tests/overlay/010
index af22b2b4..ecdf9e23 100755
--- a/tests/overlay/010
+++ b/tests/overlay/010
@@ -15,8 +15,6 @@ _begin_fstest auto quick whiteout
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _fixed_by_kernel_commit 84889d493356 \
 	"ovl: check dentry positiveness in ovl_cleanup_whiteouts()"
 
diff --git a/tests/overlay/011 b/tests/overlay/011
index 09a950ba..a05568f8 100755
--- a/tests/overlay/011
+++ b/tests/overlay/011
@@ -17,8 +17,6 @@ _begin_fstest auto quick
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs overlay
 _require_test
 _require_scratch
 _require_attrs trusted
diff --git a/tests/overlay/012 b/tests/overlay/012
index ee6e1bf3..ac25d7ca 100755
--- a/tests/overlay/012
+++ b/tests/overlay/012
@@ -17,8 +17,6 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch
 
 # remove all files from previous runs
diff --git a/tests/overlay/013 b/tests/overlay/013
index 51fd2397..73c72c30 100755
--- a/tests/overlay/013
+++ b/tests/overlay/013
@@ -14,8 +14,6 @@ _begin_fstest auto quick copyup
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch
 _require_test_program "t_truncate_self"
 
diff --git a/tests/overlay/014 b/tests/overlay/014
index 2d6c11d9..f07fc685 100755
--- a/tests/overlay/014
+++ b/tests/overlay/014
@@ -19,8 +19,6 @@ _begin_fstest auto quick copyup
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _fixed_by_kernel_commit 0956254a2d5b "ovl: don't copy up opaqueness"
 
 # Use non-default scratch underlying overlay dirs, we need to check
diff --git a/tests/overlay/015 b/tests/overlay/015
index f0c05579..e249ab24 100755
--- a/tests/overlay/015
+++ b/tests/overlay/015
@@ -12,8 +12,6 @@ _begin_fstest auto quick whiteout perms
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch
 _require_user
 _require_group
diff --git a/tests/overlay/016 b/tests/overlay/016
index 7b4a3dad..26ce6fba 100755
--- a/tests/overlay/016
+++ b/tests/overlay/016
@@ -17,8 +17,6 @@ _begin_fstest auto quick copyup
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _fixed_in_kernel_version "v4.19"
 
 _require_scratch
diff --git a/tests/overlay/017 b/tests/overlay/017
index 0bb248c2..06a93fed 100755
--- a/tests/overlay/017
+++ b/tests/overlay/017
@@ -21,8 +21,6 @@ _begin_fstest auto quick copyup redirect
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _fixed_in_kernel_version "v4.14"
 
 _require_scratch
diff --git a/tests/overlay/018 b/tests/overlay/018
index 4cccbbdc..648f8ce9 100755
--- a/tests/overlay/018
+++ b/tests/overlay/018
@@ -17,8 +17,6 @@ _begin_fstest auto quick copyup hardlink
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _fixed_in_kernel_version "v4.13"
 
 _require_scratch
diff --git a/tests/overlay/019 b/tests/overlay/019
index 72c8a5a4..ae026604 100755
--- a/tests/overlay/019
+++ b/tests/overlay/019
@@ -12,8 +12,6 @@ _begin_fstest auto stress
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch_nocheck
 
 # Remove all files from previous tests
diff --git a/tests/overlay/020 b/tests/overlay/020
index 9f82da34..7856bc97 100755
--- a/tests/overlay/020
+++ b/tests/overlay/020
@@ -14,10 +14,8 @@ _begin_fstest auto quick copyup perms
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs overlay
 _fixed_by_kernel_commit 3fe6e52f0626 \
 	"ovl: override creds with the ones from the superblock mounter"
 
diff --git a/tests/overlay/021 b/tests/overlay/021
index 19c4b5ca..95a9ada5 100755
--- a/tests/overlay/021
+++ b/tests/overlay/021
@@ -12,8 +12,6 @@ _begin_fstest auto quick copyup
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch
 
 # Remove all files from previous tests
diff --git a/tests/overlay/022 b/tests/overlay/022
index 09af6500..d33bd297 100755
--- a/tests/overlay/022
+++ b/tests/overlay/022
@@ -25,10 +25,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs overlay
 _fixed_by_kernel_commit 76bc8e2843b6 "ovl: disallow overlayfs as upperdir"
 
 _require_scratch
diff --git a/tests/overlay/023 b/tests/overlay/023
index 740c47c1..43ed2551 100755
--- a/tests/overlay/023
+++ b/tests/overlay/023
@@ -20,10 +20,8 @@ _begin_fstest auto quick attr perms
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs overlay
 _require_acls
 _require_scratch
 
diff --git a/tests/overlay/024 b/tests/overlay/024
index d9a3e409..9f3a12f4 100755
--- a/tests/overlay/024
+++ b/tests/overlay/024
@@ -19,10 +19,8 @@ _begin_fstest auto quick mount
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs overlay
 _require_scratch
 
 # Remove all files from previous tests
diff --git a/tests/overlay/025 b/tests/overlay/025
index 3e237910..dc819a39 100755
--- a/tests/overlay/025
+++ b/tests/overlay/025
@@ -28,10 +28,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs overlay
 _require_user
 _require_extra_fs tmpfs
 
diff --git a/tests/overlay/026 b/tests/overlay/026
index 25c70bc8..06a1c922 100755
--- a/tests/overlay/026
+++ b/tests/overlay/026
@@ -31,10 +31,8 @@ _begin_fstest auto attr quick
 . ./common/attr
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs overlay
 _require_scratch
 _require_attrs trusted
 
diff --git a/tests/overlay/027 b/tests/overlay/027
index aa47bd7a..cc9e6789 100755
--- a/tests/overlay/027
+++ b/tests/overlay/027
@@ -27,10 +27,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs overlay
 _require_scratch
 _require_chattr i
 
diff --git a/tests/overlay/028 b/tests/overlay/028
index 2b56aa75..26e9433f 100755
--- a/tests/overlay/028
+++ b/tests/overlay/028
@@ -19,10 +19,8 @@ _begin_fstest auto copyup quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs overlay
 _require_scratch
 _require_command "$FLOCK_PROG" flock
 
diff --git a/tests/overlay/029 b/tests/overlay/029
index c4c8eed7..4bade9a0 100755
--- a/tests/overlay/029
+++ b/tests/overlay/029
@@ -30,10 +30,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs overlay
 _fixed_by_kernel_commit c4fcfc1619ea "ovl: fix d_real() for stacked fs"
 
 _require_scratch
diff --git a/tests/overlay/030 b/tests/overlay/030
index 6c207d2a..af3012e7 100755
--- a/tests/overlay/030
+++ b/tests/overlay/030
@@ -30,7 +30,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-_supported_fs overlay
 
 _require_chattr ia
 _require_test_program "t_immutable"
diff --git a/tests/overlay/031 b/tests/overlay/031
index 8fdf482b..dd9dfcdb 100755
--- a/tests/overlay/031
+++ b/tests/overlay/031
@@ -34,8 +34,6 @@ create_whiteout()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch_nocheck
 
 # remove all files from previous runs
diff --git a/tests/overlay/032 b/tests/overlay/032
index 2c8221a0..6103f5ef 100755
--- a/tests/overlay/032
+++ b/tests/overlay/032
@@ -18,8 +18,6 @@ _begin_fstest auto quick copyup hardlink
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch
 _require_scratch_feature index
 
diff --git a/tests/overlay/033 b/tests/overlay/033
index 15175cdf..0a634560 100755
--- a/tests/overlay/033
+++ b/tests/overlay/033
@@ -15,8 +15,6 @@ _begin_fstest auto quick copyup hardlink
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch
 _require_scratch_feature index
 
diff --git a/tests/overlay/034 b/tests/overlay/034
index fcecb387..ec3a0953 100755
--- a/tests/overlay/034
+++ b/tests/overlay/034
@@ -29,8 +29,6 @@ _begin_fstest auto quick copyup hardlink
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch
 # Without overlay index feature hardlinks are broken on copy up
 _require_scratch_feature index
diff --git a/tests/overlay/035 b/tests/overlay/035
index f4c981ad..0b3257c4 100755
--- a/tests/overlay/035
+++ b/tests/overlay/035
@@ -23,8 +23,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 # Use non-default scratch underlying overlay dirs, we need to check
 # them explicity after test.
 _require_scratch_nocheck
diff --git a/tests/overlay/036 b/tests/overlay/036
index 5a93d480..19a181bb 100755
--- a/tests/overlay/036
+++ b/tests/overlay/036
@@ -41,8 +41,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 # Use non-default scratch underlying overlay dirs, we need to check
 # them explicity after test.
 _require_scratch_nocheck
diff --git a/tests/overlay/037 b/tests/overlay/037
index c188088e..834e1763 100755
--- a/tests/overlay/037
+++ b/tests/overlay/037
@@ -20,8 +20,6 @@ _begin_fstest auto quick mount
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 # Use non-default scratch underlying overlay dirs, we need to check
 # them explicity after test.
 _require_scratch_nocheck
diff --git a/tests/overlay/038 b/tests/overlay/038
index 19c000ce..3e7878e5 100755
--- a/tests/overlay/038
+++ b/tests/overlay/038
@@ -13,8 +13,6 @@ _begin_fstest auto quick copyup
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs overlay
 _fixed_in_kernel_version "v4.14"
 
 # Use non-default scratch underlying overlay dirs, we need to check
diff --git a/tests/overlay/039 b/tests/overlay/039
index 21efa2f2..fd9e986b 100755
--- a/tests/overlay/039
+++ b/tests/overlay/039
@@ -15,8 +15,6 @@ _begin_fstest auto quick atime
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch
 _require_relatime
 
diff --git a/tests/overlay/040 b/tests/overlay/040
index 9f4da94b..11c7bf12 100755
--- a/tests/overlay/040
+++ b/tests/overlay/040
@@ -28,8 +28,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch
 _require_chattr i
 
diff --git a/tests/overlay/041 b/tests/overlay/041
index a326b6b0..36491b8f 100755
--- a/tests/overlay/041
+++ b/tests/overlay/041
@@ -15,8 +15,6 @@ _begin_fstest auto quick copyup nonsamefs
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs overlay
 _fixed_in_kernel_version "v4.17"
 
 # Use non-default scratch underlying overlay dirs, we need to check
diff --git a/tests/overlay/042 b/tests/overlay/042
index 0715066f..aaa10da3 100755
--- a/tests/overlay/042
+++ b/tests/overlay/042
@@ -24,8 +24,6 @@ _begin_fstest auto quick copyup hardlink
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _fixed_by_kernel_commit 6eaf011144af \
 	"ovl: fix EIO from lookup of non-indexed upper"
 
diff --git a/tests/overlay/043 b/tests/overlay/043
index 56f89214..7325c653 100755
--- a/tests/overlay/043
+++ b/tests/overlay/043
@@ -23,8 +23,6 @@ _begin_fstest auto quick copyup nonsamefs
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _fixed_in_kernel_version "v4.17"
 
 # Use non-default scratch underlying overlay dirs, we need to check
diff --git a/tests/overlay/044 b/tests/overlay/044
index 3f74890f..4d04d883 100755
--- a/tests/overlay/044
+++ b/tests/overlay/044
@@ -18,8 +18,6 @@ _begin_fstest auto quick copyup hardlink nonsamefs
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _fixed_in_kernel_version "v4.17"
 
 # Use non-default scratch underlying overlay dirs, we need to check
diff --git a/tests/overlay/045 b/tests/overlay/045
index fd826427..c5d75a69 100755
--- a/tests/overlay/045
+++ b/tests/overlay/045
@@ -13,8 +13,6 @@ _begin_fstest auto quick fsck
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch_nocheck
 _require_attrs trusted
 _require_command "$FSCK_OVERLAY_PROG" fsck.overlay
diff --git a/tests/overlay/046 b/tests/overlay/046
index b7f1b710..31066ded 100755
--- a/tests/overlay/046
+++ b/tests/overlay/046
@@ -13,8 +13,6 @@ _begin_fstest auto quick fsck
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch_nocheck
 _require_attrs trusted
 _require_command "$FSCK_OVERLAY_PROG" fsck.overlay
diff --git a/tests/overlay/047 b/tests/overlay/047
index fb0bac19..98c4f07c 100755
--- a/tests/overlay/047
+++ b/tests/overlay/047
@@ -17,8 +17,6 @@ _begin_fstest auto quick copyup hardlink
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch
 _require_scratch_feature index
 
diff --git a/tests/overlay/048 b/tests/overlay/048
index 7fe6e17c..897e797e 100755
--- a/tests/overlay/048
+++ b/tests/overlay/048
@@ -16,8 +16,6 @@ _begin_fstest auto quick copyup hardlink
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch
 _require_scratch_feature index
 
diff --git a/tests/overlay/049 b/tests/overlay/049
index 8dd41bd7..3ee500c5 100755
--- a/tests/overlay/049
+++ b/tests/overlay/049
@@ -38,8 +38,6 @@ create_redirect()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch_nocheck
 _require_scratch_feature redirect_dir
 
diff --git a/tests/overlay/050 b/tests/overlay/050
index e24338e1..ec936e2a 100755
--- a/tests/overlay/050
+++ b/tests/overlay/050
@@ -20,9 +20,7 @@ _begin_fstest auto quick copyup hardlink exportfs
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_scratch
 _require_test_program "open_by_handle"
 # We need to require both features together, because nfs_export cannot
diff --git a/tests/overlay/051 b/tests/overlay/051
index 4b26dd84..9404dbba 100755
--- a/tests/overlay/051
+++ b/tests/overlay/051
@@ -34,9 +34,7 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_test
 _require_test_program "open_by_handle"
 # Use non-default scratch underlying overlay dirs, we need to check
diff --git a/tests/overlay/052 b/tests/overlay/052
index 6abe2e01..37402067 100755
--- a/tests/overlay/052
+++ b/tests/overlay/052
@@ -21,9 +21,7 @@ _begin_fstest auto quick copyup redirect exportfs
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_scratch
 _require_test_program "open_by_handle"
 # We need to require all features together, because nfs_export cannot
diff --git a/tests/overlay/053 b/tests/overlay/053
index cf94f930..f7891ace 100755
--- a/tests/overlay/053
+++ b/tests/overlay/053
@@ -36,9 +36,7 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_test
 _require_test_program "open_by_handle"
 # Use non-default scratch underlying overlay dirs, we need to check
diff --git a/tests/overlay/054 b/tests/overlay/054
index ba20a7fc..8d7f026a 100755
--- a/tests/overlay/054
+++ b/tests/overlay/054
@@ -34,9 +34,7 @@ _begin_fstest auto quick copyup redirect exportfs
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _fixed_by_kernel_commit 2ca3c148a062 \
 	"ovl: check lower ancestry on encode of lower dir file handle"
 
diff --git a/tests/overlay/055 b/tests/overlay/055
index 367f038b..87a348c9 100755
--- a/tests/overlay/055
+++ b/tests/overlay/055
@@ -43,9 +43,7 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _fixed_by_kernel_commit 2ca3c148a062 \
 	"ovl: check lower ancestry on encode of lower dir file handle"
 
diff --git a/tests/overlay/056 b/tests/overlay/056
index 0516acbb..158f34d0 100755
--- a/tests/overlay/056
+++ b/tests/overlay/056
@@ -13,8 +13,6 @@ _begin_fstest auto quick fsck
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch_nocheck
 _require_attrs trusted
 _require_command "$FSCK_OVERLAY_PROG" fsck.overlay
diff --git a/tests/overlay/057 b/tests/overlay/057
index 4bfc32a4..da7ffda3 100755
--- a/tests/overlay/057
+++ b/tests/overlay/057
@@ -25,8 +25,6 @@ _begin_fstest auto quick redirect
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 # We use non-default scratch underlying overlay dirs, we need to check
 # them explicity after test.
 _require_scratch_nocheck
diff --git a/tests/overlay/058 b/tests/overlay/058
index 7352482e..b70e0663 100755
--- a/tests/overlay/058
+++ b/tests/overlay/058
@@ -30,9 +30,7 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_scratch
 _require_test_program "open_by_handle"
 # We need to require all features together, because nfs_export cannot
diff --git a/tests/overlay/059 b/tests/overlay/059
index 01720c5f..c48d2a82 100755
--- a/tests/overlay/059
+++ b/tests/overlay/059
@@ -39,8 +39,6 @@ create_origin_ref()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch_nocheck
 _require_scratch_feature redirect_dir
 
diff --git a/tests/overlay/060 b/tests/overlay/060
index f37755da..bb61fcfa 100755
--- a/tests/overlay/060
+++ b/tests/overlay/060
@@ -13,8 +13,6 @@ _begin_fstest auto quick metacopy redirect prealloc
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs overlay
 # We use non-default scratch underlying overlay dirs, we need to check
 # them explicity after test.
 _require_scratch_nocheck
diff --git a/tests/overlay/061 b/tests/overlay/061
index b80cf5a0..bf4ad6de 100755
--- a/tests/overlay/061
+++ b/tests/overlay/061
@@ -20,8 +20,6 @@ _begin_fstest posix copyup
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch
 _require_xfs_io_command "open"
 
diff --git a/tests/overlay/062 b/tests/overlay/062
index a4e9560a..e44628b7 100755
--- a/tests/overlay/062
+++ b/tests/overlay/062
@@ -24,9 +24,7 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_scratch
 _require_test_program "open_by_handle"
 # We need to require all features together, because nfs_export cannot
diff --git a/tests/overlay/063 b/tests/overlay/063
index f7bd46e4..d9f30606 100755
--- a/tests/overlay/063
+++ b/tests/overlay/063
@@ -15,8 +15,6 @@ _begin_fstest auto quick whiteout
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _fixed_by_kernel_commit 5e1275808630 \
 	"ovl: check whiteout in ovl_create_over_whiteout()"
 
diff --git a/tests/overlay/064 b/tests/overlay/064
index 1dd6bd6c..1f344edc 100755
--- a/tests/overlay/064
+++ b/tests/overlay/064
@@ -12,8 +12,6 @@ _begin_fstest auto quick copyup
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch
 _require_command "$SETCAP_PROG" setcap
 _require_command "$GETCAP_PROG" getcap
diff --git a/tests/overlay/065 b/tests/overlay/065
index e1bed4c7..fb6d6dd1 100755
--- a/tests/overlay/065
+++ b/tests/overlay/065
@@ -36,8 +36,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _fixed_in_kernel_version "v5.2"
 _fixed_by_kernel_commit 0be0bfd2de9d \
 	"ovl: fix regression caused by overlapping layers detection"
diff --git a/tests/overlay/066 b/tests/overlay/066
index 5b9f7b18..b6dc2f67 100755
--- a/tests/overlay/066
+++ b/tests/overlay/066
@@ -16,7 +16,6 @@ _begin_fstest auto quick copyup fiemap
 # real QA test starts here.
 
 # Modify as appropriate.
-_supported_fs generic
 _require_test
 _require_scratch
 
diff --git a/tests/overlay/067 b/tests/overlay/067
index 3f54a418..bb09a604 100755
--- a/tests/overlay/067
+++ b/tests/overlay/067
@@ -18,8 +18,6 @@ _begin_fstest auto quick copyup nonsamefs
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _fixed_by_kernel_commit 9c6d8f13e9da \
 	"ovl: fix corner case of non-unique st_dev;st_ino"
 
diff --git a/tests/overlay/068 b/tests/overlay/068
index bc3cd569..0d33cf12 100755
--- a/tests/overlay/068
+++ b/tests/overlay/068
@@ -34,9 +34,7 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_scratch
 # _require_exportfs already requires open_by_handle, but let's not count on it
 _require_test_program "open_by_handle"
diff --git a/tests/overlay/069 b/tests/overlay/069
index b4e54432..373ab1ee 100755
--- a/tests/overlay/069
+++ b/tests/overlay/069
@@ -34,9 +34,7 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_test
 _require_scratch_nocheck
 # _require_exportfs already requires open_by_handle, but let's not count on it
diff --git a/tests/overlay/070 b/tests/overlay/070
index a4ec2f03..36991229 100755
--- a/tests/overlay/070
+++ b/tests/overlay/070
@@ -33,8 +33,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _fixed_in_kernel_version "v4.17"
 
 _require_scratch_nocheck
diff --git a/tests/overlay/071 b/tests/overlay/071
index c22e3880..2a631314 100755
--- a/tests/overlay/071
+++ b/tests/overlay/071
@@ -36,8 +36,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _fixed_in_kernel_version "v4.17"
 
 _require_test
diff --git a/tests/overlay/072 b/tests/overlay/072
index 6f5e77df..aedcfb1a 100755
--- a/tests/overlay/072
+++ b/tests/overlay/072
@@ -26,8 +26,6 @@ _begin_fstest auto quick copyup hardlink
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _fixed_by_kernel_commit 83552eacdfc0 "ovl: fix WARN_ON nlink drop to zero"
 
 _require_scratch
diff --git a/tests/overlay/073 b/tests/overlay/073
index 53ba0d6a..9c6dd8c5 100755
--- a/tests/overlay/073
+++ b/tests/overlay/073
@@ -21,8 +21,6 @@ _begin_fstest auto quick whiteout
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch
 # Require index dir to test if workdir/work is not in use
 # which implies that whiteout sharing is supported
diff --git a/tests/overlay/074 b/tests/overlay/074
index d3738649..cfac9f8a 100755
--- a/tests/overlay/074
+++ b/tests/overlay/074
@@ -19,9 +19,7 @@ _begin_fstest auto quick exportfs dangerous
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _fixed_by_kernel_commit 144da23beab8 \
 	"ovl: return required buffer size for file handles"
 _fixed_by_kernel_commit 9aafc1b01873 \
diff --git a/tests/overlay/075 b/tests/overlay/075
index 911c3d08..67041242 100755
--- a/tests/overlay/075
+++ b/tests/overlay/075
@@ -33,7 +33,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-_supported_fs overlay
 
 _require_chattr ia
 _require_test_program "t_immutable"
diff --git a/tests/overlay/076 b/tests/overlay/076
index 646cfcc1..fb94dff6 100755
--- a/tests/overlay/076
+++ b/tests/overlay/076
@@ -26,8 +26,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _require_scratch
 _require_chattr i
 
diff --git a/tests/overlay/077 b/tests/overlay/077
index 702ff54c..00de0825 100755
--- a/tests/overlay/077
+++ b/tests/overlay/077
@@ -16,8 +16,6 @@ _begin_fstest auto quick dir
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _fixed_by_kernel_commit 65cd913ec9d9 \
 	"ovl: invalidate readdir cache on changes to dir with origin"
 _fixed_by_kernel_commit 9011c2791e63 \
diff --git a/tests/overlay/078 b/tests/overlay/078
index 3c15f4b7..d6df11f6 100755
--- a/tests/overlay/078
+++ b/tests/overlay/078
@@ -31,8 +31,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _fixed_in_kernel_version "v5.13"
 
 _require_command "$LSATTR_PROG" lasttr
diff --git a/tests/overlay/079 b/tests/overlay/079
index f28fc313..cfcafcee 100755
--- a/tests/overlay/079
+++ b/tests/overlay/079
@@ -14,8 +14,6 @@ _begin_fstest auto quick metacopy redirect prealloc
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs overlay
 # We use non-default scratch underlying overlay dirs, we need to check
 # them explicity after test.
 _require_scratch_nocheck
diff --git a/tests/overlay/080 b/tests/overlay/080
index 0b5dca09..ce5c2375 100755
--- a/tests/overlay/080
+++ b/tests/overlay/080
@@ -15,8 +15,6 @@ _begin_fstest auto quick metacopy redirect verity
 . ./common/attr
 . ./common/verity
 
-# real QA test starts here
-_supported_fs overlay
 # We use non-default scratch underlying overlay dirs, we need to check
 # them explicity after test.
 _require_scratch_nocheck
diff --git a/tests/overlay/081 b/tests/overlay/081
index 481e9931..2270a047 100755
--- a/tests/overlay/081
+++ b/tests/overlay/081
@@ -14,8 +14,6 @@ _begin_fstest auto quick
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs overlay
 
 _scratch_mkfs >>$seqres.full 2>&1
 
diff --git a/tests/overlay/082 b/tests/overlay/082
index 7409917b..b3262ae5 100755
--- a/tests/overlay/082
+++ b/tests/overlay/082
@@ -13,8 +13,6 @@
 . ./common/preamble
 _begin_fstest auto quick copyup symlink atime
 
-# real QA test starts here
-_supported_fs overlay
 _fixed_by_kernel_commit ab048302026d \
 	"ovl: fix failed copyup of fileattr on a symlink"
 
diff --git a/tests/overlay/083 b/tests/overlay/083
index df82d1fd..d037d4c8 100755
--- a/tests/overlay/083
+++ b/tests/overlay/083
@@ -17,8 +17,6 @@ _begin_fstest auto quick mount
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 _fixed_by_kernel_commit 32db51070850 \
 	"ovl: fix regression in showing lowerdir mount option"
 _fixed_by_kernel_commit c34706acf40b \
diff --git a/tests/overlay/084 b/tests/overlay/084
index 778396a1..28e9a76d 100755
--- a/tests/overlay/084
+++ b/tests/overlay/084
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs overlay
 # This test does not run on kernels prior ro v6.7 and now it will also make sure
 # that the following on-disk format change was backported to v6.7 based kernels
 _fixed_by_kernel_commit 420332b94119 \
diff --git a/tests/overlay/085 b/tests/overlay/085
index 0f4e4b06..046d01d1 100755
--- a/tests/overlay/085
+++ b/tests/overlay/085
@@ -15,8 +15,6 @@ _begin_fstest auto quick metacopy redirect prealloc
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs overlay
 # We use non-default scratch underlying overlay dirs, we need to check
 # them explicity after test.
 _require_scratch_nocheck
diff --git a/tests/overlay/086 b/tests/overlay/086
index b5960517..9c8a0058 100755
--- a/tests/overlay/086
+++ b/tests/overlay/086
@@ -13,8 +13,6 @@ _begin_fstest auto quick mount
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs overlay
 
 # _overlay_check_* helpers do not handle special chars well
 _require_scratch_nocheck
diff --git a/tests/overlay/100 b/tests/overlay/100
index b958088e..8975c6f3 100755
--- a/tests/overlay/100
+++ b/tests/overlay/100
@@ -15,9 +15,7 @@ _register_cleanup "_unionmount_testsuite_cleanup"
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_scratch
 _require_unionmount_testsuite
 
diff --git a/tests/overlay/101 b/tests/overlay/101
index 99dd72fa..f9b0fd40 100755
--- a/tests/overlay/101
+++ b/tests/overlay/101
@@ -15,9 +15,7 @@ _register_cleanup "_unionmount_testsuite_cleanup"
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_test
 _require_scratch
 _require_unionmount_testsuite
diff --git a/tests/overlay/102 b/tests/overlay/102
index adddab70..0b608ecf 100755
--- a/tests/overlay/102
+++ b/tests/overlay/102
@@ -16,9 +16,7 @@ _register_cleanup "_unionmount_testsuite_cleanup"
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_test
 _require_scratch
 _require_unionmount_testsuite
diff --git a/tests/overlay/103 b/tests/overlay/103
index 1a1b823e..7be4912e 100755
--- a/tests/overlay/103
+++ b/tests/overlay/103
@@ -15,9 +15,7 @@ _register_cleanup "_unionmount_testsuite_cleanup"
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_scratch
 _require_unionmount_testsuite
 
diff --git a/tests/overlay/104 b/tests/overlay/104
index 090abbdd..10156403 100755
--- a/tests/overlay/104
+++ b/tests/overlay/104
@@ -15,9 +15,7 @@ _register_cleanup "_unionmount_testsuite_cleanup"
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_test
 _require_scratch
 _require_unionmount_testsuite
diff --git a/tests/overlay/105 b/tests/overlay/105
index 8c3b149c..3a7112cd 100755
--- a/tests/overlay/105
+++ b/tests/overlay/105
@@ -16,9 +16,7 @@ _register_cleanup "_unionmount_testsuite_cleanup"
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_test
 _require_scratch
 _require_unionmount_testsuite
diff --git a/tests/overlay/106 b/tests/overlay/106
index d701e49c..9a80a526 100755
--- a/tests/overlay/106
+++ b/tests/overlay/106
@@ -16,9 +16,7 @@ _register_cleanup "_unionmount_testsuite_cleanup"
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_extra_fs tmpfs
 _require_test
 _require_scratch
diff --git a/tests/overlay/107 b/tests/overlay/107
index 8ae3dc0d..f149827c 100755
--- a/tests/overlay/107
+++ b/tests/overlay/107
@@ -16,9 +16,7 @@ _register_cleanup "_unionmount_testsuite_cleanup"
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_extra_fs tmpfs
 _require_test
 _require_scratch
diff --git a/tests/overlay/108 b/tests/overlay/108
index 4e0e9c71..a5338a1a 100755
--- a/tests/overlay/108
+++ b/tests/overlay/108
@@ -16,9 +16,7 @@ _register_cleanup "_unionmount_testsuite_cleanup"
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_extra_fs tmpfs
 _require_test
 _require_scratch
diff --git a/tests/overlay/109 b/tests/overlay/109
index 97338167..2ca32279 100755
--- a/tests/overlay/109
+++ b/tests/overlay/109
@@ -16,9 +16,7 @@ _register_cleanup "_unionmount_testsuite_cleanup"
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_extra_fs tmpfs
 _require_test
 _require_scratch
diff --git a/tests/overlay/110 b/tests/overlay/110
index 414ebcae..0508622b 100755
--- a/tests/overlay/110
+++ b/tests/overlay/110
@@ -16,9 +16,7 @@ _register_cleanup "_unionmount_testsuite_cleanup"
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_scratch
 _require_unionmount_testsuite
 
diff --git a/tests/overlay/111 b/tests/overlay/111
index 93835f40..815d91a4 100755
--- a/tests/overlay/111
+++ b/tests/overlay/111
@@ -17,9 +17,7 @@ _register_cleanup "_unionmount_testsuite_cleanup"
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_scratch
 _require_unionmount_testsuite
 
diff --git a/tests/overlay/112 b/tests/overlay/112
index 33d3338b..b29a5eed 100755
--- a/tests/overlay/112
+++ b/tests/overlay/112
@@ -16,9 +16,7 @@ _register_cleanup "_unionmount_testsuite_cleanup"
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_test
 _require_scratch
 _require_unionmount_testsuite
diff --git a/tests/overlay/113 b/tests/overlay/113
index 548af67a..cf996da9 100755
--- a/tests/overlay/113
+++ b/tests/overlay/113
@@ -17,9 +17,7 @@ _register_cleanup "_unionmount_testsuite_cleanup"
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_test
 _require_scratch
 _require_unionmount_testsuite
diff --git a/tests/overlay/114 b/tests/overlay/114
index 7e9ec9f7..f6e7f7bd 100755
--- a/tests/overlay/114
+++ b/tests/overlay/114
@@ -16,9 +16,7 @@ _register_cleanup "_unionmount_testsuite_cleanup"
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_scratch
 _require_unionmount_testsuite
 
diff --git a/tests/overlay/115 b/tests/overlay/115
index 8f4159d2..c515044f 100755
--- a/tests/overlay/115
+++ b/tests/overlay/115
@@ -17,9 +17,7 @@ _register_cleanup "_unionmount_testsuite_cleanup"
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_scratch
 _require_unionmount_testsuite
 
diff --git a/tests/overlay/116 b/tests/overlay/116
index 084ea84c..8615389a 100755
--- a/tests/overlay/116
+++ b/tests/overlay/116
@@ -16,9 +16,7 @@ _register_cleanup "_unionmount_testsuite_cleanup"
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_test
 _require_scratch
 _require_unionmount_testsuite
diff --git a/tests/overlay/117 b/tests/overlay/117
index b98b79ae..28959fb1 100755
--- a/tests/overlay/117
+++ b/tests/overlay/117
@@ -17,9 +17,7 @@ _register_cleanup "_unionmount_testsuite_cleanup"
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs overlay
 _require_test
 _require_scratch
 _require_unionmount_testsuite
diff --git a/tests/perf/001 b/tests/perf/001
index 5e622b69..a051a130 100755
--- a/tests/perf/001
+++ b/tests/perf/001
@@ -16,8 +16,6 @@ fio_results=$tmp.json
 . ./common/filter
 . ./common/perf
 
-# real QA test starts here
-_supported_fs generic
 _require_scratch
 _require_block_device $SCRATCH_DEV
 _require_fio_results
diff --git a/tests/tmpfs/001 b/tests/tmpfs/001
index 37ef0b18..48a57693 100755
--- a/tests/tmpfs/001
+++ b/tests/tmpfs/001
@@ -12,9 +12,7 @@ _begin_fstest auto quick idmapped
 # get standard environment, filters and checks
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs tmpfs
 _require_idmapped_mounts
 _require_test
 
diff --git a/tests/udf/102 b/tests/udf/102
index a086ecea..8053dd82 100755
--- a/tests/udf/102
+++ b/tests/udf/102
@@ -19,9 +19,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs udf 
-
 _require_scratch
 _setup_udf_scratchdir
 
diff --git a/tests/xfs/001 b/tests/xfs/001
index 8e6c5835..ccba562c 100755
--- a/tests/xfs/001
+++ b/tests/xfs/001
@@ -30,10 +30,8 @@ _do_bit_test()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_scratch_nocheck
 
 _scratch_mkfs >/dev/null 2>&1
diff --git a/tests/xfs/002 b/tests/xfs/002
index 26d0cd6e..c9450ff4 100755
--- a/tests/xfs/002
+++ b/tests/xfs/002
@@ -20,7 +20,6 @@ _begin_fstest auto quick growfs
 . ./common/filter
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_scratch_nocheck
 _require_no_large_scratch_dev
 _require_xfs_nocrc
diff --git a/tests/xfs/003 b/tests/xfs/003
index 431c7ce0..591c1365 100755
--- a/tests/xfs/003
+++ b/tests/xfs/003
@@ -14,8 +14,6 @@ _begin_fstest db auto quick
 
 status=0	# success is the default!
 
-# real QA test starts here
-_supported_fs xfs
 _require_test
 
 [ -f core ] && rm -f core
@@ -29,7 +27,6 @@ test_done()
         rm -f core
 }
 
-# real QA test starts here
 
 echo "=== TEST 1 ==="
 _test_xfs_db -r -c 'pop' -c 'type sb'
diff --git a/tests/xfs/004 b/tests/xfs/004
index f18316b3..94129625 100755
--- a/tests/xfs/004
+++ b/tests/xfs/004
@@ -39,8 +39,6 @@ _populate_scratch()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _require_no_large_scratch_dev
diff --git a/tests/xfs/005 b/tests/xfs/005
index 01979029..0c8061b0 100755
--- a/tests/xfs/005
+++ b/tests/xfs/005
@@ -17,7 +17,6 @@ _begin_fstest auto quick
 . ./common/filter
 
 # Modify as appropriate.
-_supported_fs xfs
 
 _require_scratch_nocheck
 
diff --git a/tests/xfs/006 b/tests/xfs/006
index cecceaa3..50b36947 100755
--- a/tests/xfs/006
+++ b/tests/xfs/006
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmerror
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_dm_target error
 _require_fs_sysfs error/fail_at_unmount
diff --git a/tests/xfs/007 b/tests/xfs/007
index 4f864100..2535f04c 100755
--- a/tests/xfs/007
+++ b/tests/xfs/007
@@ -14,7 +14,6 @@ _begin_fstest auto quota quick
 . ./common/quota
 
 # Modify as appropriate.
-_supported_fs xfs
 
 _require_scratch
 _require_xfs_quota
diff --git a/tests/xfs/008 b/tests/xfs/008
index f42b3ac8..d90a2a24 100755
--- a/tests/xfs/008
+++ b/tests/xfs/008
@@ -63,8 +63,6 @@ _do_test()
     fi
 }
 
-# real QA test starts here
-_supported_fs xfs
 _require_test
 
 # Note on special numbers here.
diff --git a/tests/xfs/009 b/tests/xfs/009
index 54270243..98645903 100755
--- a/tests/xfs/009
+++ b/tests/xfs/009
@@ -37,8 +37,6 @@ _init()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/010 b/tests/xfs/010
index 16c08b85..689e370e 100755
--- a/tests/xfs/010
+++ b/tests/xfs/010
@@ -80,8 +80,6 @@ _corrupt_finobt_root()
 		$dev | grep -v "Allowing write of corrupted"
 }
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _require_xfs_mkfs_finobt
diff --git a/tests/xfs/011 b/tests/xfs/011
index ed44d074..f9303d59 100755
--- a/tests/xfs/011
+++ b/tests/xfs/011
@@ -58,8 +58,6 @@ _check_scratch_log_state()
 	xfs_freeze -u $SCRATCH_MNT
 }
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _require_freeze
diff --git a/tests/xfs/012 b/tests/xfs/012
index e0dccc4e..e4785a77 100755
--- a/tests/xfs/012
+++ b/tests/xfs/012
@@ -81,8 +81,6 @@ _do_test()
     fi
 }
 
-# real QA test starts here
-_supported_fs xfs
 _require_test
 
 # small & fairly dense
diff --git a/tests/xfs/013 b/tests/xfs/013
index 2d005753..f4f406aa 100755
--- a/tests/xfs/013
+++ b/tests/xfs/013
@@ -80,8 +80,6 @@ _cleaner()
 	done
 }
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _require_xfs_mkfs_finobt
diff --git a/tests/xfs/014 b/tests/xfs/014
index be25c176..098f6418 100755
--- a/tests/xfs/014
+++ b/tests/xfs/014
@@ -145,8 +145,6 @@ _test_edquot()
 	$XFS_IO_PROG -c "pwrite 0 $write_size" $dir/file >> $seqres.full
 }
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/015 b/tests/xfs/015
index 3896ce1c..acaace0c 100755
--- a/tests/xfs/015
+++ b/tests/xfs/015
@@ -32,8 +32,6 @@ create_file()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 
diff --git a/tests/xfs/016 b/tests/xfs/016
index 335a2d61..1abc06c4 100755
--- a/tests/xfs/016
+++ b/tests/xfs/016
@@ -166,8 +166,6 @@ _check_corrupt()
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _init
diff --git a/tests/xfs/017 b/tests/xfs/017
index 8a20e592..efe0ac11 100755
--- a/tests/xfs/017
+++ b/tests/xfs/017
@@ -21,8 +21,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 
diff --git a/tests/xfs/018 b/tests/xfs/018
index 7d1b861d..8b6a3e1c 100755
--- a/tests/xfs/018
+++ b/tests/xfs/018
@@ -82,8 +82,6 @@ require_larp()
 		_notrun 'LARP not supported on this filesystem'
 }
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _require_scratch_xfs_crc
diff --git a/tests/xfs/019 b/tests/xfs/019
index 790a6821..914f0a28 100755
--- a/tests/xfs/019
+++ b/tests/xfs/019
@@ -41,8 +41,6 @@ _filter_stat()
     ' | tr -s ' '
 }
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 
diff --git a/tests/xfs/020 b/tests/xfs/020
index d6ee3a15..b8efdb9d 100755
--- a/tests/xfs/020
+++ b/tests/xfs/020
@@ -23,8 +23,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_test
 
 # Writing a 60t fs requires about 2GB of space, so make sure
diff --git a/tests/xfs/021 b/tests/xfs/021
index ef307fc0..84360a8f 100755
--- a/tests/xfs/021
+++ b/tests/xfs/021
@@ -52,8 +52,6 @@ do_getfattr()
 	return $exit
 }
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _require_attrs
diff --git a/tests/xfs/022 b/tests/xfs/022
index 2f011b28..10653914 100755
--- a/tests/xfs/022
+++ b/tests/xfs/022
@@ -25,8 +25,6 @@ _cleanup()
 
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_tape $TAPE_DEV
 _require_scratch
diff --git a/tests/xfs/023 b/tests/xfs/023
index f6f6503a..06be8502 100755
--- a/tests/xfs/023
+++ b/tests/xfs/023
@@ -24,8 +24,6 @@ _cleanup()
 # Import common functions.
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_tape $TAPE_DEV
 _require_scratch
diff --git a/tests/xfs/024 b/tests/xfs/024
index 83a8882c..3636e3eb 100755
--- a/tests/xfs/024
+++ b/tests/xfs/024
@@ -22,8 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_tape $TAPE_DEV
 _require_scratch
diff --git a/tests/xfs/025 b/tests/xfs/025
index bafe82d7..071e04e4 100755
--- a/tests/xfs/025
+++ b/tests/xfs/025
@@ -22,8 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_tape $TAPE_DEV
 _require_scratch
diff --git a/tests/xfs/026 b/tests/xfs/026
index fba385dc..060bcfe0 100755
--- a/tests/xfs/026
+++ b/tests/xfs/026
@@ -22,8 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed"
 _scratch_mount
diff --git a/tests/xfs/027 b/tests/xfs/027
index 16cd203d..a1fbec9d 100755
--- a/tests/xfs/027
+++ b/tests/xfs/027
@@ -22,8 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed"
 _scratch_mount
diff --git a/tests/xfs/028 b/tests/xfs/028
index 1ff9d7d2..bed88b11 100755
--- a/tests/xfs/028
+++ b/tests/xfs/028
@@ -22,8 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed"
 _scratch_mount
diff --git a/tests/xfs/029 b/tests/xfs/029
index 6e8aa4db..35d646e4 100755
--- a/tests/xfs/029
+++ b/tests/xfs/029
@@ -30,8 +30,6 @@ filter_logprint()
 	'
 }
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 
diff --git a/tests/xfs/030 b/tests/xfs/030
index 201a9015..dbcc2822 100755
--- a/tests/xfs/030
+++ b/tests/xfs/030
@@ -45,8 +45,6 @@ _check_ag()
 	done
 }
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _require_no_large_scratch_dev
diff --git a/tests/xfs/031 b/tests/xfs/031
index 6e3813da..040c2bec 100755
--- a/tests/xfs/031
+++ b/tests/xfs/031
@@ -66,8 +66,6 @@ EOF
 	echo '$' >>$tmp.proto
 }
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _require_no_large_scratch_dev
diff --git a/tests/xfs/032 b/tests/xfs/032
index 926de307..75edf0e9 100755
--- a/tests/xfs/032
+++ b/tests/xfs/032
@@ -14,8 +14,6 @@ status=0	# success is the default!
 
 # Import common functions.
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _require_test_program "feature"
diff --git a/tests/xfs/033 b/tests/xfs/033
index ef5dc4fa..d7b02a9c 100755
--- a/tests/xfs/033
+++ b/tests/xfs/033
@@ -48,8 +48,6 @@ _filter_bad_ids()
 	grep -E -v 'bad user id 0xffffffff|bad group id 0xffffffff'
 }
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _require_no_large_scratch_dev
diff --git a/tests/xfs/034 b/tests/xfs/034
index 52b0a5f7..2acf0ad4 100755
--- a/tests/xfs/034
+++ b/tests/xfs/034
@@ -21,8 +21,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 
diff --git a/tests/xfs/035 b/tests/xfs/035
index f100bb18..81e21dc5 100755
--- a/tests/xfs/035
+++ b/tests/xfs/035
@@ -21,8 +21,6 @@ _cleanup()
 # Import common functions.
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_tape $TAPE_DEV
 _require_scratch
diff --git a/tests/xfs/036 b/tests/xfs/036
index 73eb7cd5..6a03b326 100755
--- a/tests/xfs/036
+++ b/tests/xfs/036
@@ -21,8 +21,6 @@ _cleanup()
 # Import common functions.
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_tape $RMT_IRIXTAPE_DEV
 _require_scratch
diff --git a/tests/xfs/037 b/tests/xfs/037
index b19ba9e9..0298f0bb 100755
--- a/tests/xfs/037
+++ b/tests/xfs/037
@@ -20,8 +20,6 @@ _cleanup()
 # Import common functions.
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_tape $RMT_TAPE_DEV
 _require_scratch
diff --git a/tests/xfs/038 b/tests/xfs/038
index 397c354d..fb26d999 100755
--- a/tests/xfs/038
+++ b/tests/xfs/038
@@ -20,8 +20,6 @@ _cleanup()
 # Import common functions.
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_tape $RMT_TAPE_DEV
 _require_scratch
diff --git a/tests/xfs/039 b/tests/xfs/039
index d54e9975..53273d11 100755
--- a/tests/xfs/039
+++ b/tests/xfs/039
@@ -21,8 +21,6 @@ _cleanup()
 # Import common functions.
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_tape $RMT_IRIXTAPE_DEV
 _require_scratch
diff --git a/tests/xfs/041 b/tests/xfs/041
index 21b3afe7..31807530 100755
--- a/tests/xfs/041
+++ b/tests/xfs/041
@@ -23,8 +23,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _require_no_large_scratch_dev
diff --git a/tests/xfs/042 b/tests/xfs/042
index 4433d577..f598c45a 100755
--- a/tests/xfs/042
+++ b/tests/xfs/042
@@ -23,8 +23,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_io_command "falloc"
 
 _require_scratch
diff --git a/tests/xfs/043 b/tests/xfs/043
index 415ed16e..b5583e2c 100755
--- a/tests/xfs/043
+++ b/tests/xfs/043
@@ -23,8 +23,6 @@ _cleanup()
 # Import common functions.
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_tape $TAPE_DEV
 _require_scratch
diff --git a/tests/xfs/044 b/tests/xfs/044
index e66c0cb3..9861c72a 100755
--- a/tests/xfs/044
+++ b/tests/xfs/044
@@ -12,8 +12,6 @@ _begin_fstest other auto
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_logdev
 
@@ -67,7 +65,6 @@ _unexpected()
     exit
 }
 
-# real QA test starts here
 # 
 _require_scratch
 
diff --git a/tests/xfs/045 b/tests/xfs/045
index a596635e..06faa9e3 100755
--- a/tests/xfs/045
+++ b/tests/xfs/045
@@ -17,8 +17,6 @@ _get_existing_uuid()
 	_test_xfs_db -r -c "uuid" | $AWK_PROG '/^UUID/ { print $3 }'
 }
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_test
 _require_scratch_nocheck
diff --git a/tests/xfs/046 b/tests/xfs/046
index 48daff87..f2f9f7b3 100755
--- a/tests/xfs/046
+++ b/tests/xfs/046
@@ -20,8 +20,6 @@ _cleanup()
 # Import common functions.
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed"
 _scratch_mount
diff --git a/tests/xfs/047 b/tests/xfs/047
index 6d0dc5f7..05e62cb5 100755
--- a/tests/xfs/047
+++ b/tests/xfs/047
@@ -20,8 +20,6 @@ _cleanup()
 # Import common functions.
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed"
 _scratch_mount
diff --git a/tests/xfs/048 b/tests/xfs/048
index 5c43dced..2c2d9d43 100755
--- a/tests/xfs/048
+++ b/tests/xfs/048
@@ -12,8 +12,6 @@ _begin_fstest other auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_test
 
 $here/src/fault $TEST_DIR || exit
diff --git a/tests/xfs/049 b/tests/xfs/049
index 69656a85..668ac374 100755
--- a/tests/xfs/049
+++ b/tests/xfs/049
@@ -27,8 +27,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 
 _log()
 {
diff --git a/tests/xfs/050 b/tests/xfs/050
index 2220e470..7baaaeaa 100755
--- a/tests/xfs/050
+++ b/tests/xfs/050
@@ -22,8 +22,6 @@ _cleanup()
 	rm -f $tmp.*
 }
 
-# real QA test starts here
-_supported_fs xfs
 
 cp /dev/null $seqres.full
 chmod a+rwx $seqres.full	# arbitrary users will write here
diff --git a/tests/xfs/051 b/tests/xfs/051
index aca867c9..43fee4c4 100755
--- a/tests/xfs/051
+++ b/tests/xfs/051
@@ -24,7 +24,6 @@ _cleanup()
 . ./common/dmflakey
 
 # Modify as appropriate.
-_supported_fs xfs
 
 _require_scratch
 _require_dm_target flakey
diff --git a/tests/xfs/052 b/tests/xfs/052
index 75761022..adeab538 100755
--- a/tests/xfs/052
+++ b/tests/xfs/052
@@ -24,8 +24,6 @@ _cleanup()
 	rm -f $tmp.*
 }
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _require_xfs_quota
diff --git a/tests/xfs/053 b/tests/xfs/053
index e7e73db8..6b2af780 100755
--- a/tests/xfs/053
+++ b/tests/xfs/053
@@ -17,9 +17,7 @@ _begin_fstest attr acl repair quick auto
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 
-_supported_fs xfs
 _require_scratch
 _require_attrs
 
diff --git a/tests/xfs/054 b/tests/xfs/054
index becb76ac..d6b08865 100755
--- a/tests/xfs/054
+++ b/tests/xfs/054
@@ -12,10 +12,8 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_test
 _require_xfs_io_command "inode"
 
diff --git a/tests/xfs/055 b/tests/xfs/055
index c6ecae3d..8fe7d273 100755
--- a/tests/xfs/055
+++ b/tests/xfs/055
@@ -21,8 +21,6 @@ _cleanup()
 # Import common functions.
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_tape $RMT_TAPE_USER@$RMT_IRIXTAPE_DEV
 _require_scratch
diff --git a/tests/xfs/056 b/tests/xfs/056
index f742f419..18ff592b 100755
--- a/tests/xfs/056
+++ b/tests/xfs/056
@@ -23,8 +23,6 @@ _cleanup()
 # Import common functions.
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed"
 _scratch_mount
diff --git a/tests/xfs/057 b/tests/xfs/057
index 0cf16701..f1c94779 100755
--- a/tests/xfs/057
+++ b/tests/xfs/057
@@ -37,10 +37,8 @@ _cleanup()
 # Import common functions.
 . ./common/inject
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_xfs_io_error_injection log_item_pin
 _require_xfs_io_error_injection log_bad_crc
 _require_scratch
diff --git a/tests/xfs/058 b/tests/xfs/058
index 8751a7ac..2dfd611c 100755
--- a/tests/xfs/058
+++ b/tests/xfs/058
@@ -13,8 +13,6 @@ _begin_fstest auto quick fuzzers
 . ./common/filter
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_nocheck
 _require_command "$XFS_DB_PROG" "xfs_db"
 _require_xfs_db_command "fuzz"
diff --git a/tests/xfs/059 b/tests/xfs/059
index 515ef2a4..7086dae8 100755
--- a/tests/xfs/059
+++ b/tests/xfs/059
@@ -22,8 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_multi_stream
 _require_scratch
diff --git a/tests/xfs/060 b/tests/xfs/060
index 0c0dc981..0bafe69e 100755
--- a/tests/xfs/060
+++ b/tests/xfs/060
@@ -22,8 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_multi_stream
 _require_scratch
diff --git a/tests/xfs/061 b/tests/xfs/061
index 0b20cc30..69aaf5d9 100755
--- a/tests/xfs/061
+++ b/tests/xfs/061
@@ -22,8 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed"
 _scratch_mount
diff --git a/tests/xfs/062 b/tests/xfs/062
index 0a1c6742..c3da1120 100755
--- a/tests/xfs/062
+++ b/tests/xfs/062
@@ -34,9 +34,7 @@ _bstat_test()
 
 _require_scratch
 
-# real QA test starts here
 
-_supported_fs xfs
 
 DIRCOUNT=8
 INOCOUNT=$((2048 / DIRCOUNT))
diff --git a/tests/xfs/063 b/tests/xfs/063
index 660b300f..28dadf53 100755
--- a/tests/xfs/063
+++ b/tests/xfs/063
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/dump
 . ./common/attr
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_attrs trusted user
 _require_scratch
diff --git a/tests/xfs/064 b/tests/xfs/064
index f67c29fd..cbaee959 100755
--- a/tests/xfs/064
+++ b/tests/xfs/064
@@ -34,8 +34,6 @@ _ls_size_filter()
     grep -E -v 'dumpdir|housekeeping|dirattr|dirextattr|namreg|state|tree'
 }
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed"
 _scratch_mount
diff --git a/tests/xfs/065 b/tests/xfs/065
index 819d385e..b7ba61b1 100755
--- a/tests/xfs/065
+++ b/tests/xfs/065
@@ -42,8 +42,6 @@ _list_dir()
     LC_COLLATE=POSIX sort
 } 
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 
 #
diff --git a/tests/xfs/066 b/tests/xfs/066
index 2c369ad7..48183ae0 100755
--- a/tests/xfs/066
+++ b/tests/xfs/066
@@ -21,8 +21,6 @@ _cleanup()
     rm -f $tmp.*
 }
 
-# real QA test starts here
-_supported_fs xfs
 _require_test
 _require_scratch
 
diff --git a/tests/xfs/067 b/tests/xfs/067
index 3dc381bb..fbf91642 100755
--- a/tests/xfs/067
+++ b/tests/xfs/067
@@ -13,8 +13,6 @@ _begin_fstest acl attr auto quick
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_attrs
 _require_acls
diff --git a/tests/xfs/068 b/tests/xfs/068
index f80b53e5..c6459ea7 100755
--- a/tests/xfs/068
+++ b/tests/xfs/068
@@ -26,8 +26,6 @@ _cleanup()
 
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed"
 _scratch_mount
diff --git a/tests/xfs/069 b/tests/xfs/069
index b3074e25..e1db2118 100755
--- a/tests/xfs/069
+++ b/tests/xfs/069
@@ -14,10 +14,8 @@ _begin_fstest ioctl auto quick
 . ./common/filter
 . ./common/punch
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_scratch
 
 _scratch_mkfs_xfs >/dev/null 2>&1
diff --git a/tests/xfs/070 b/tests/xfs/070
index 43ca7f84..608afe68 100755
--- a/tests/xfs/070
+++ b/tests/xfs/070
@@ -69,10 +69,8 @@ _xfs_repair_noscan()
 . ./common/filter
 . ./common/repair
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_scratch_nocheck
 _require_command "$KILLALL_PROG" killall
 
diff --git a/tests/xfs/071 b/tests/xfs/071
index 8373878a..c4722f67 100755
--- a/tests/xfs/071
+++ b/tests/xfs/071
@@ -75,8 +75,6 @@ write_block()
     echo | tee -a $seqres.full
 }
 
-# real QA test starts here
-_supported_fs xfs
 
 [ -n "$XFS_IO_PROG" ] || _notrun "xfs_io executable not found"
 
diff --git a/tests/xfs/072 b/tests/xfs/072
index 54c1207c..a90938de 100755
--- a/tests/xfs/072
+++ b/tests/xfs/072
@@ -20,8 +20,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/073 b/tests/xfs/073
index 0f96fdb0..28f1fad0 100755
--- a/tests/xfs/073
+++ b/tests/xfs/073
@@ -103,8 +103,6 @@ _verify_copy()
 	rm -f $target
 }
 
-# real QA test starts here
-_supported_fs xfs
 _require_test
 _require_attrs
 _require_xfs_copy
diff --git a/tests/xfs/074 b/tests/xfs/074
index f27700ee..278f0ade 100755
--- a/tests/xfs/074
+++ b/tests/xfs/074
@@ -33,8 +33,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_test
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/075 b/tests/xfs/075
index ec056fb3..ab1d6cae 100755
--- a/tests/xfs/075
+++ b/tests/xfs/075
@@ -14,8 +14,6 @@ _begin_fstest auto quick mount
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 
 # norecovery mounts do not succeed with quotas eanbled, so shut them off
diff --git a/tests/xfs/076 b/tests/xfs/076
index a6ec0568..840617cc 100755
--- a/tests/xfs/076
+++ b/tests/xfs/076
@@ -53,7 +53,6 @@ _alloc_inodes()
 	done
 }
 
-# real QA test starts here
 
 if [ -n "$SCRATCH_RTDEV" ]; then
 	# ./check won't know we unset SCRATCH_RTDEV
diff --git a/tests/xfs/077 b/tests/xfs/077
index 4c597fdd..301344d7 100755
--- a/tests/xfs/077
+++ b/tests/xfs/077
@@ -18,9 +18,7 @@ _begin_fstest auto quick copy
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs xfs
 _require_xfs_copy
 _require_scratch
 _require_no_large_scratch_dev
diff --git a/tests/xfs/078 b/tests/xfs/078
index 501551e5..834c99a0 100755
--- a/tests/xfs/078
+++ b/tests/xfs/078
@@ -27,7 +27,6 @@ _cleanup()
 . ./common/filter
 
 # loop devices are available in Linux only
-_supported_fs xfs
 
 _require_test
 # Must have loop device
@@ -42,7 +41,6 @@ _filter_io()
 	sed -e '/.* ops; /d'
 }
 
-# real QA test starts here
 
 echo "*** create loop mount point"
 rmdir $LOOP_MNT 2>/dev/null
diff --git a/tests/xfs/079 b/tests/xfs/079
index dd5dbd35..46a15ed7 100755
--- a/tests/xfs/079
+++ b/tests/xfs/079
@@ -29,10 +29,8 @@ _cleanup()
 # Import common functions.
 . ./common/log
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_scratch
 _require_v2log
 _require_command "$KILLALL_PROG" killall
diff --git a/tests/xfs/080 b/tests/xfs/080
index 2d90b6c4..f86cadcc 100755
--- a/tests/xfs/080
+++ b/tests/xfs/080
@@ -19,7 +19,6 @@ _cleanup()
     rm -f $tmp.*
 }
 
-_supported_fs xfs
 _require_test
 _require_xfs_io_command falloc	# iogen requires falloc
 
@@ -30,7 +29,6 @@ export here
 cd $TEST_DIR
 echo
 
-# real QA test starts here
 
 $here/ltp/rwtest.sh $quiet $clean -i 2000 -f direct,buffered,sync
 status=$?
diff --git a/tests/xfs/081 b/tests/xfs/081
index 3af73778..14c0d13e 100755
--- a/tests/xfs/081
+++ b/tests/xfs/081
@@ -20,8 +20,6 @@ _begin_fstest auto quick attr
 . ./common/attr
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 _fixed_by_kernel_commit a1de97fe296c \
        "xfs: Fix the free logic of state in xfs_attr_node_hasname"
 
diff --git a/tests/xfs/082 b/tests/xfs/082
index cc6bfa61..c999c585 100755
--- a/tests/xfs/082
+++ b/tests/xfs/082
@@ -16,10 +16,8 @@
 . ./common/preamble
 _begin_fstest auto copy quick
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_xfs_copy
 _require_test
 
diff --git a/tests/xfs/083 b/tests/xfs/083
index e8ce2221..9291c8c0 100755
--- a/tests/xfs/083
+++ b/tests/xfs/083
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _require_attrs
diff --git a/tests/xfs/084 b/tests/xfs/084
index ab734355..3cae2c14 100755
--- a/tests/xfs/084
+++ b/tests/xfs/084
@@ -25,8 +25,6 @@ pgsize=`$here/src/feature -s`
 # -b == read/write block size
 # -s == preallocation size
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_io_command "falloc"
 _require_test
 
diff --git a/tests/xfs/085 b/tests/xfs/085
index dc82f28d..d33dd199 100755
--- a/tests/xfs/085
+++ b/tests/xfs/085
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/attr
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
diff --git a/tests/xfs/086 b/tests/xfs/086
index c8c6d86e..44985f39 100755
--- a/tests/xfs/086
+++ b/tests/xfs/086
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/attr
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
diff --git a/tests/xfs/087 b/tests/xfs/087
index f7cae328..3cca1056 100755
--- a/tests/xfs/087
+++ b/tests/xfs/087
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/attr
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
diff --git a/tests/xfs/088 b/tests/xfs/088
index 156c6669..b54a1ab7 100755
--- a/tests/xfs/088
+++ b/tests/xfs/088
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/attr
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
diff --git a/tests/xfs/089 b/tests/xfs/089
index ae8f6564..ff3ae719 100755
--- a/tests/xfs/089
+++ b/tests/xfs/089
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/attr
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
diff --git a/tests/xfs/090 b/tests/xfs/090
index 663cbcd6..0a3f13f4 100755
--- a/tests/xfs/090
+++ b/tests/xfs/090
@@ -12,8 +12,6 @@ _begin_fstest rw auto realtime
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_scratch
 
diff --git a/tests/xfs/091 b/tests/xfs/091
index 85c881ae..3f606f88 100755
--- a/tests/xfs/091
+++ b/tests/xfs/091
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/attr
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
diff --git a/tests/xfs/092 b/tests/xfs/092
index 015149e2..17b5d59e 100755
--- a/tests/xfs/092
+++ b/tests/xfs/092
@@ -12,10 +12,8 @@ _begin_fstest other auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_scratch
 _require_no_large_scratch_dev
 
diff --git a/tests/xfs/093 b/tests/xfs/093
index 04b09e85..c4e80060 100755
--- a/tests/xfs/093
+++ b/tests/xfs/093
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/attr
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
diff --git a/tests/xfs/094 b/tests/xfs/094
index 438a3ea8..f9cea67f 100755
--- a/tests/xfs/094
+++ b/tests/xfs/094
@@ -12,8 +12,6 @@ _begin_fstest metadata dir ioctl auto realtime
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_scratch
 
diff --git a/tests/xfs/095 b/tests/xfs/095
index e7dc3e9f..da0d2ae4 100755
--- a/tests/xfs/095
+++ b/tests/xfs/095
@@ -13,10 +13,8 @@ _begin_fstest log v2log auto
 . ./common/filter
 . ./common/log
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_scratch
 _require_v2log
 _require_xfs_nocrc
diff --git a/tests/xfs/096 b/tests/xfs/096
index 0a1bfb3f..57a05a8f 100755
--- a/tests/xfs/096
+++ b/tests/xfs/096
@@ -13,10 +13,8 @@ _begin_fstest auto quick quota
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 
 _require_scratch
 _require_xfs_quota
diff --git a/tests/xfs/097 b/tests/xfs/097
index 1df34eed..384c7608 100755
--- a/tests/xfs/097
+++ b/tests/xfs/097
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/attr
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _require_xfs_mkfs_finobt
diff --git a/tests/xfs/098 b/tests/xfs/098
index 1e60271f..a47cda67 100755
--- a/tests/xfs/098
+++ b/tests/xfs/098
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/attr
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 
 # We corrupt XFS on purpose, and check if assert failures would crash system.
 _require_no_xfs_bug_on_assert
diff --git a/tests/xfs/099 b/tests/xfs/099
index 82bef8ad..f5321fe3 100755
--- a/tests/xfs/099
+++ b/tests/xfs/099
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/attr
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
diff --git a/tests/xfs/100 b/tests/xfs/100
index e638b4ba..6f465a79 100755
--- a/tests/xfs/100
+++ b/tests/xfs/100
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/attr
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
diff --git a/tests/xfs/101 b/tests/xfs/101
index 11ed3291..a926acb0 100755
--- a/tests/xfs/101
+++ b/tests/xfs/101
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/attr
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
diff --git a/tests/xfs/102 b/tests/xfs/102
index 43f45391..c3ddec5e 100755
--- a/tests/xfs/102
+++ b/tests/xfs/102
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/attr
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
diff --git a/tests/xfs/103 b/tests/xfs/103
index a3f0ef9e..72cb0e3e 100755
--- a/tests/xfs/103
+++ b/tests/xfs/103
@@ -40,8 +40,6 @@ _filter_noymlinks_flag()
 	fi
 }
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 
 _create_scratch
diff --git a/tests/xfs/104 b/tests/xfs/104
index d16f46d8..7f11f89a 100755
--- a/tests/xfs/104
+++ b/tests/xfs/104
@@ -45,8 +45,6 @@ _stress_scratch()
 	$FSSTRESS_PROG $FSSTRESS_ARGS >> $seqres.full 2>&1 &
 }
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_io_command "falloc"
 
diff --git a/tests/xfs/105 b/tests/xfs/105
index 002a7128..132aa07f 100755
--- a/tests/xfs/105
+++ b/tests/xfs/105
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/attr
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
diff --git a/tests/xfs/106 b/tests/xfs/106
index 388873bd..066efef1 100755
--- a/tests/xfs/106
+++ b/tests/xfs/106
@@ -15,8 +15,6 @@ _begin_fstest auto quick quota
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_quota
 _require_user
diff --git a/tests/xfs/107 b/tests/xfs/107
index 1ea9c492..3a37998c 100755
--- a/tests/xfs/107
+++ b/tests/xfs/107
@@ -14,10 +14,8 @@ _begin_fstest auto quick prealloc
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_test
 _require_scratch
 _require_xfs_io_command allocsp		# detect presence of ALLOCSP ioctl
diff --git a/tests/xfs/108 b/tests/xfs/108
index 8593edbd..149d76ee 100755
--- a/tests/xfs/108
+++ b/tests/xfs/108
@@ -13,8 +13,6 @@ _begin_fstest quota auto quick
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_quota
 _require_xfs_io_command "syncfs"
@@ -67,7 +65,6 @@ _scratch_mkfs_xfs >> $seqres.full
 _qmount
 _require_prjquota $SCRATCH_DEV
 
-# real QA test starts here
 rm -f $tmp.projects $seqres.full
 _scratch_unmount 2>/dev/null
 _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs
diff --git a/tests/xfs/109 b/tests/xfs/109
index e3e491f1..4182d79e 100755
--- a/tests/xfs/109
+++ b/tests/xfs/109
@@ -12,8 +12,6 @@ _begin_fstest metadata auto
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 
 populate()
@@ -66,7 +64,6 @@ allocate()
 	echo "all done!"
 }
 
-# real QA test starts here
 _scratch_mkfs_xfs >> $seqres.full
 _scratch_mount
 
diff --git a/tests/xfs/110 b/tests/xfs/110
index 596057ef..0c8c87ea 100755
--- a/tests/xfs/110
+++ b/tests/xfs/110
@@ -12,11 +12,8 @@ _begin_fstest repair auto
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 
-# real QA test starts here
 _scratch_unmount 2>/dev/null
 _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs
 
diff --git a/tests/xfs/111 b/tests/xfs/111
index ede28aee..c21fbdb6 100755
--- a/tests/xfs/111
+++ b/tests/xfs/111
@@ -12,13 +12,10 @@ _begin_fstest ioctl
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 
 [ "$XFS_FSR_PROG" = "" ] && _notrun "xfs_fsr not found"
 
-# real QA test starts here
 _scratch_unmount 2>/dev/null
 MKFS_OPTIONS="-bsize=4096"
 MOUNT_OPTIONS="-o noatime"
diff --git a/tests/xfs/112 b/tests/xfs/112
index e2d5932d..f0e717cf 100755
--- a/tests/xfs/112
+++ b/tests/xfs/112
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/attr
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
diff --git a/tests/xfs/113 b/tests/xfs/113
index 9bb2cd30..094ab71f 100755
--- a/tests/xfs/113
+++ b/tests/xfs/113
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/attr
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
diff --git a/tests/xfs/114 b/tests/xfs/114
index 0e8a0529..34373005 100755
--- a/tests/xfs/114
+++ b/tests/xfs/114
@@ -15,8 +15,6 @@ _begin_fstest auto quick clone rmap collapse insert prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_test_program "punch-alternating"
 _require_cp_reflink
 _require_scratch_reflink
diff --git a/tests/xfs/115 b/tests/xfs/115
index f0647281..9e0dc51a 100755
--- a/tests/xfs/115
+++ b/tests/xfs/115
@@ -15,10 +15,8 @@ _begin_fstest auto quick fuzzers
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch_nocheck
 # We corrupt XFS on purpose, and check if assert failures would crash system.
 _require_no_xfs_bug_on_assert
diff --git a/tests/xfs/116 b/tests/xfs/116
index 736fb2f9..c5e7508f 100755
--- a/tests/xfs/116
+++ b/tests/xfs/116
@@ -15,9 +15,7 @@ _begin_fstest quota auto quick
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
 
-_supported_fs xfs
 
 _require_scratch
 _require_xfs_quota
diff --git a/tests/xfs/117 b/tests/xfs/117
index e4195d9b..0ca8f1b9 100755
--- a/tests/xfs/117
+++ b/tests/xfs/117
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/attr
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
diff --git a/tests/xfs/118 b/tests/xfs/118
index 6bb81a3a..73e42938 100755
--- a/tests/xfs/118
+++ b/tests/xfs/118
@@ -21,7 +21,6 @@ _begin_fstest auto quick fsr prealloc
 # Import common functions.
 . ./common/filter
 
-_supported_fs xfs
 
 _require_scratch
 _require_command "$XFS_FSR_PROG" "xfs_fsr"
diff --git a/tests/xfs/119 b/tests/xfs/119
index 5ffbce25..334d0693 100755
--- a/tests/xfs/119
+++ b/tests/xfs/119
@@ -23,10 +23,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 
 _require_scratch
 _require_freeze
diff --git a/tests/xfs/120 b/tests/xfs/120
index 0a4d72a0..f1f047f5 100755
--- a/tests/xfs/120
+++ b/tests/xfs/120
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/attr
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
diff --git a/tests/xfs/121 b/tests/xfs/121
index 08b5143d..0210a627 100755
--- a/tests/xfs/121
+++ b/tests/xfs/121
@@ -17,8 +17,6 @@ _begin_fstest shutdown log auto quick
 . ./common/filter
 . ./common/log
 
-# real QA test starts here
-_supported_fs xfs
 
 rm -f $tmp.log
 
diff --git a/tests/xfs/122 b/tests/xfs/122
index 4e5ba1df..a9689488 100755
--- a/tests/xfs/122
+++ b/tests/xfs/122
@@ -13,8 +13,6 @@ _begin_fstest other auto quick clone realtime
 
 # get standard environment
 
-# real QA test starts here
-_supported_fs xfs
 _require_command "$INDENT_PROG" indent
 
 # Starting in Linux 6.1, the EFI log formats were adjusted away from using
diff --git a/tests/xfs/123 b/tests/xfs/123
index 81f39b96..6b565513 100755
--- a/tests/xfs/123
+++ b/tests/xfs/123
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/attr
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
diff --git a/tests/xfs/124 b/tests/xfs/124
index 39307218..fe870dc9 100755
--- a/tests/xfs/124
+++ b/tests/xfs/124
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/attr
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
diff --git a/tests/xfs/125 b/tests/xfs/125
index fb5f5695..89e93650 100755
--- a/tests/xfs/125
+++ b/tests/xfs/125
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/attr
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
diff --git a/tests/xfs/126 b/tests/xfs/126
index c3a74b1c..5614ea39 100755
--- a/tests/xfs/126
+++ b/tests/xfs/126
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/attr
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
diff --git a/tests/xfs/127 b/tests/xfs/127
index f39b0582..b690ab0d 100755
--- a/tests/xfs/127
+++ b/tests/xfs/127
@@ -13,8 +13,6 @@ _begin_fstest auto quick clone
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_no_large_scratch_dev
 _require_cp_reflink
diff --git a/tests/xfs/128 b/tests/xfs/128
index 8c1663c6..0f190529 100755
--- a/tests/xfs/128
+++ b/tests/xfs/128
@@ -13,8 +13,6 @@ _begin_fstest auto quick clone fsr prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_test_lsattr
 _require_scratch_reflink
 _require_cp_reflink
diff --git a/tests/xfs/129 b/tests/xfs/129
index ec1a2ff3..605fdac1 100755
--- a/tests/xfs/129
+++ b/tests/xfs/129
@@ -25,8 +25,6 @@ _cleanup()
 . ./common/reflink
 . ./common/metadump
 
-# real QA test starts here
-_supported_fs xfs
 _require_command "$XFS_MDRESTORE_PROG" "xfs_mdrestore"
 _require_loop
 _require_scratch_reflink
diff --git a/tests/xfs/130 b/tests/xfs/130
index 9465cbb0..3e6dd861 100755
--- a/tests/xfs/130
+++ b/tests/xfs/130
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/attr
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
diff --git a/tests/xfs/131 b/tests/xfs/131
index 879e2dc6..c83a1d6e 100755
--- a/tests/xfs/131
+++ b/tests/xfs/131
@@ -21,8 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_scratch_reflink
 _require_cp_reflink
diff --git a/tests/xfs/132 b/tests/xfs/132
index b46d3d28..3bb37f2a 100755
--- a/tests/xfs/132
+++ b/tests/xfs/132
@@ -13,9 +13,7 @@ _begin_fstest auto quick
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
 
-_supported_fs xfs
 
 # we intentionally corrupt the filesystem, so don't check it after the test
 _require_scratch_nocheck
diff --git a/tests/xfs/133 b/tests/xfs/133
index 73f628c4..39f4f74a 100755
--- a/tests/xfs/133
+++ b/tests/xfs/133
@@ -21,8 +21,6 @@ PIDS=""
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_nocheck
 _disable_dmesg_check
 
diff --git a/tests/xfs/134 b/tests/xfs/134
index b13615ab..b8626521 100755
--- a/tests/xfs/134
+++ b/tests/xfs/134
@@ -21,8 +21,6 @@ PIDS=""
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_nocheck
 _disable_dmesg_check
 
diff --git a/tests/xfs/135 b/tests/xfs/135
index 6b96d00c..ec0b54ab 100755
--- a/tests/xfs/135
+++ b/tests/xfs/135
@@ -14,10 +14,8 @@ _begin_fstest auto logprint quick v2log
 # Import common functions.
 . ./common/log
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_scratch
 _require_v2log
 _require_xfs_db_command "logformat"
diff --git a/tests/xfs/136 b/tests/xfs/136
index 1658b760..8673a929 100755
--- a/tests/xfs/136
+++ b/tests/xfs/136
@@ -15,12 +15,10 @@ _begin_fstest attr2
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 
 #_notrun "Need to fix up filtering before checkin" 
 
 # Modify as appropriate.
-_supported_fs xfs
 
 _require_scratch
 _require_attrs
diff --git a/tests/xfs/137 b/tests/xfs/137
index 2cc974e5..dfc65357 100755
--- a/tests/xfs/137
+++ b/tests/xfs/137
@@ -16,10 +16,8 @@ _begin_fstest auto metadata v2log
 
 # Import common functions.
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_scratch
 _require_scratch_xfs_crc
 _require_xfs_db_command "logformat"
diff --git a/tests/xfs/138 b/tests/xfs/138
index c49d2d9e..4202ea9f 100755
--- a/tests/xfs/138
+++ b/tests/xfs/138
@@ -13,8 +13,6 @@ _register_cleanup "_cleanup" BUS
 
 # Import common functions.
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 
 cat > $tmp.a << ENDL
diff --git a/tests/xfs/139 b/tests/xfs/139
index 118930a5..523d3eb6 100755
--- a/tests/xfs/139
+++ b/tests/xfs/139
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 # Below agsize (16384 * $blksz) is too small for a large fs, and it's not
 # necessary to test on large fs
 _require_no_large_scratch_dev
diff --git a/tests/xfs/140 b/tests/xfs/140
index ba7694c3..2d4f9476 100755
--- a/tests/xfs/140
+++ b/tests/xfs/140
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 # Below agsize is too small for a large fs, and it's not necessary to test on
 # large fs
 _require_no_large_scratch_dev
diff --git a/tests/xfs/141 b/tests/xfs/141
index d9b2474d..5e9067e2 100755
--- a/tests/xfs/141
+++ b/tests/xfs/141
@@ -26,10 +26,8 @@ _cleanup()
 # Import common functions.
 . ./common/inject
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_xfs_io_error_injection "log_bad_crc"
 _require_scratch
 _require_command "$KILLALL_PROG" killall
diff --git a/tests/xfs/142 b/tests/xfs/142
index 60b750ed..2ee52846 100755
--- a/tests/xfs/142
+++ b/tests/xfs/142
@@ -15,8 +15,6 @@ _begin_fstest auto quick rw attr realtime
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_realtime
 
diff --git a/tests/xfs/143 b/tests/xfs/143
index 185b6387..3eb0a57a 100755
--- a/tests/xfs/143
+++ b/tests/xfs/143
@@ -16,8 +16,6 @@ _begin_fstest auto quick realtime mount
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_realtime
 
diff --git a/tests/xfs/144 b/tests/xfs/144
index 706aff61..1467d588 100755
--- a/tests/xfs/144
+++ b/tests/xfs/144
@@ -11,10 +11,8 @@
 . ./common/preamble
 _begin_fstest auto mkfs
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_test
 
 # The last testcase creates a (sparse) fs image with a 2GB log, so we need
diff --git a/tests/xfs/145 b/tests/xfs/145
index 5fd8dcad..39258007 100755
--- a/tests/xfs/145
+++ b/tests/xfs/145
@@ -16,8 +16,6 @@ _begin_fstest auto quick quota
 # Import common functions.
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _fixed_by_kernel_commit 1aecf3734a95 \
 	"xfs: fix chown leaking delalloc quota blocks when fssetxattr fails"
 
diff --git a/tests/xfs/146 b/tests/xfs/146
index 50904359..b6f4c2bd 100755
--- a/tests/xfs/146
+++ b/tests/xfs/146
@@ -20,8 +20,6 @@ _begin_fstest auto quick rw realtime prealloc
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_realtime
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/147 b/tests/xfs/147
index 33b3c996..4fa3cdc1 100755
--- a/tests/xfs/147
+++ b/tests/xfs/147
@@ -14,8 +14,6 @@ _begin_fstest auto quick rw realtime collapse insert unshare zero prealloc
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_realtime
 _require_xfs_io_command "fcollapse"
diff --git a/tests/xfs/148 b/tests/xfs/148
index fde3bf47..9e6798f9 100755
--- a/tests/xfs/148
+++ b/tests/xfs/148
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs xfs
 _require_test
 _require_attrs
 _require_xfs_nocrc
diff --git a/tests/xfs/149 b/tests/xfs/149
index 503eff65..f1b2405e 100755
--- a/tests/xfs/149
+++ b/tests/xfs/149
@@ -32,10 +32,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_test
 _require_loop
 
diff --git a/tests/xfs/150 b/tests/xfs/150
index bd0241b9..4d68092a 100755
--- a/tests/xfs/150
+++ b/tests/xfs/150
@@ -14,8 +14,6 @@ _begin_fstest auto quick db
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_db_command "path"
 _require_scratch
 
diff --git a/tests/xfs/151 b/tests/xfs/151
index b2fe16ae..c71d2348 100755
--- a/tests/xfs/151
+++ b/tests/xfs/151
@@ -14,8 +14,6 @@ _begin_fstest auto quick db
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_db_command "path"
 _require_xfs_db_command "ls"
 _require_scratch
diff --git a/tests/xfs/152 b/tests/xfs/152
index 325a05c1..6c052cbc 100755
--- a/tests/xfs/152
+++ b/tests/xfs/152
@@ -31,8 +31,6 @@ _cleanup()
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_idmapped_mounts
 _require_test_program "vfs/mount-idmapped"
 _require_scratch
diff --git a/tests/xfs/153 b/tests/xfs/153
index dbe26b68..897e9c78 100755
--- a/tests/xfs/153
+++ b/tests/xfs/153
@@ -24,8 +24,6 @@ _cleanup()
 	rm -f $tmp.*
 }
 
-# real QA test starts here
-_supported_fs xfs
 
 cp /dev/null $seqres.full
 chmod a+rwx $seqres.full	# arbitrary users will write here
diff --git a/tests/xfs/154 b/tests/xfs/154
index 548c9490..e8494bbd 100755
--- a/tests/xfs/154
+++ b/tests/xfs/154
@@ -16,8 +16,6 @@ _begin_fstest auto quick repair
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_nocheck
 _require_scratch_xfs_crc		# needsrepair only exists for v5
 _require_libxfs_debug_flag LIBXFS_DEBUG_WRITE_CRASH
diff --git a/tests/xfs/155 b/tests/xfs/155
index 8bf1aba1..20946b88 100755
--- a/tests/xfs/155
+++ b/tests/xfs/155
@@ -20,8 +20,6 @@ _begin_fstest auto repair
 . ./common/populate
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_nocheck
 _require_scratch_xfs_crc		# needsrepair only exists for v5
 _require_populate_commands
diff --git a/tests/xfs/156 b/tests/xfs/156
index 75418805..1498d5b3 100755
--- a/tests/xfs/156
+++ b/tests/xfs/156
@@ -15,8 +15,6 @@ _begin_fstest auto quick admin
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_command "$XFS_ADMIN_PROG" "xfs_admin"
 
diff --git a/tests/xfs/157 b/tests/xfs/157
index 8222d7ee..79d45ac2 100755
--- a/tests/xfs/157
+++ b/tests/xfs/157
@@ -30,8 +30,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_test
 _require_scratch_nocheck
 _require_command "$XFS_ADMIN_PROG" "xfs_admin"
diff --git a/tests/xfs/158 b/tests/xfs/158
index 9f03eb52..3c4e60f0 100755
--- a/tests/xfs/158
+++ b/tests/xfs/158
@@ -13,8 +13,6 @@ _begin_fstest auto quick inobtcount
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_inobtcount
 _require_command "$XFS_ADMIN_PROG" "xfs_admin"
 _require_xfs_repair_upgrade inobtcount
diff --git a/tests/xfs/159 b/tests/xfs/159
index eaee590e..222b2b35 100755
--- a/tests/xfs/159
+++ b/tests/xfs/159
@@ -19,8 +19,6 @@ _cleanup()
 
 # Import common functions.
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_db_command timelimit
 
diff --git a/tests/xfs/160 b/tests/xfs/160
index d11eaba3..8cc784e7 100755
--- a/tests/xfs/160
+++ b/tests/xfs/160
@@ -13,8 +13,6 @@ _begin_fstest auto quick bigtime
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_command "$XFS_ADMIN_PROG" "xfs_admin"
 _require_scratch_xfs_bigtime
 _require_xfs_repair_upgrade bigtime
diff --git a/tests/xfs/161 b/tests/xfs/161
index 5bda7019..002ee7d8 100755
--- a/tests/xfs/161
+++ b/tests/xfs/161
@@ -15,8 +15,6 @@ _begin_fstest auto quick bigtime quota
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_command "$XFS_ADMIN_PROG" "xfs_admin"
 _require_command "$QUOTA_PROG" "quota"
 _require_quota
diff --git a/tests/xfs/162 b/tests/xfs/162
index 16922ff6..fd0e0ac5 100755
--- a/tests/xfs/162
+++ b/tests/xfs/162
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_nocheck
 _require_populate_commands
 _require_xfs_db_command "fuzz"
diff --git a/tests/xfs/163 b/tests/xfs/163
index 9f6dbeb8..2bd94060 100755
--- a/tests/xfs/163
+++ b/tests/xfs/163
@@ -29,8 +29,6 @@ test_shrink()
 	[ $ret -eq 0 -a $1 -eq $dblocks ]
 }
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_shrink
 
 echo "Format and mount"
diff --git a/tests/xfs/164 b/tests/xfs/164
index ba08982d..42c46ed8 100755
--- a/tests/xfs/164
+++ b/tests/xfs/164
@@ -33,10 +33,8 @@ _filter_bmap()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_test
 _require_xfs_io_command "falloc"
 
diff --git a/tests/xfs/165 b/tests/xfs/165
index 7664b980..a4c28cdf 100755
--- a/tests/xfs/165
+++ b/tests/xfs/165
@@ -30,10 +30,8 @@ _filter_bmap()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_test
 _require_xfs_io_command "falloc"
 
diff --git a/tests/xfs/166 b/tests/xfs/166
index 45f28e77..beb05031 100755
--- a/tests/xfs/166
+++ b/tests/xfs/166
@@ -47,8 +47,6 @@ _filter_blocks()
 }'
 }
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/167 b/tests/xfs/167
index 734c107f..f9da261d 100755
--- a/tests/xfs/167
+++ b/tests/xfs/167
@@ -29,8 +29,6 @@ workout()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_command "$KILLALL_PROG" killall
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/168 b/tests/xfs/168
index ffcd0df8..e8e61dbf 100755
--- a/tests/xfs/168
+++ b/tests/xfs/168
@@ -43,8 +43,6 @@ stress_scratch()
 	$FSSTRESS_PROG $FSSTRESS_ARGS >> $seqres.full 2>&1
 }
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_shrink
 _require_xfs_io_command "falloc"
 
diff --git a/tests/xfs/169 b/tests/xfs/169
index 7ea5af99..6400fd9e 100755
--- a/tests/xfs/169
+++ b/tests/xfs/169
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 
 _scratch_mkfs >/dev/null 2>&1
diff --git a/tests/xfs/170 b/tests/xfs/170
index b9ead341..111b1b44 100755
--- a/tests/xfs/170
+++ b/tests/xfs/170
@@ -15,8 +15,6 @@ _begin_fstest rw filestreams auto quick
 . ./common/filter
 . ./common/filestreams
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 
diff --git a/tests/xfs/171 b/tests/xfs/171
index f93b6011..4d4a19f3 100755
--- a/tests/xfs/171
+++ b/tests/xfs/171
@@ -14,8 +14,6 @@ _begin_fstest rw filestreams
 . ./common/filter
 . ./common/filestreams
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 
diff --git a/tests/xfs/172 b/tests/xfs/172
index 56c2583b..7f9defec 100755
--- a/tests/xfs/172
+++ b/tests/xfs/172
@@ -14,8 +14,6 @@ _begin_fstest rw filestreams
 . ./common/filter
 . ./common/filestreams
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 
 # The first _test_streams call sets up the filestreams allocator to fail and
diff --git a/tests/xfs/173 b/tests/xfs/173
index 6b18d919..91b4effb 100755
--- a/tests/xfs/173
+++ b/tests/xfs/173
@@ -14,8 +14,6 @@ _begin_fstest rw filestreams
 . ./common/filter
 . ./common/filestreams
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 
diff --git a/tests/xfs/174 b/tests/xfs/174
index 1245a217..ebdfb2ce 100755
--- a/tests/xfs/174
+++ b/tests/xfs/174
@@ -14,8 +14,6 @@ _begin_fstest rw filestreams auto
 . ./common/filter
 . ./common/filestreams
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 
diff --git a/tests/xfs/175 b/tests/xfs/175
index 22c64802..7fea6569 100755
--- a/tests/xfs/175
+++ b/tests/xfs/175
@@ -15,8 +15,6 @@ _begin_fstest auto quick quota
 # Import common functions
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_quota
 
diff --git a/tests/xfs/176 b/tests/xfs/176
index 49f7492c..db7001a5 100755
--- a/tests/xfs/176
+++ b/tests/xfs/176
@@ -13,10 +13,8 @@ _begin_fstest auto quick shrinkfs prealloc punch
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch
 _require_xfs_sparse_inodes
 _require_scratch_xfs_shrink
diff --git a/tests/xfs/177 b/tests/xfs/177
index 1e59bd6c..77304952 100755
--- a/tests/xfs/177
+++ b/tests/xfs/177
@@ -35,10 +35,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _fixed_by_kernel_commit f38a032b165d "xfs: fix I_DONTCACHE"
 
 _require_xfs_io_command "bulkstat"
diff --git a/tests/xfs/178 b/tests/xfs/178
index fee1e92b..8597177d 100755
--- a/tests/xfs/178
+++ b/tests/xfs/178
@@ -36,10 +36,8 @@ _dd_repair_check()
 . ./common/filter
 . ./common/repair
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 
 # From the PV
 # o Summary of testing:
diff --git a/tests/xfs/179 b/tests/xfs/179
index 98b01476..e50fa436 100755
--- a/tests/xfs/179
+++ b/tests/xfs/179
@@ -14,8 +14,6 @@ _begin_fstest auto quick clone
 . ./common/attr
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_scratch_nocheck
 _require_cp_reflink
diff --git a/tests/xfs/180 b/tests/xfs/180
index d2fac03a..8c82140b 100755
--- a/tests/xfs/180
+++ b/tests/xfs/180
@@ -17,8 +17,6 @@ _begin_fstest auto quick clone fiemap
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fiemap"
diff --git a/tests/xfs/181 b/tests/xfs/181
index a399ae5a..a20f412f 100755
--- a/tests/xfs/181
+++ b/tests/xfs/181
@@ -26,8 +26,6 @@ pid=""
 . ./common/filter
 . ./common/log
 
-# real QA test starts here
-_supported_fs xfs
 
 rm -f $tmp.log
 
diff --git a/tests/xfs/182 b/tests/xfs/182
index 511aca6f..6c39c195 100755
--- a/tests/xfs/182
+++ b/tests/xfs/182
@@ -17,8 +17,6 @@ _begin_fstest auto quick clone fiemap
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fiemap"
diff --git a/tests/xfs/183 b/tests/xfs/183
index 5b092acc..7b0abdc1 100755
--- a/tests/xfs/183
+++ b/tests/xfs/183
@@ -13,10 +13,8 @@ _begin_fstest rw other auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 
 # Setup Filesystem
 _require_scratch
diff --git a/tests/xfs/184 b/tests/xfs/184
index 97f529f6..8b38444b 100755
--- a/tests/xfs/184
+++ b/tests/xfs/184
@@ -17,8 +17,6 @@ _begin_fstest auto quick clone fiemap unshare
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_scratch_delalloc
 _require_scratch_reflink
diff --git a/tests/xfs/185 b/tests/xfs/185
index abeb0525..b14bcb9b 100755
--- a/tests/xfs/185
+++ b/tests/xfs/185
@@ -30,8 +30,6 @@ _cleanup()
 	test -n "$old_use_external" && USE_EXTERNAL="$old_use_external"
 }
 
-# real QA test starts here
-_supported_fs xfs
 _require_test
 _require_loop
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/186 b/tests/xfs/186
index f44158e3..88f02585 100755
--- a/tests/xfs/186
+++ b/tests/xfs/186
@@ -115,10 +115,8 @@ _changeto_attr1()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 
 _require_scratch
 _require_attrs
diff --git a/tests/xfs/187 b/tests/xfs/187
index 7c34d8e6..04ff9a81 100755
--- a/tests/xfs/187
+++ b/tests/xfs/187
@@ -33,8 +33,6 @@ _begin_fstest auto quick rw realtime prealloc punch
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_realtime
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/188 b/tests/xfs/188
index d40e4123..a72bf15d 100755
--- a/tests/xfs/188
+++ b/tests/xfs/188
@@ -29,8 +29,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_mkfs_ciname
 
diff --git a/tests/xfs/189 b/tests/xfs/189
index bc7ccca5..d32adf08 100755
--- a/tests/xfs/189
+++ b/tests/xfs/189
@@ -245,8 +245,6 @@ _putback_scratch_fstab()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_no_realtime
 _require_scratch
diff --git a/tests/xfs/190 b/tests/xfs/190
index 860a3516..32b6217f 100755
--- a/tests/xfs/190
+++ b/tests/xfs/190
@@ -19,8 +19,6 @@ status=0    # success is the default!
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1
diff --git a/tests/xfs/191 b/tests/xfs/191
index e2150bf7..475d81ee 100755
--- a/tests/xfs/191
+++ b/tests/xfs/191
@@ -24,9 +24,7 @@ _begin_fstest auto quick attr
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 
-_supported_fs xfs
 _require_scratch
 _require_scratch_xfs_crc # V4 is deprecated
 _fixed_by_kernel_commit 7be3bd8856fb "xfs: empty xattr leaf header blocks are not corruption"
diff --git a/tests/xfs/192 b/tests/xfs/192
index ef7da55b..3fed9e8f 100755
--- a/tests/xfs/192
+++ b/tests/xfs/192
@@ -17,8 +17,6 @@ _begin_fstest auto quick clone fiemap unshare
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_scratch_delalloc
 _require_scratch_reflink
diff --git a/tests/xfs/193 b/tests/xfs/193
index c71aef35..02ffdff4 100755
--- a/tests/xfs/193
+++ b/tests/xfs/193
@@ -16,8 +16,6 @@ _begin_fstest auto quick clone fiemap
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fiemap"
diff --git a/tests/xfs/194 b/tests/xfs/194
index 2fcc55b3..9abd2c32 100755
--- a/tests/xfs/194
+++ b/tests/xfs/194
@@ -25,9 +25,7 @@ _cleanup()
 . ./common/filter
 
 # only xfs supported due to use of xfs_bmap
-_supported_fs xfs
 
-# real QA test starts here
 
 _require_scratch
 
diff --git a/tests/xfs/195 b/tests/xfs/195
index 3e388142..f965d9c3 100755
--- a/tests/xfs/195
+++ b/tests/xfs/195
@@ -38,8 +38,6 @@ _do_dump()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_test
 _require_user
diff --git a/tests/xfs/196 b/tests/xfs/196
index dc87b48a..9535ce6b 100755
--- a/tests/xfs/196
+++ b/tests/xfs/196
@@ -19,10 +19,8 @@ _begin_fstest auto quick rw
 . ./common/punch
 . ./common/inject
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch
 _require_xfs_io_error_injection "drop_writes"
 
diff --git a/tests/xfs/197 b/tests/xfs/197
index 109bf478..7f7ce898 100755
--- a/tests/xfs/197
+++ b/tests/xfs/197
@@ -24,8 +24,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_test
 
 bitsperlong=`$here/src/feature -w`
diff --git a/tests/xfs/198 b/tests/xfs/198
index e5b98609..288a4e21 100755
--- a/tests/xfs/198
+++ b/tests/xfs/198
@@ -16,8 +16,6 @@ _begin_fstest auto quick clone fiemap
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fiemap"
diff --git a/tests/xfs/199 b/tests/xfs/199
index f99b04db..7b9c8eea 100755
--- a/tests/xfs/199
+++ b/tests/xfs/199
@@ -22,8 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _require_xfs_nocrc
diff --git a/tests/xfs/200 b/tests/xfs/200
index a9d6ce1b..cab75b3c 100755
--- a/tests/xfs/200
+++ b/tests/xfs/200
@@ -19,8 +19,6 @@ _begin_fstest auto quick clone fiemap unshare
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_scratch_delalloc
 _require_scratch_reflink
diff --git a/tests/xfs/201 b/tests/xfs/201
index b9f2aab1..a0d2c915 100755
--- a/tests/xfs/201
+++ b/tests/xfs/201
@@ -21,8 +21,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 
 file=$SCRATCH_MNT/f
 
diff --git a/tests/xfs/202 b/tests/xfs/202
index 5075d3a1..6708a6ed 100755
--- a/tests/xfs/202
+++ b/tests/xfs/202
@@ -13,8 +13,6 @@ _begin_fstest repair auto quick
 . ./common/filter
 . ./common/repair
 
-# real QA test starts here
-_supported_fs xfs
 
 # single AG will cause default xfs_repair to fail. This test is actually
 # testing the special corner case option needed to repair a single AG fs.
diff --git a/tests/xfs/203 b/tests/xfs/203
index 9a4a4564..ec0d500f 100755
--- a/tests/xfs/203
+++ b/tests/xfs/203
@@ -45,8 +45,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _scratch_mkfs > /dev/null 2>&1
 _scratch_mount > /dev/null 2>&1
diff --git a/tests/xfs/204 b/tests/xfs/204
index 7dacfa2d..07d8eb79 100755
--- a/tests/xfs/204
+++ b/tests/xfs/204
@@ -19,8 +19,6 @@ _begin_fstest auto quick clone fiemap unshare
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_scratch_delalloc
 _require_scratch_reflink
diff --git a/tests/xfs/205 b/tests/xfs/205
index 104f1f45..73d51d8d 100755
--- a/tests/xfs/205
+++ b/tests/xfs/205
@@ -12,8 +12,6 @@ _begin_fstest metadata rw auto
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 
 # single AG will cause xfs_repair to fail checks.
 _require_scratch_nocheck
diff --git a/tests/xfs/206 b/tests/xfs/206
index d81fe198..12974331 100755
--- a/tests/xfs/206
+++ b/tests/xfs/206
@@ -27,10 +27,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_test
 _require_loop
 
diff --git a/tests/xfs/207 b/tests/xfs/207
index 4bdafd26..bbe21307 100755
--- a/tests/xfs/207
+++ b/tests/xfs/207
@@ -16,8 +16,6 @@ _begin_fstest auto quick clone fiemap
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fiemap"
diff --git a/tests/xfs/208 b/tests/xfs/208
index 1e7734b8..cff3b7d4 100755
--- a/tests/xfs/208
+++ b/tests/xfs/208
@@ -20,8 +20,6 @@ _begin_fstest auto quick clone fiemap
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fiemap"
diff --git a/tests/xfs/209 b/tests/xfs/209
index 1ef6d33d..6778b925 100755
--- a/tests/xfs/209
+++ b/tests/xfs/209
@@ -13,8 +13,6 @@ _begin_fstest auto quick clone fiemap
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fiemap"
diff --git a/tests/xfs/210 b/tests/xfs/210
index 5f05ab26..5f1ffec8 100755
--- a/tests/xfs/210
+++ b/tests/xfs/210
@@ -17,8 +17,6 @@ _begin_fstest auto quick clone fiemap
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fiemap"
diff --git a/tests/xfs/211 b/tests/xfs/211
index 3ce6496a..2419107e 100755
--- a/tests/xfs/211
+++ b/tests/xfs/211
@@ -17,8 +17,6 @@ _begin_fstest clone_stress fiemap
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fiemap"
diff --git a/tests/xfs/212 b/tests/xfs/212
index 6df03608..54ece22a 100755
--- a/tests/xfs/212
+++ b/tests/xfs/212
@@ -16,8 +16,6 @@ _begin_fstest shutdown auto quick clone fiemap
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fiemap"
diff --git a/tests/xfs/213 b/tests/xfs/213
index e1849624..7b27e3c0 100755
--- a/tests/xfs/213
+++ b/tests/xfs/213
@@ -16,8 +16,6 @@ _begin_fstest auto quick clone fiemap
 . ./common/reflink
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fiemap"
diff --git a/tests/xfs/214 b/tests/xfs/214
index 84ba838f..f2f23b3f 100755
--- a/tests/xfs/214
+++ b/tests/xfs/214
@@ -16,8 +16,6 @@ _begin_fstest auto quick clone fiemap
 . ./common/reflink
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fiemap"
diff --git a/tests/xfs/215 b/tests/xfs/215
index d2c0d6fc..82bfe89d 100755
--- a/tests/xfs/215
+++ b/tests/xfs/215
@@ -19,7 +19,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "cowextsize"
diff --git a/tests/xfs/216 b/tests/xfs/216
index f981151c..680239b4 100755
--- a/tests/xfs/216
+++ b/tests/xfs/216
@@ -12,8 +12,6 @@ _begin_fstest log metadata auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1
diff --git a/tests/xfs/217 b/tests/xfs/217
index bf9c5123..41caaf73 100755
--- a/tests/xfs/217
+++ b/tests/xfs/217
@@ -12,8 +12,6 @@ _begin_fstest log metadata auto
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1
diff --git a/tests/xfs/218 b/tests/xfs/218
index 1a994d79..1d6c9e43 100755
--- a/tests/xfs/218
+++ b/tests/xfs/218
@@ -19,7 +19,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "cowextsize"
diff --git a/tests/xfs/219 b/tests/xfs/219
index 507b033b..47115a7d 100755
--- a/tests/xfs/219
+++ b/tests/xfs/219
@@ -19,7 +19,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "cowextsize"
diff --git a/tests/xfs/220 b/tests/xfs/220
index 88eedf51..f89c976f 100755
--- a/tests/xfs/220
+++ b/tests/xfs/220
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _require_quota
diff --git a/tests/xfs/221 b/tests/xfs/221
index 598df3f1..13ecb898 100755
--- a/tests/xfs/221
+++ b/tests/xfs/221
@@ -19,7 +19,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "cowextsize"
diff --git a/tests/xfs/222 b/tests/xfs/222
index 96790313..26bf7dcc 100755
--- a/tests/xfs/222
+++ b/tests/xfs/222
@@ -15,8 +15,6 @@ _begin_fstest auto fsr ioctl quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_test
 
 [ "$XFS_FSR_PROG" = "" ] && _notrun "xfs_fsr not found"
diff --git a/tests/xfs/223 b/tests/xfs/223
index 849667d4..3099f47e 100755
--- a/tests/xfs/223
+++ b/tests/xfs/223
@@ -20,7 +20,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_scratch_delalloc
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/224 b/tests/xfs/224
index 6f6dcd04..23b901a3 100755
--- a/tests/xfs/224
+++ b/tests/xfs/224
@@ -20,7 +20,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_scratch_delalloc
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/225 b/tests/xfs/225
index 8722d506..8a8eb574 100755
--- a/tests/xfs/225
+++ b/tests/xfs/225
@@ -19,7 +19,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "cowextsize"
diff --git a/tests/xfs/226 b/tests/xfs/226
index a5f46a14..7f711991 100755
--- a/tests/xfs/226
+++ b/tests/xfs/226
@@ -19,7 +19,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "cowextsize"
diff --git a/tests/xfs/227 b/tests/xfs/227
index cd927dc4..3f01b175 100755
--- a/tests/xfs/227
+++ b/tests/xfs/227
@@ -17,8 +17,6 @@ _begin_fstest auto fsr
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 
 [ "$XFS_FSR_PROG" = "" ] && _notrun "xfs_fsr not found"
diff --git a/tests/xfs/228 b/tests/xfs/228
index 504f9288..a868be18 100755
--- a/tests/xfs/228
+++ b/tests/xfs/228
@@ -23,7 +23,6 @@ _begin_fstest auto quick clone punch prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_scratch_delalloc
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/229 b/tests/xfs/229
index a58fd16b..9dae0f64 100755
--- a/tests/xfs/229
+++ b/tests/xfs/229
@@ -23,8 +23,6 @@ _cleanup()
 
 # Import common functions.
 
-# real QA test starts here
-_supported_fs xfs
 _require_test
 _require_fs_space $TEST_DIR 3200000
 
diff --git a/tests/xfs/230 b/tests/xfs/230
index fd1209be..28cf7550 100755
--- a/tests/xfs/230
+++ b/tests/xfs/230
@@ -23,7 +23,6 @@ _begin_fstest auto quick clone punch prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_scratch_delalloc
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/231 b/tests/xfs/231
index 31f267ee..c01682fa 100755
--- a/tests/xfs/231
+++ b/tests/xfs/231
@@ -27,8 +27,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "cowextsize"
diff --git a/tests/xfs/232 b/tests/xfs/232
index 0cb26fa1..c7eba95a 100755
--- a/tests/xfs/232
+++ b/tests/xfs/232
@@ -28,8 +28,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_scratch_delalloc
 _require_xfs_io_command "cowextsize"
diff --git a/tests/xfs/233 b/tests/xfs/233
index 2b2b8666..1f691e20 100755
--- a/tests/xfs/233
+++ b/tests/xfs/233
@@ -12,8 +12,6 @@ _begin_fstest auto quick rmap
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_scratch_rmapbt
 _require_no_large_scratch_dev
 
diff --git a/tests/xfs/234 b/tests/xfs/234
index 6fdea42d..4d6e30c0 100755
--- a/tests/xfs/234
+++ b/tests/xfs/234
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/metadump
 
-# real QA test starts here
-_supported_fs xfs
 _require_command "$XFS_MDRESTORE_PROG" "xfs_mdrestore"
 _require_loop
 _require_xfs_scratch_rmapbt
diff --git a/tests/xfs/235 b/tests/xfs/235
index 59292bec..5b201d93 100755
--- a/tests/xfs/235
+++ b/tests/xfs/235
@@ -14,8 +14,6 @@ _begin_fstest fuzzers rmap
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_scratch_rmapbt
 test -n ${FORCE_FUZZ} || _require_scratch_xfs_crc
 
diff --git a/tests/xfs/236 b/tests/xfs/236
index a66ea2d5..a374a300 100755
--- a/tests/xfs/236
+++ b/tests/xfs/236
@@ -22,8 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_scratch_rmapbt
 _require_xfs_io_command "fpunch"
 
diff --git a/tests/xfs/237 b/tests/xfs/237
index db235e05..5f264ff4 100755
--- a/tests/xfs/237
+++ b/tests/xfs/237
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/reflink
 . ./common/dmerror
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_dm_target error
diff --git a/tests/xfs/238 b/tests/xfs/238
index 64abb4de..4b71d401 100755
--- a/tests/xfs/238
+++ b/tests/xfs/238
@@ -12,10 +12,8 @@ _begin_fstest auto quick metadata ioctl
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_scratch
 
 echo "Silence is golden"
diff --git a/tests/xfs/239 b/tests/xfs/239
index f04460bc..277bd454 100755
--- a/tests/xfs/239
+++ b/tests/xfs/239
@@ -20,8 +20,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "cowextsize"
diff --git a/tests/xfs/240 b/tests/xfs/240
index a65c270d..4f9311e8 100755
--- a/tests/xfs/240
+++ b/tests/xfs/240
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/reflink
 . ./common/dmerror
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_dm_target error
diff --git a/tests/xfs/241 b/tests/xfs/241
index d9879788..15324939 100755
--- a/tests/xfs/241
+++ b/tests/xfs/241
@@ -20,8 +20,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "cowextsize"
diff --git a/tests/xfs/242 b/tests/xfs/242
index cf88fa47..4d3505de 100755
--- a/tests/xfs/242
+++ b/tests/xfs/242
@@ -13,8 +13,6 @@ _begin_fstest auto quick prealloc zero
 . ./common/filter
 . ./common/punch
 
-# real QA test starts here
-_supported_fs xfs
 _require_test
 
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/243 b/tests/xfs/243
index 2e537f3f..ea83a7b4 100755
--- a/tests/xfs/243
+++ b/tests/xfs/243
@@ -23,8 +23,6 @@ _begin_fstest auto quick clone punch prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_debug
 _require_scratch_reflink
 _require_scratch_delalloc
diff --git a/tests/xfs/244 b/tests/xfs/244
index 28f1328a..8a6337bd 100755
--- a/tests/xfs/244
+++ b/tests/xfs/244
@@ -21,8 +21,6 @@ _cleanup()
 	rm -f $tmp.*
 }
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_quota
 _require_scratch
 _require_projid32bit
diff --git a/tests/xfs/245 b/tests/xfs/245
index 595a5938..ac235844 100755
--- a/tests/xfs/245
+++ b/tests/xfs/245
@@ -17,8 +17,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_debug
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/246 b/tests/xfs/246
index 53e1b8b0..ce97fad5 100755
--- a/tests/xfs/246
+++ b/tests/xfs/246
@@ -12,8 +12,6 @@ _begin_fstest auto quick clone
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_debug
 _require_xfs_io_command "bmap" "-c"
 _require_scratch
diff --git a/tests/xfs/247 b/tests/xfs/247
index 593ac47b..2ca75df1 100755
--- a/tests/xfs/247
+++ b/tests/xfs/247
@@ -14,8 +14,6 @@ _begin_fstest auto quick clone
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 
 echo "Format and mount"
diff --git a/tests/xfs/248 b/tests/xfs/248
index 9b95af1d..ed0f170c 100755
--- a/tests/xfs/248
+++ b/tests/xfs/248
@@ -20,7 +20,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "cowextsize"
diff --git a/tests/xfs/249 b/tests/xfs/249
index 4febb79c..0f92bc3e 100755
--- a/tests/xfs/249
+++ b/tests/xfs/249
@@ -20,7 +20,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "cowextsize"
diff --git a/tests/xfs/250 b/tests/xfs/250
index 8af32711..f8846be6 100755
--- a/tests/xfs/250
+++ b/tests/xfs/250
@@ -21,8 +21,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_test
 _require_loop
 _require_xfs_io_command "falloc"
@@ -35,7 +33,6 @@ _filter_io()
 	sed -e '/.* ops; /d'
 }
 
-# real QA test starts here
 
 echo "*** create loop mount point"
 rmdir $LOOP_MNT 2>/dev/null
diff --git a/tests/xfs/251 b/tests/xfs/251
index 7e21b502..b2d062bb 100755
--- a/tests/xfs/251
+++ b/tests/xfs/251
@@ -22,7 +22,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "cowextsize"
diff --git a/tests/xfs/252 b/tests/xfs/252
index f167fd5a..efcf3a34 100755
--- a/tests/xfs/252
+++ b/tests/xfs/252
@@ -13,9 +13,6 @@ _begin_fstest auto quick prealloc punch fiemap
 . ./common/filter
 . ./common/punch
 
-# real QA test starts here
-_supported_fs xfs 
-
 _require_test
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "fpunch"
diff --git a/tests/xfs/253 b/tests/xfs/253
index 18c58eb8..3c927171 100755
--- a/tests/xfs/253
+++ b/tests/xfs/253
@@ -38,12 +38,10 @@ _require_test
 _require_scratch
 _xfs_setup_verify_metadump
 
-# real QA test starts here
 
 OUTPUT_DIR="${SCRATCH_MNT}/test_${seq}"
 ORPHANAGE="lost+found"
 
-_supported_fs xfs
 
 function create_file() {
 	[ $# -eq 1 ] ||		return 1
diff --git a/tests/xfs/254 b/tests/xfs/254
index f31b6651..7239ad0e 100755
--- a/tests/xfs/254
+++ b/tests/xfs/254
@@ -22,7 +22,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "cowextsize"
diff --git a/tests/xfs/255 b/tests/xfs/255
index c2eade3e..25f09cbc 100755
--- a/tests/xfs/255
+++ b/tests/xfs/255
@@ -22,7 +22,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "cowextsize"
diff --git a/tests/xfs/256 b/tests/xfs/256
index 5162e450..b1c777b6 100755
--- a/tests/xfs/256
+++ b/tests/xfs/256
@@ -22,7 +22,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "cowextsize"
diff --git a/tests/xfs/257 b/tests/xfs/257
index ae1dc98d..536792a5 100755
--- a/tests/xfs/257
+++ b/tests/xfs/257
@@ -23,7 +23,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_scratch_delalloc
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/258 b/tests/xfs/258
index 7ce7bd2e..c262ca26 100755
--- a/tests/xfs/258
+++ b/tests/xfs/258
@@ -23,7 +23,6 @@ _begin_fstest auto quick clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_scratch_reflink
 _require_scratch_delalloc
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/259 b/tests/xfs/259
index 88e2f3ee..0c8d6eb5 100755
--- a/tests/xfs/259
+++ b/tests/xfs/259
@@ -18,8 +18,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_test
 _require_loop
 _require_math
diff --git a/tests/xfs/260 b/tests/xfs/260
index a780365f..bfc98d4e 100755
--- a/tests/xfs/260
+++ b/tests/xfs/260
@@ -26,7 +26,6 @@ _cleanup()
 
 echo 'Silence is golden'
 
-_supported_fs xfs
 _require_test
 
 localfile=$TEST_DIR/$seq.$$
diff --git a/tests/xfs/261 b/tests/xfs/261
index eb8a72cd..a5b53695 100755
--- a/tests/xfs/261
+++ b/tests/xfs/261
@@ -30,10 +30,8 @@ _cleanup()
 
 echo "Silence is golden."
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 
 _require_quota
 _require_scratch
diff --git a/tests/xfs/262 b/tests/xfs/262
index a4ff6a47..ec33f3b2 100755
--- a/tests/xfs/262
+++ b/tests/xfs/262
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/fuzzy
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_command "$LDD_PROG" ldd
 _require_scrub
 _require_scratch
diff --git a/tests/xfs/263 b/tests/xfs/263
index 54e9355a..aedbc479 100755
--- a/tests/xfs/263
+++ b/tests/xfs/263
@@ -13,10 +13,8 @@ _begin_fstest auto quick quota
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 
 _require_scratch
 _require_xfs_quota
diff --git a/tests/xfs/264 b/tests/xfs/264
index 191f57d5..109fecd1 100755
--- a/tests/xfs/264
+++ b/tests/xfs/264
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmerror
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_dm_target error
 _require_fs_sysfs error/fail_at_unmount
diff --git a/tests/xfs/265 b/tests/xfs/265
index c0edb6d2..21de4c05 100755
--- a/tests/xfs/265
+++ b/tests/xfs/265
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 
diff --git a/tests/xfs/266 b/tests/xfs/266
index eeca8822..8c5cc468 100755
--- a/tests/xfs/266
+++ b/tests/xfs/266
@@ -48,8 +48,6 @@ filter_cumulative_quota_updates() {
 # Import common functions.
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 
 $XFSDUMP_PROG -h 2>&1 | grep -q -e -D
diff --git a/tests/xfs/267 b/tests/xfs/267
index 89b968be..ca1b0fa2 100755
--- a/tests/xfs/267
+++ b/tests/xfs/267
@@ -42,8 +42,6 @@ End-of-File
 . ./common/dump
 . ./common/attr
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_tape $TAPE_DEV
 _require_attrs trusted
diff --git a/tests/xfs/268 b/tests/xfs/268
index 8c991fba..0ddb40a5 100755
--- a/tests/xfs/268
+++ b/tests/xfs/268
@@ -45,8 +45,6 @@ End-of-File
 . ./common/dump
 . ./common/attr
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_tape $TAPE_DEV
 _require_attrs trusted user
diff --git a/tests/xfs/269 b/tests/xfs/269
index c1477373..63b42b9c 100755
--- a/tests/xfs/269
+++ b/tests/xfs/269
@@ -21,7 +21,6 @@ _cleanup()
 . ./common/attr
 . ./common/populate
 
-# real QA test starts here
 _require_scratch
 _require_populate_commands
 _require_test_program "attr-list-by-handle-cursor-test"
diff --git a/tests/xfs/270 b/tests/xfs/270
index 16e50803..3744df5a 100755
--- a/tests/xfs/270
+++ b/tests/xfs/270
@@ -15,8 +15,6 @@ _begin_fstest auto quick mount
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _fixed_by_kernel_commit 74ad4693b647 \
 	"xfs: fix log recovery when unknown rocompat bits are set"
 # skip fs check because superblock contains unknown ro-compat features
diff --git a/tests/xfs/271 b/tests/xfs/271
index d67ac4d6..420f4e74 100755
--- a/tests/xfs/271
+++ b/tests/xfs/271
@@ -19,8 +19,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_scratch_rmapbt
 _require_xfs_io_command "fsmap"
 
diff --git a/tests/xfs/272 b/tests/xfs/272
index c68fa9d6..b65e2fae 100755
--- a/tests/xfs/272
+++ b/tests/xfs/272
@@ -19,8 +19,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_scratch_rmapbt
 _require_xfs_io_command "fsmap"
 _require_test_program "punch-alternating"
diff --git a/tests/xfs/273 b/tests/xfs/273
index a22e9d47..d7fb80c4 100755
--- a/tests/xfs/273
+++ b/tests/xfs/273
@@ -20,8 +20,6 @@ _cleanup()
 . ./common/filter
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_populate_commands
 _require_xfs_io_command "fsmap"
diff --git a/tests/xfs/274 b/tests/xfs/274
index cd483d77..d06e7fc1 100755
--- a/tests/xfs/274
+++ b/tests/xfs/274
@@ -20,8 +20,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_xfs_scratch_rmapbt
 _require_xfs_io_command "fsmap"
diff --git a/tests/xfs/275 b/tests/xfs/275
index d22e21e9..ae0ba532 100755
--- a/tests/xfs/275
+++ b/tests/xfs/275
@@ -19,8 +19,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_logdev
 _require_scratch
 _require_xfs_io_command "fsmap"
diff --git a/tests/xfs/276 b/tests/xfs/276
index 8cc48675..f21f7a86 100755
--- a/tests/xfs/276
+++ b/tests/xfs/276
@@ -19,8 +19,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_xfs_scratch_rmapbt
 _require_xfs_io_command "fsmap"
diff --git a/tests/xfs/277 b/tests/xfs/277
index 03208ef2..5cb44c33 100755
--- a/tests/xfs/277
+++ b/tests/xfs/277
@@ -19,8 +19,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_scratch_rmapbt
 _require_xfs_io_command "fsmap"
 if [ "$USE_EXTERNAL" = "yes" ] && [ -n "$SCRATCH_LOGDEV" ]; then
diff --git a/tests/xfs/278 b/tests/xfs/278
index 4a7e3309..9a949042 100755
--- a/tests/xfs/278
+++ b/tests/xfs/278
@@ -16,8 +16,6 @@ status=0	# failure is the default!
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 
 _scratch_mkfs >$seqres.full 2>&1
diff --git a/tests/xfs/279 b/tests/xfs/279
index 9f366d1e..b3d14ddc 100755
--- a/tests/xfs/279
+++ b/tests/xfs/279
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/scsi_debug
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scsi_debug
 size=$(_small_fs_size_mb 128)
diff --git a/tests/xfs/280 b/tests/xfs/280
index 35598b2f..703825de 100755
--- a/tests/xfs/280
+++ b/tests/xfs/280
@@ -15,8 +15,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_xfs_io_command "bmap"
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/281 b/tests/xfs/281
index 6b148a94..43f6333b 100755
--- a/tests/xfs/281
+++ b/tests/xfs/281
@@ -20,8 +20,6 @@ _cleanup()
 # Import common functions.
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 _require_legacy_v2_format
 _require_scratch
 _scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed"
diff --git a/tests/xfs/282 b/tests/xfs/282
index 50303b08..4a9c53db 100755
--- a/tests/xfs/282
+++ b/tests/xfs/282
@@ -22,8 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 _require_legacy_v2_format
 _require_scratch
 _scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed"
diff --git a/tests/xfs/283 b/tests/xfs/283
index 59ea5f3b..8124807f 100755
--- a/tests/xfs/283
+++ b/tests/xfs/283
@@ -22,8 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/dump
 
-# real QA test starts here
-_supported_fs xfs
 _require_legacy_v2_format
 _require_scratch
 _scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed"
diff --git a/tests/xfs/284 b/tests/xfs/284
index 443c3757..91c17690 100755
--- a/tests/xfs/284
+++ b/tests/xfs/284
@@ -22,8 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_command "$XFS_MDRESTORE_PROG" "xfs_mdrestore"
 _require_xfs_copy
 _require_test
diff --git a/tests/xfs/285 b/tests/xfs/285
index 0056baeb..909db488 100755
--- a/tests/xfs/285
+++ b/tests/xfs/285
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/286 b/tests/xfs/286
index 0f61a924..7743d037 100755
--- a/tests/xfs/286
+++ b/tests/xfs/286
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/287 b/tests/xfs/287
index 31bbf0d7..3d6800a9 100755
--- a/tests/xfs/287
+++ b/tests/xfs/287
@@ -29,8 +29,6 @@ _print_projid()
 		-c "print core.projid_hi"
 }
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_quota
 _require_scratch
 _require_projid32bit
diff --git a/tests/xfs/288 b/tests/xfs/288
index 60fb9360..28ff37eb 100755
--- a/tests/xfs/288
+++ b/tests/xfs/288
@@ -15,7 +15,6 @@ _begin_fstest auto quick repair fuzzers attr
 . ./common/attr
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_scratch
 _require_attrs
 
diff --git a/tests/xfs/289 b/tests/xfs/289
index c722deff..cf0f2883 100755
--- a/tests/xfs/289
+++ b/tests/xfs/289
@@ -24,10 +24,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_test
 _require_loop
 
diff --git a/tests/xfs/290 b/tests/xfs/290
index e41a478d..d28393d0 100755
--- a/tests/xfs/290
+++ b/tests/xfs/290
@@ -18,10 +18,8 @@ _begin_fstest auto rw prealloc quick ioctl zero
 . ./common/filter
 . ./common/punch
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 
 _require_test
 _require_xfs_io_command "zero"
diff --git a/tests/xfs/291 b/tests/xfs/291
index 2bd94d7b..831c50d7 100755
--- a/tests/xfs/291
+++ b/tests/xfs/291
@@ -21,11 +21,9 @@ _cleanup()
 . ./common/filter
 . ./common/metadump
 
-_supported_fs xfs
 _require_command "$XFS_MDRESTORE_PROG" "xfs_mdrestore"
 _xfs_setup_verify_metadump
 
-# real QA test starts here
 _require_scratch
 logblks=$(_scratch_find_xfs_min_logblocks -n size=16k -d size=133m)
 _scratch_mkfs_xfs -n size=16k -l size=${logblks}b -d size=133m >> $seqres.full 2>&1
diff --git a/tests/xfs/292 b/tests/xfs/292
index cf501571..cdb60879 100755
--- a/tests/xfs/292
+++ b/tests/xfs/292
@@ -13,10 +13,8 @@ _begin_fstest auto mkfs quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_test
 
 fsfile=$TEST_DIR/fsfile.$seq
diff --git a/tests/xfs/293 b/tests/xfs/293
index 7a17eb81..3e887f1c 100755
--- a/tests/xfs/293
+++ b/tests/xfs/293
@@ -12,10 +12,8 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 
 _require_command "$MAN_PROG" man
 
diff --git a/tests/xfs/294 b/tests/xfs/294
index d381e2c8..dd2166a7 100755
--- a/tests/xfs/294
+++ b/tests/xfs/294
@@ -19,10 +19,8 @@ _begin_fstest auto dir metadata prealloc punch
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_scratch
 _require_test_program "punch-alternating"
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/295 b/tests/xfs/295
index aad3c899..5ffda124 100755
--- a/tests/xfs/295
+++ b/tests/xfs/295
@@ -13,10 +13,8 @@ _begin_fstest auto logprint quick
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_scratch
 _require_attrs
 
diff --git a/tests/xfs/296 b/tests/xfs/296
index efd303e2..befbf9df 100755
--- a/tests/xfs/296
+++ b/tests/xfs/296
@@ -21,10 +21,8 @@ _cleanup()
 . ./common/filter
 . ./common/dump
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_scratch
 _require_command "$SETCAP_PROG" setcap
 _require_command "$GETCAP_PROG" getcap
diff --git a/tests/xfs/297 b/tests/xfs/297
index 1d101876..2c5b03c5 100755
--- a/tests/xfs/297
+++ b/tests/xfs/297
@@ -25,8 +25,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _require_freeze
diff --git a/tests/xfs/298 b/tests/xfs/298
index b0153ebf..22083527 100755
--- a/tests/xfs/298
+++ b/tests/xfs/298
@@ -14,11 +14,9 @@ _begin_fstest auto attr symlink quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate. This is a XFS specific bug. xfs_db also limits
 # this test to xfs
-_supported_fs xfs
 
 _require_scratch
 
diff --git a/tests/xfs/299 b/tests/xfs/299
index 1df1988a..710eb89c 100755
--- a/tests/xfs/299
+++ b/tests/xfs/299
@@ -23,8 +23,6 @@ _cleanup()
 	rm -f $tmp.*
 }
 
-# real QA test starts here
-_supported_fs xfs
 
 cp /dev/null $seqres.full
 chmod a+rwx $seqres.full	# arbitrary users will write here
diff --git a/tests/xfs/300 b/tests/xfs/300
index e21ea2e3..c0b713f0 100755
--- a/tests/xfs/300
+++ b/tests/xfs/300
@@ -15,9 +15,7 @@ _begin_fstest auto fsr
 _require_scratch
 _require_xfs_nocrc
 
-# real QA test starts here
 
-_supported_fs xfs
 
 getenforce | grep -q "Enforcing\|Permissive" || _notrun "SELinux not enabled"
 [ "$XFS_FSR_PROG" = "" ] && _notrun "xfs_fsr not found"
diff --git a/tests/xfs/301 b/tests/xfs/301
index 71ec1420..986baf29 100755
--- a/tests/xfs/301
+++ b/tests/xfs/301
@@ -22,10 +22,8 @@ _cleanup()
 . ./common/dump
 . ./common/attr
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_scratch
 _scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed"
 _scratch_mount
diff --git a/tests/xfs/302 b/tests/xfs/302
index 2e16890c..525a72ff 100755
--- a/tests/xfs/302
+++ b/tests/xfs/302
@@ -21,10 +21,8 @@ _cleanup()
 . ./common/filter
 . ./common/dump
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_scratch
 _scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed"
 _scratch_mount
diff --git a/tests/xfs/303 b/tests/xfs/303
index 6aafae85..95be4b02 100755
--- a/tests/xfs/303
+++ b/tests/xfs/303
@@ -13,8 +13,6 @@ _begin_fstest auto quick quota
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 
 echo "Silence is golden"
 
diff --git a/tests/xfs/304 b/tests/xfs/304
index 0ee6dad6..565d99f2 100755
--- a/tests/xfs/304
+++ b/tests/xfs/304
@@ -15,7 +15,6 @@ _begin_fstest auto quick quota
 . ./common/quota
 
 # Modify as appropriate.
-_supported_fs xfs
 
 _require_scratch
 _require_xfs_quota
diff --git a/tests/xfs/305 b/tests/xfs/305
index e76dfdec..0ad3ef7f 100755
--- a/tests/xfs/305
+++ b/tests/xfs/305
@@ -15,7 +15,6 @@ _begin_fstest auto quota
 . ./common/quota
 
 # Modify as appropriate.
-_supported_fs xfs
 
 _require_scratch
 _require_xfs_quota
diff --git a/tests/xfs/306 b/tests/xfs/306
index 152971cf..e21a5622 100755
--- a/tests/xfs/306
+++ b/tests/xfs/306
@@ -18,7 +18,6 @@ _begin_fstest auto quick punch
 # Import common functions.
 
 # Modify as appropriate.
-_supported_fs xfs
 
 _require_scratch_nocheck	# check complains about single AG fs
 _require_xfs_io_command "fpunch"
diff --git a/tests/xfs/307 b/tests/xfs/307
index f3c970fa..25d15a9c 100755
--- a/tests/xfs/307
+++ b/tests/xfs/307
@@ -15,8 +15,6 @@ _begin_fstest auto quick clone
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 
 echo "Format"
diff --git a/tests/xfs/308 b/tests/xfs/308
index 6da6622e..813c4d8d 100755
--- a/tests/xfs/308
+++ b/tests/xfs/308
@@ -15,8 +15,6 @@ _begin_fstest auto quick clone
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 
 echo "Format"
diff --git a/tests/xfs/309 b/tests/xfs/309
index 3e909509..63ca0a67 100755
--- a/tests/xfs/309
+++ b/tests/xfs/309
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 
diff --git a/tests/xfs/310 b/tests/xfs/310
index edd7d0d7..eb310d8c 100755
--- a/tests/xfs/310
+++ b/tests/xfs/310
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmhugedisk
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_scratch_rmapbt
 _require_scratch_nocheck
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/311 b/tests/xfs/311
index d5e3afbf..8b806fc2 100755
--- a/tests/xfs/311
+++ b/tests/xfs/311
@@ -26,7 +26,6 @@ _cleanup()
 . ./common/dmdelay
 
 # Modify as appropriate.
-_supported_fs xfs
 
 _require_scratch
 _require_dm_target delay
diff --git a/tests/xfs/312 b/tests/xfs/312
index cb232bdf..6e47d442 100755
--- a/tests/xfs/312
+++ b/tests/xfs/312
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/reflink
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_cp_reflink
 _require_scratch_reflink
 _require_xfs_io_command "fpunch"
diff --git a/tests/xfs/313 b/tests/xfs/313
index 21e36982..d0c77db8 100755
--- a/tests/xfs/313
+++ b/tests/xfs/313
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/reflink
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_cp_reflink
 _require_scratch_reflink
 _require_xfs_io_command "fpunch"
diff --git a/tests/xfs/314 b/tests/xfs/314
index 9ac311d0..07596e00 100755
--- a/tests/xfs/314
+++ b/tests/xfs/314
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/reflink
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_cp_reflink
 _require_scratch_reflink
 _require_xfs_scratch_rmapbt
diff --git a/tests/xfs/315 b/tests/xfs/315
index 9f6b39c8..f6c346e1 100755
--- a/tests/xfs/315
+++ b/tests/xfs/315
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/reflink
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_cp_reflink
 _require_scratch_reflink
 _require_error_injection
diff --git a/tests/xfs/316 b/tests/xfs/316
index 7f7bdd64..63711ed4 100755
--- a/tests/xfs/316
+++ b/tests/xfs/316
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/reflink
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_cp_reflink
 _require_scratch_reflink
 _require_error_injection
diff --git a/tests/xfs/317 b/tests/xfs/317
index 1ca2672d..192107f5 100755
--- a/tests/xfs/317
+++ b/tests/xfs/317
@@ -21,8 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_scratch_rmapbt
 _require_error_injection
diff --git a/tests/xfs/318 b/tests/xfs/318
index 5798f9a3..590d268e 100755
--- a/tests/xfs/318
+++ b/tests/xfs/318
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_error_injection
 _require_xfs_io_error_injection "rmap_finish_one"
diff --git a/tests/xfs/319 b/tests/xfs/319
index d64651fb..45b958d8 100755
--- a/tests/xfs/319
+++ b/tests/xfs/319
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/reflink
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_cp_reflink
 _require_scratch_reflink
 _require_xfs_io_error_injection "bmap_finish_one"
diff --git a/tests/xfs/320 b/tests/xfs/320
index d22d76d9..f7e4949a 100755
--- a/tests/xfs/320
+++ b/tests/xfs/320
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/reflink
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_cp_reflink
 _require_scratch_reflink
 _require_xfs_io_error_injection "bmap_finish_one"
diff --git a/tests/xfs/321 b/tests/xfs/321
index 06a34347..a09e4a8c 100755
--- a/tests/xfs/321
+++ b/tests/xfs/321
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/reflink
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_cp_reflink
 _require_scratch_reflink
 _require_xfs_io_error_injection "refcount_finish_one"
diff --git a/tests/xfs/322 b/tests/xfs/322
index a2c3720e..4cb36a51 100755
--- a/tests/xfs/322
+++ b/tests/xfs/322
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/reflink
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_cp_reflink
 _require_scratch_reflink
 _require_xfs_scratch_rmapbt
diff --git a/tests/xfs/323 b/tests/xfs/323
index 66737da0..0579d4a7 100755
--- a/tests/xfs/323
+++ b/tests/xfs/323
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/reflink
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_cp_reflink
 _require_scratch_reflink
 _require_xfs_io_error_injection "free_extent"
diff --git a/tests/xfs/324 b/tests/xfs/324
index 57cab86a..485b1621 100755
--- a/tests/xfs/324
+++ b/tests/xfs/324
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/reflink
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_cp_reflink
 _require_scratch_reflink
 _require_error_injection
diff --git a/tests/xfs/325 b/tests/xfs/325
index 43fb09a6..2387b8d8 100755
--- a/tests/xfs/325
+++ b/tests/xfs/325
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/reflink
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_cp_reflink
 _require_scratch_reflink
 _require_error_injection
diff --git a/tests/xfs/326 b/tests/xfs/326
index ac620fc4..5d7afe9b 100755
--- a/tests/xfs/326
+++ b/tests/xfs/326
@@ -25,8 +25,6 @@ _cleanup()
 . ./common/reflink
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_cp_reflink
 _require_scratch_reflink
 _require_xfs_io_command "cowextsize"
diff --git a/tests/xfs/327 b/tests/xfs/327
index 25855f77..44728c11 100755
--- a/tests/xfs/327
+++ b/tests/xfs/327
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_cp_reflink
 _require_scratch_reflink
 
diff --git a/tests/xfs/328 b/tests/xfs/328
index 30e364eb..08591826 100755
--- a/tests/xfs/328
+++ b/tests/xfs/328
@@ -14,8 +14,6 @@ _begin_fstest auto quick clone fsr prealloc
 . ./common/attr
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_test_program "punch-alternating"
diff --git a/tests/xfs/329 b/tests/xfs/329
index 12b7c608..ed39ebc9 100755
--- a/tests/xfs/329
+++ b/tests/xfs/329
@@ -15,8 +15,6 @@ _begin_fstest auto quick clone fsr
 . ./common/reflink
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_command "$XFS_FSR_PROG" "xfs_fsr"
diff --git a/tests/xfs/330 b/tests/xfs/330
index c6e74e67..d239a640 100755
--- a/tests/xfs/330
+++ b/tests/xfs/330
@@ -15,8 +15,6 @@ _begin_fstest auto quick clone fsr quota prealloc
 . ./common/reflink
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "falloc" # used in FSR
diff --git a/tests/xfs/331 b/tests/xfs/331
index 2332533f..7c9a1e7e 100755
--- a/tests/xfs/331
+++ b/tests/xfs/331
@@ -13,8 +13,6 @@ _begin_fstest auto quick rmap clone prealloc
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_scratch_rmapbt
 _require_scratch_reflink
diff --git a/tests/xfs/332 b/tests/xfs/332
index a2d37ee9..93c94bcd 100755
--- a/tests/xfs/332
+++ b/tests/xfs/332
@@ -13,8 +13,6 @@ _begin_fstest auto quick rmap clone collapse punch insert zero prealloc
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_scratch_rmapbt
 _require_command "$XFS_DB_PROG" "xfs_db"
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/333 b/tests/xfs/333
index 728c5184..f68f2f01 100755
--- a/tests/xfs/333
+++ b/tests/xfs/333
@@ -12,8 +12,6 @@ _begin_fstest auto quick rmap realtime
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_scratch_rmapbt
 _disable_dmesg_check
 
diff --git a/tests/xfs/334 b/tests/xfs/334
index cf7b104a..e15e039b 100755
--- a/tests/xfs/334
+++ b/tests/xfs/334
@@ -12,8 +12,6 @@ _begin_fstest auto quick rmap realtime
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_xfs_scratch_rmapbt
 
diff --git a/tests/xfs/335 b/tests/xfs/335
index 79d07116..bbf00aa8 100755
--- a/tests/xfs/335
+++ b/tests/xfs/335
@@ -12,8 +12,6 @@ _begin_fstest auto rmap realtime prealloc
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_xfs_scratch_rmapbt
 _require_test_program "punch-alternating"
diff --git a/tests/xfs/336 b/tests/xfs/336
index 3c30f1a4..3f85429e 100755
--- a/tests/xfs/336
+++ b/tests/xfs/336
@@ -19,8 +19,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_command "$XFS_MDRESTORE_PROG" "xfs_mdrestore"
 _require_realtime
 _require_xfs_scratch_rmapbt
diff --git a/tests/xfs/337 b/tests/xfs/337
index f74baae9..ca232c1c 100755
--- a/tests/xfs/337
+++ b/tests/xfs/337
@@ -12,8 +12,6 @@ _begin_fstest fuzzers rmap realtime prealloc
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_xfs_scratch_rmapbt
 _require_test_program "punch-alternating"
diff --git a/tests/xfs/338 b/tests/xfs/338
index 9f36150c..1bdec2bf 100755
--- a/tests/xfs/338
+++ b/tests/xfs/338
@@ -12,8 +12,6 @@ _begin_fstest auto quick rmap realtime
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_xfs_scratch_rmapbt
 
diff --git a/tests/xfs/339 b/tests/xfs/339
index 3e0b4d97..90faac78 100755
--- a/tests/xfs/339
+++ b/tests/xfs/339
@@ -12,8 +12,6 @@ _begin_fstest auto quick rmap realtime
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_xfs_scratch_rmapbt
 
diff --git a/tests/xfs/340 b/tests/xfs/340
index 2c001451..58c4176a 100755
--- a/tests/xfs/340
+++ b/tests/xfs/340
@@ -12,8 +12,6 @@ _begin_fstest auto quick rmap realtime
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_xfs_scratch_rmapbt
 
diff --git a/tests/xfs/341 b/tests/xfs/341
index 1f734c90..424deb3e 100755
--- a/tests/xfs/341
+++ b/tests/xfs/341
@@ -12,8 +12,6 @@ _begin_fstest auto quick rmap realtime prealloc
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_xfs_scratch_rmapbt
 _require_test_program "punch-alternating"
diff --git a/tests/xfs/342 b/tests/xfs/342
index 538c8987..9360ddbe 100755
--- a/tests/xfs/342
+++ b/tests/xfs/342
@@ -12,8 +12,6 @@ _begin_fstest auto quick rmap realtime prealloc
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_xfs_scratch_rmapbt
 _require_test_program "punch-alternating"
diff --git a/tests/xfs/343 b/tests/xfs/343
index bffcc7d9..a5834cab 100755
--- a/tests/xfs/343
+++ b/tests/xfs/343
@@ -12,8 +12,6 @@ _begin_fstest auto quick rmap collapse punch insert zero realtime prealloc
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_xfs_scratch_rmapbt
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/344 b/tests/xfs/344
index adb6627e..501cae67 100755
--- a/tests/xfs/344
+++ b/tests/xfs/344
@@ -17,8 +17,6 @@ _begin_fstest auto quick clone fiemap unshare
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fiemap"
diff --git a/tests/xfs/345 b/tests/xfs/345
index 36625e83..d0e4469e 100755
--- a/tests/xfs/345
+++ b/tests/xfs/345
@@ -16,8 +16,6 @@ _begin_fstest auto quick clone fiemap unshare
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fiemap"
diff --git a/tests/xfs/346 b/tests/xfs/346
index 9ce58ab8..875643bc 100755
--- a/tests/xfs/346
+++ b/tests/xfs/346
@@ -17,8 +17,6 @@ _begin_fstest auto quick clone fiemap unshare
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fiemap"
diff --git a/tests/xfs/347 b/tests/xfs/347
index 1867c08c..f9c296a8 100755
--- a/tests/xfs/347
+++ b/tests/xfs/347
@@ -17,8 +17,6 @@ _begin_fstest auto quick clone fiemap unshare
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "fiemap"
diff --git a/tests/xfs/348 b/tests/xfs/348
index d1645d94..3502605c 100755
--- a/tests/xfs/348
+++ b/tests/xfs/348
@@ -16,8 +16,6 @@ _begin_fstest auto quick fuzzers repair
 . ./common/filter
 . ./common/repair
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 
 # This test will corrupt fs intentionally, so there will be WARNINGs
diff --git a/tests/xfs/349 b/tests/xfs/349
index 76745097..3937b4fd 100755
--- a/tests/xfs/349
+++ b/tests/xfs/349
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _require_scrub
diff --git a/tests/xfs/350 b/tests/xfs/350
index aeb99578..4e618f41 100755
--- a/tests/xfs/350
+++ b/tests/xfs/350
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/351 b/tests/xfs/351
index 74765aea..d03cc331 100755
--- a/tests/xfs/351
+++ b/tests/xfs/351
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/352 b/tests/xfs/352
index 49bd85b2..8f56a2b8 100755
--- a/tests/xfs/352
+++ b/tests/xfs/352
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/353 b/tests/xfs/353
index b58dc9cb..017e3ce2 100755
--- a/tests/xfs/353
+++ b/tests/xfs/353
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/354 b/tests/xfs/354
index 8abf527e..625c4e95 100755
--- a/tests/xfs/354
+++ b/tests/xfs/354
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/355 b/tests/xfs/355
index 2d552a59..f7377bd8 100755
--- a/tests/xfs/355
+++ b/tests/xfs/355
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/356 b/tests/xfs/356
index 9d5ff251..3529425e 100755
--- a/tests/xfs/356
+++ b/tests/xfs/356
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/357 b/tests/xfs/357
index 25af8624..d21b9d32 100755
--- a/tests/xfs/357
+++ b/tests/xfs/357
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/358 b/tests/xfs/358
index 92180e51..11b29c5c 100755
--- a/tests/xfs/358
+++ b/tests/xfs/358
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/359 b/tests/xfs/359
index 0498aacc..8d0da3d1 100755
--- a/tests/xfs/359
+++ b/tests/xfs/359
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/360 b/tests/xfs/360
index c34f4554..7f5348a1 100755
--- a/tests/xfs/360
+++ b/tests/xfs/360
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/361 b/tests/xfs/361
index 22b1af4e..46f84888 100755
--- a/tests/xfs/361
+++ b/tests/xfs/361
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/362 b/tests/xfs/362
index 51727edc..0b54fc58 100755
--- a/tests/xfs/362
+++ b/tests/xfs/362
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/363 b/tests/xfs/363
index 8a62c1c8..9a5e893c 100755
--- a/tests/xfs/363
+++ b/tests/xfs/363
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/364 b/tests/xfs/364
index 984ecdaf..002b4765 100755
--- a/tests/xfs/364
+++ b/tests/xfs/364
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/365 b/tests/xfs/365
index e4325c35..7a7bb51a 100755
--- a/tests/xfs/365
+++ b/tests/xfs/365
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/366 b/tests/xfs/366
index 8a52d21a..e902d1d3 100755
--- a/tests/xfs/366
+++ b/tests/xfs/366
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _require_xfs_finobt
 
diff --git a/tests/xfs/367 b/tests/xfs/367
index d9d07faa..5a357bc6 100755
--- a/tests/xfs/367
+++ b/tests/xfs/367
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _require_xfs_finobt
 
diff --git a/tests/xfs/368 b/tests/xfs/368
index 83499827..3de32a0c 100755
--- a/tests/xfs/368
+++ b/tests/xfs/368
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_scratch_rmapbt
 _require_scratch_xfs_fuzz_fields
 
diff --git a/tests/xfs/369 b/tests/xfs/369
index 3236b50e..398ff9e9 100755
--- a/tests/xfs/369
+++ b/tests/xfs/369
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_scratch_rmapbt
 _require_scratch_xfs_fuzz_fields
 
diff --git a/tests/xfs/370 b/tests/xfs/370
index 891d5e25..ff19505b 100755
--- a/tests/xfs/370
+++ b/tests/xfs/370
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_scratch_rmapbt
 _require_scratch_xfs_fuzz_fields
 
diff --git a/tests/xfs/371 b/tests/xfs/371
index f7a336b1..37850c08 100755
--- a/tests/xfs/371
+++ b/tests/xfs/371
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_scratch_rmapbt
 _require_scratch_xfs_fuzz_fields
 
diff --git a/tests/xfs/372 b/tests/xfs/372
index 22503225..01ac0e2b 100755
--- a/tests/xfs/372
+++ b/tests/xfs/372
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/fuzzy
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_scratch_xfs_fuzz_fields
 
diff --git a/tests/xfs/373 b/tests/xfs/373
index e0c20044..6759d78f 100755
--- a/tests/xfs/373
+++ b/tests/xfs/373
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/fuzzy
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_scratch_xfs_fuzz_fields
 
diff --git a/tests/xfs/374 b/tests/xfs/374
index e3af7e4b..807a8cd0 100755
--- a/tests/xfs/374
+++ b/tests/xfs/374
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/375 b/tests/xfs/375
index cb0efefe..6518ac3c 100755
--- a/tests/xfs/375
+++ b/tests/xfs/375
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/376 b/tests/xfs/376
index 2470e1d9..dfca8f0b 100755
--- a/tests/xfs/376
+++ b/tests/xfs/376
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/377 b/tests/xfs/377
index eabb03fb..6be8c45b 100755
--- a/tests/xfs/377
+++ b/tests/xfs/377
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/378 b/tests/xfs/378
index c1fb40e6..94c0dcdb 100755
--- a/tests/xfs/378
+++ b/tests/xfs/378
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/379 b/tests/xfs/379
index 1b5bfa41..b7e89fce 100755
--- a/tests/xfs/379
+++ b/tests/xfs/379
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/380 b/tests/xfs/380
index aba8441c..84715b09 100755
--- a/tests/xfs/380
+++ b/tests/xfs/380
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/381 b/tests/xfs/381
index ea0c44db..aa5fb914 100755
--- a/tests/xfs/381
+++ b/tests/xfs/381
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/382 b/tests/xfs/382
index 6cbc2bcf..ee7a1820 100755
--- a/tests/xfs/382
+++ b/tests/xfs/382
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/383 b/tests/xfs/383
index a7875998..be619100 100755
--- a/tests/xfs/383
+++ b/tests/xfs/383
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/384 b/tests/xfs/384
index 409dbbf4..490701e4 100755
--- a/tests/xfs/384
+++ b/tests/xfs/384
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/385 b/tests/xfs/385
index 2133d296..63a7649e 100755
--- a/tests/xfs/385
+++ b/tests/xfs/385
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/386 b/tests/xfs/386
index edeaa9a0..f8f5798c 100755
--- a/tests/xfs/386
+++ b/tests/xfs/386
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/387 b/tests/xfs/387
index cd46f6fc..805e2703 100755
--- a/tests/xfs/387
+++ b/tests/xfs/387
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/388 b/tests/xfs/388
index 42e780c8..504f786f 100755
--- a/tests/xfs/388
+++ b/tests/xfs/388
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/389 b/tests/xfs/389
index 258c5ef0..f40bb6da 100755
--- a/tests/xfs/389
+++ b/tests/xfs/389
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/390 b/tests/xfs/390
index c3fecd44..c272fd89 100755
--- a/tests/xfs/390
+++ b/tests/xfs/390
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/391 b/tests/xfs/391
index f5b90467..400ec31b 100755
--- a/tests/xfs/391
+++ b/tests/xfs/391
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/392 b/tests/xfs/392
index 9044da0c..8eb7b962 100755
--- a/tests/xfs/392
+++ b/tests/xfs/392
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/393 b/tests/xfs/393
index 700691e1..e18572b5 100755
--- a/tests/xfs/393
+++ b/tests/xfs/393
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/394 b/tests/xfs/394
index c9eabcd8..692d45f5 100755
--- a/tests/xfs/394
+++ b/tests/xfs/394
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/395 b/tests/xfs/395
index dcbfb51e..5dac51cf 100755
--- a/tests/xfs/395
+++ b/tests/xfs/395
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/396 b/tests/xfs/396
index 3209967d..9b2a9a06 100755
--- a/tests/xfs/396
+++ b/tests/xfs/396
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/397 b/tests/xfs/397
index ebfd7f63..878929e2 100755
--- a/tests/xfs/397
+++ b/tests/xfs/397
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/398 b/tests/xfs/398
index 08573f36..d9826725 100755
--- a/tests/xfs/398
+++ b/tests/xfs/398
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/399 b/tests/xfs/399
index 0a5a0bd5..3a2ea05a 100755
--- a/tests/xfs/399
+++ b/tests/xfs/399
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/400 b/tests/xfs/400
index f85c04cc..7191cff0 100755
--- a/tests/xfs/400
+++ b/tests/xfs/400
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/401 b/tests/xfs/401
index 4c19665e..0e95a7df 100755
--- a/tests/xfs/401
+++ b/tests/xfs/401
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/402 b/tests/xfs/402
index f42b6465..0c2174e2 100755
--- a/tests/xfs/402
+++ b/tests/xfs/402
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/403 b/tests/xfs/403
index 8e7ab07b..b9276c8d 100755
--- a/tests/xfs/403
+++ b/tests/xfs/403
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/404 b/tests/xfs/404
index c0f5c917..2901b015 100755
--- a/tests/xfs/404
+++ b/tests/xfs/404
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/405 b/tests/xfs/405
index e33eb8f1..76f5afb7 100755
--- a/tests/xfs/405
+++ b/tests/xfs/405
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/406 b/tests/xfs/406
index 78db1807..444dbd72 100755
--- a/tests/xfs/406
+++ b/tests/xfs/406
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_xfs_scratch_rmapbt
 _require_scratch_xfs_fuzz_fields
diff --git a/tests/xfs/407 b/tests/xfs/407
index 5a43775b..ee67a40f 100755
--- a/tests/xfs/407
+++ b/tests/xfs/407
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_xfs_scratch_rmapbt
 _require_scratch_xfs_fuzz_fields
diff --git a/tests/xfs/408 b/tests/xfs/408
index 8049d6be..55b061ed 100755
--- a/tests/xfs/408
+++ b/tests/xfs/408
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_xfs_scratch_rmapbt
 _require_scratch_xfs_fuzz_fields
diff --git a/tests/xfs/409 b/tests/xfs/409
index adac95fe..12d7c5cd 100755
--- a/tests/xfs/409
+++ b/tests/xfs/409
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_xfs_scratch_rmapbt
 _require_scratch_xfs_fuzz_fields
diff --git a/tests/xfs/410 b/tests/xfs/410
index 388ed7d1..4155e03b 100755
--- a/tests/xfs/410
+++ b/tests/xfs/410
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/fuzzy
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_scratch_xfs_fuzz_fields
 
diff --git a/tests/xfs/411 b/tests/xfs/411
index a9fc25ce..93af836b 100755
--- a/tests/xfs/411
+++ b/tests/xfs/411
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/fuzzy
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_scratch_xfs_fuzz_fields
 
diff --git a/tests/xfs/412 b/tests/xfs/412
index 8b89dd6a..2119282f 100755
--- a/tests/xfs/412
+++ b/tests/xfs/412
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/413 b/tests/xfs/413
index c4b525c2..5a36f29c 100755
--- a/tests/xfs/413
+++ b/tests/xfs/413
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/414 b/tests/xfs/414
index ee5db9c8..c92c6eb0 100755
--- a/tests/xfs/414
+++ b/tests/xfs/414
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/415 b/tests/xfs/415
index ab757629..2d5816d0 100755
--- a/tests/xfs/415
+++ b/tests/xfs/415
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/416 b/tests/xfs/416
index 3e213068..2ee0e751 100755
--- a/tests/xfs/416
+++ b/tests/xfs/416
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/417 b/tests/xfs/417
index 3d09ec7e..30501ea3 100755
--- a/tests/xfs/417
+++ b/tests/xfs/417
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/418 b/tests/xfs/418
index c4ba385c..dd7b70a4 100755
--- a/tests/xfs/418
+++ b/tests/xfs/418
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/419 b/tests/xfs/419
index bba42265..b9cd21fa 100755
--- a/tests/xfs/419
+++ b/tests/xfs/419
@@ -25,8 +25,6 @@ _begin_fstest auto quick realtime mkfs
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_scratch
 
diff --git a/tests/xfs/420 b/tests/xfs/420
index d38772c9..038682ef 100755
--- a/tests/xfs/420
+++ b/tests/xfs/420
@@ -36,8 +36,6 @@ _begin_fstest auto quick clone punch seek
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "cowextsize"
diff --git a/tests/xfs/421 b/tests/xfs/421
index 027ae47c..ab565e1f 100755
--- a/tests/xfs/421
+++ b/tests/xfs/421
@@ -36,8 +36,6 @@ _begin_fstest auto quick clone punch seek
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "cowextsize"
diff --git a/tests/xfs/422 b/tests/xfs/422
index 339f1297..1043d419 100755
--- a/tests/xfs/422
+++ b/tests/xfs/422
@@ -21,8 +21,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/fuzzy
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/423 b/tests/xfs/423
index a94118cc..1fbf500d 100755
--- a/tests/xfs/423
+++ b/tests/xfs/423
@@ -19,8 +19,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/fuzzy
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_test_program "punch-alternating"
 _require_xfs_io_command "scrub"
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/424 b/tests/xfs/424
index c8d522fd..71d48bec 100755
--- a/tests/xfs/424
+++ b/tests/xfs/424
@@ -29,7 +29,6 @@ filter_dbval()
 . ./common/filter
 
 # Modify as appropriate
-_supported_fs xfs
 
 # Since we have an open-coded mkfs call, disable the external devices and
 # don't let the post-check fsck actually run since it'll trip over us not
@@ -40,7 +39,6 @@ export SCRATCH_RTDEV=
 
 echo "Silence is golden."
 
-# real QA test starts here
 
 # for different sector sizes, ensure no CRC errors are falsely reported.
 
diff --git a/tests/xfs/425 b/tests/xfs/425
index 5275e594..9ca10c66 100755
--- a/tests/xfs/425
+++ b/tests/xfs/425
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/fuzzy
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _require_quota
 
diff --git a/tests/xfs/426 b/tests/xfs/426
index 06f0f44b..2cda865a 100755
--- a/tests/xfs/426
+++ b/tests/xfs/426
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/fuzzy
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _require_quota
 
diff --git a/tests/xfs/427 b/tests/xfs/427
index 327cddd8..539cb4f1 100755
--- a/tests/xfs/427
+++ b/tests/xfs/427
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/fuzzy
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _require_quota
 
diff --git a/tests/xfs/428 b/tests/xfs/428
index 80b05b84..31694e18 100755
--- a/tests/xfs/428
+++ b/tests/xfs/428
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/fuzzy
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _require_quota
 
diff --git a/tests/xfs/429 b/tests/xfs/429
index 5fa3b2ce..b0b5fa57 100755
--- a/tests/xfs/429
+++ b/tests/xfs/429
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/fuzzy
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _require_quota
 
diff --git a/tests/xfs/430 b/tests/xfs/430
index 6f5c772d..6331f82e 100755
--- a/tests/xfs/430
+++ b/tests/xfs/430
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/fuzzy
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _require_quota
 
diff --git a/tests/xfs/431 b/tests/xfs/431
index 68c57525..9764d243 100755
--- a/tests/xfs/431
+++ b/tests/xfs/431
@@ -17,10 +17,8 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_xfs_io_command "chattr" "t"
 _require_xfs_io_command "fsync"
 _require_xfs_io_command "pwrite"
diff --git a/tests/xfs/432 b/tests/xfs/432
index 4eae92e7..0e531e96 100755
--- a/tests/xfs/432
+++ b/tests/xfs/432
@@ -28,8 +28,6 @@ _cleanup()
 . ./common/filter
 . ./common/metadump
 
-# real QA test starts here
-_supported_fs xfs
 _require_command "$XFS_MDRESTORE_PROG" "xfs_mdrestore"
 _require_scratch
 _xfs_setup_verify_metadump
diff --git a/tests/xfs/433 b/tests/xfs/433
index 54686e38..ca8ef377 100755
--- a/tests/xfs/433
+++ b/tests/xfs/433
@@ -24,10 +24,8 @@ _begin_fstest auto quick attr
 . ./common/attr
 . ./common/inject
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_xfs_io_error_injection buf_lru_ref
 _require_scratch
 _require_attrs
diff --git a/tests/xfs/434 b/tests/xfs/434
index ca80e127..c5122884 100755
--- a/tests/xfs/434
+++ b/tests/xfs/434
@@ -28,8 +28,6 @@ _begin_fstest auto quick clone fsr
 . ./common/quota
 . ./common/module
 
-# real QA test starts here
-_supported_fs xfs
 _require_quota
 _require_scratch_reflink
 _require_cp_reflink
diff --git a/tests/xfs/435 b/tests/xfs/435
index b52e9287..0bb5675e 100755
--- a/tests/xfs/435
+++ b/tests/xfs/435
@@ -22,8 +22,6 @@ _begin_fstest auto quick clone
 . ./common/quota
 . ./common/module
 
-# real QA test starts here
-_supported_fs xfs
 _require_quota
 _require_scratch_reflink
 _require_cp_reflink
diff --git a/tests/xfs/436 b/tests/xfs/436
index 02bcd669..1f7eb329 100755
--- a/tests/xfs/436
+++ b/tests/xfs/436
@@ -25,8 +25,6 @@ _begin_fstest auto quick clone fsr
 . ./common/inject
 . ./common/module
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command falloc # fsr requires support for preallocation
diff --git a/tests/xfs/438 b/tests/xfs/438
index 0425c5b1..0239778c 100755
--- a/tests/xfs/438
+++ b/tests/xfs/438
@@ -88,7 +88,6 @@ make_xfs_scratch_flakey_table()
 . ./common/dmflakey
 . ./common/quota
 
-_supported_fs xfs
 
 # due to the injection of write IO error, the fs will be inconsistent
 _require_scratch_nocheck
diff --git a/tests/xfs/439 b/tests/xfs/439
index 3497e67c..5736b7a7 100755
--- a/tests/xfs/439
+++ b/tests/xfs/439
@@ -17,8 +17,6 @@ _begin_fstest auto quick fuzzers log
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_nocheck
 
 # We corrupt XFS on purpose, and check if assert failures would crash the
diff --git a/tests/xfs/440 b/tests/xfs/440
index 368ee8a0..fc731944 100755
--- a/tests/xfs/440
+++ b/tests/xfs/440
@@ -17,7 +17,6 @@ _begin_fstest auto quick clone quota
 . ./common/filter
 
 # Modify as appropriate.
-_supported_fs xfs
 
 _require_quota
 _require_scratch_delalloc
diff --git a/tests/xfs/441 b/tests/xfs/441
index 82654bf3..ca3c576a 100755
--- a/tests/xfs/441
+++ b/tests/xfs/441
@@ -16,7 +16,6 @@ _begin_fstest auto quick clone quota
 . ./common/filter
 
 # Modify as appropriate.
-_supported_fs xfs
 
 _require_quota
 _require_scratch_reflink
diff --git a/tests/xfs/442 b/tests/xfs/442
index b04b1c83..77d08fda 100755
--- a/tests/xfs/442
+++ b/tests/xfs/442
@@ -26,7 +26,6 @@ _cleanup()
 . ./common/reflink
 
 # Modify as appropriate.
-_supported_fs xfs
 
 _require_scratch_reflink
 _require_quota
diff --git a/tests/xfs/443 b/tests/xfs/443
index 069d976c..8db51a83 100755
--- a/tests/xfs/443
+++ b/tests/xfs/443
@@ -21,10 +21,8 @@ _begin_fstest auto quick ioctl fsr punch fiemap prealloc
 . ./common/filter
 . ./common/punch
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch
 _require_test_program "punch-alternating"
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/444 b/tests/xfs/444
index cf78a9a1..13c9de52 100755
--- a/tests/xfs/444
+++ b/tests/xfs/444
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup; rm -f $tmp.*"
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_check_dmesg
 _require_scratch
diff --git a/tests/xfs/445 b/tests/xfs/445
index ca956efc..c31b134b 100755
--- a/tests/xfs/445
+++ b/tests/xfs/445
@@ -24,7 +24,6 @@ _begin_fstest auto quick filestreams prealloc
 . ./common/filter
 . ./common/filestreams
 
-# real QA test starts here
 drop_caches()
 {
 	while [ true ]; do
@@ -34,7 +33,6 @@ drop_caches()
 }
 
 # Modify as appropriate.
-_supported_fs generic
 _require_scratch_size $((2*1024*1024)) # kb
 _require_xfs_io_command "falloc"
 
diff --git a/tests/xfs/446 b/tests/xfs/446
index 2481bbaf..099daeed 100755
--- a/tests/xfs/446
+++ b/tests/xfs/446
@@ -11,8 +11,6 @@ _begin_fstest auto quick
 
 # get standard environment
 
-# real QA test starts here
-_supported_fs xfs
 _require_command "$CHECKBASHISMS_PROG" checkbashisms
 
 test -z "$WORKAREA" && _notrun "Can't find xfsprogs source"
diff --git a/tests/xfs/447 b/tests/xfs/447
index 795c43b9..cb750233 100755
--- a/tests/xfs/447
+++ b/tests/xfs/447
@@ -20,9 +20,7 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs xfs
 
 _require_scratch
 _require_xfs_sysfs debug/mount_delay
diff --git a/tests/xfs/448 b/tests/xfs/448
index 815f56cb..88efe2d1 100755
--- a/tests/xfs/448
+++ b/tests/xfs/448
@@ -24,8 +24,6 @@ _begin_fstest auto quick fuzzers
 . ./common/filter
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_nocheck
 _require_xfs_io_command "scrub"
 # Corrupt XFS on purpose, and skip if assert failures would crash system.
diff --git a/tests/xfs/449 b/tests/xfs/449
index 5374bf2f..3d528e03 100755
--- a/tests/xfs/449
+++ b/tests/xfs/449
@@ -12,8 +12,6 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch_nocheck
 
diff --git a/tests/xfs/450 b/tests/xfs/450
index a2ba49dc..96a1c519 100755
--- a/tests/xfs/450
+++ b/tests/xfs/450
@@ -15,8 +15,6 @@ _begin_fstest auto quick rmap prealloc
 
 # remove previous \$seqres.full before test
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_io_command "falloc"
 _require_test_program "punch-alternating"
 _require_xfs_scratch_rmapbt
diff --git a/tests/xfs/451 b/tests/xfs/451
index 8ca4e7d1..80b627dd 100755
--- a/tests/xfs/451
+++ b/tests/xfs/451
@@ -15,10 +15,8 @@ _begin_fstest auto quick metadata repair
 
 echo "Silence is golden"
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_scratch
 
 _scratch_mkfs >> /dev/null 2>&1
diff --git a/tests/xfs/452 b/tests/xfs/452
index 6c04cd49..5b5c094f 100755
--- a/tests/xfs/452
+++ b/tests/xfs/452
@@ -14,7 +14,6 @@ _begin_fstest auto db
 . ./common/filter
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_scratch
 
 _scratch_mkfs_xfs >> $seqres.full 2>&1
diff --git a/tests/xfs/453 b/tests/xfs/453
index 62974453..d586f79d 100755
--- a/tests/xfs/453
+++ b/tests/xfs/453
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/454 b/tests/xfs/454
index 2540cd01..828b2d93 100755
--- a/tests/xfs/454
+++ b/tests/xfs/454
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/455 b/tests/xfs/455
index 9f06c71f..c5d05b26 100755
--- a/tests/xfs/455
+++ b/tests/xfs/455
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/456 b/tests/xfs/456
index dca03e10..3b229157 100755
--- a/tests/xfs/456
+++ b/tests/xfs/456
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/457 b/tests/xfs/457
index 64cd6b4b..41b51fb6 100755
--- a/tests/xfs/457
+++ b/tests/xfs/457
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/458 b/tests/xfs/458
index 8d87ec56..fff31ce9 100755
--- a/tests/xfs/458
+++ b/tests/xfs/458
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/459 b/tests/xfs/459
index 5989bc1e..b55899ae 100755
--- a/tests/xfs/459
+++ b/tests/xfs/459
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/460 b/tests/xfs/460
index 71174770..d67ae555 100755
--- a/tests/xfs/460
+++ b/tests/xfs/460
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/461 b/tests/xfs/461
index 7c1327b0..7609ce9b 100755
--- a/tests/xfs/461
+++ b/tests/xfs/461
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 _require_xfs_finobt
diff --git a/tests/xfs/462 b/tests/xfs/462
index 1ee4d27e..0831f8e9 100755
--- a/tests/xfs/462
+++ b/tests/xfs/462
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_scratch_rmapbt
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
diff --git a/tests/xfs/463 b/tests/xfs/463
index 7dd2d37d..cbfd9c3c 100755
--- a/tests/xfs/463
+++ b/tests/xfs/463
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_scratch_rmapbt
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
diff --git a/tests/xfs/464 b/tests/xfs/464
index 719901e6..71ce3557 100755
--- a/tests/xfs/464
+++ b/tests/xfs/464
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/fuzzy
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
diff --git a/tests/xfs/465 b/tests/xfs/465
index 71399300..30c47245 100755
--- a/tests/xfs/465
+++ b/tests/xfs/465
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/466 b/tests/xfs/466
index c1a1628a..4a470c90 100755
--- a/tests/xfs/466
+++ b/tests/xfs/466
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/467 b/tests/xfs/467
index 42b820d1..d64a7bb8 100755
--- a/tests/xfs/467
+++ b/tests/xfs/467
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/468 b/tests/xfs/468
index 34612c88..fa501e40 100755
--- a/tests/xfs/468
+++ b/tests/xfs/468
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/469 b/tests/xfs/469
index 630b3329..20fdb78d 100755
--- a/tests/xfs/469
+++ b/tests/xfs/469
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/470 b/tests/xfs/470
index acc43ba7..52be985b 100755
--- a/tests/xfs/470
+++ b/tests/xfs/470
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/471 b/tests/xfs/471
index 7883a00a..6b72b80a 100755
--- a/tests/xfs/471
+++ b/tests/xfs/471
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/472 b/tests/xfs/472
index a4ab9d75..0ec3335e 100755
--- a/tests/xfs/472
+++ b/tests/xfs/472
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/473 b/tests/xfs/473
index cbeed345..12924aee 100755
--- a/tests/xfs/473
+++ b/tests/xfs/473
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/474 b/tests/xfs/474
index 746e3531..d3c07352 100755
--- a/tests/xfs/474
+++ b/tests/xfs/474
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/475 b/tests/xfs/475
index 20053afe..06317ee2 100755
--- a/tests/xfs/475
+++ b/tests/xfs/475
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/476 b/tests/xfs/476
index f8f79e4f..dd2fbf4d 100755
--- a/tests/xfs/476
+++ b/tests/xfs/476
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/477 b/tests/xfs/477
index 0c2e2b36..fccd4f56 100755
--- a/tests/xfs/477
+++ b/tests/xfs/477
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/478 b/tests/xfs/478
index 44e42e3e..5909bd49 100755
--- a/tests/xfs/478
+++ b/tests/xfs/478
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/479 b/tests/xfs/479
index 9101d651..e59726ef 100755
--- a/tests/xfs/479
+++ b/tests/xfs/479
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/480 b/tests/xfs/480
index 4f3ae6dc..e5a1fa96 100755
--- a/tests/xfs/480
+++ b/tests/xfs/480
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/481 b/tests/xfs/481
index 48c7580c..bc36beee 100755
--- a/tests/xfs/481
+++ b/tests/xfs/481
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_xfs_scratch_rmapbt
 _require_scratch_xfs_fuzz_fields
diff --git a/tests/xfs/482 b/tests/xfs/482
index 0192b94c..66e44efd 100755
--- a/tests/xfs/482
+++ b/tests/xfs/482
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_xfs_scratch_rmapbt
 _require_scratch_xfs_fuzz_fields
diff --git a/tests/xfs/483 b/tests/xfs/483
index 56670ba1..5225a18a 100755
--- a/tests/xfs/483
+++ b/tests/xfs/483
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/fuzzy
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
diff --git a/tests/xfs/484 b/tests/xfs/484
index 27522bbd..ef768df8 100755
--- a/tests/xfs/484
+++ b/tests/xfs/484
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/485 b/tests/xfs/485
index efffbb85..f3dbc4f6 100755
--- a/tests/xfs/485
+++ b/tests/xfs/485
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/486 b/tests/xfs/486
index 6d7f4031..8ee65c0c 100755
--- a/tests/xfs/486
+++ b/tests/xfs/486
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/487 b/tests/xfs/487
index a6885939..8bd646ed 100755
--- a/tests/xfs/487
+++ b/tests/xfs/487
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/fuzzy
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 _require_quota
diff --git a/tests/xfs/488 b/tests/xfs/488
index 0d54ab8c..c58d21e2 100755
--- a/tests/xfs/488
+++ b/tests/xfs/488
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/fuzzy
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 _require_quota
diff --git a/tests/xfs/489 b/tests/xfs/489
index 012416f9..b9df871a 100755
--- a/tests/xfs/489
+++ b/tests/xfs/489
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/fuzzy
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 _require_quota
diff --git a/tests/xfs/490 b/tests/xfs/490
index 8c3b0684..a3b07475 100755
--- a/tests/xfs/490
+++ b/tests/xfs/490
@@ -16,10 +16,8 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_scratch_nocheck
 _require_xfs_mkfs_finobt
 
diff --git a/tests/xfs/491 b/tests/xfs/491
index 7402b09a..05ef2c87 100755
--- a/tests/xfs/491
+++ b/tests/xfs/491
@@ -12,10 +12,8 @@ _begin_fstest auto quick fuzzers
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_scratch
 
 echo "Format and mount"
diff --git a/tests/xfs/492 b/tests/xfs/492
index 514ac1e4..a3a4a3e0 100755
--- a/tests/xfs/492
+++ b/tests/xfs/492
@@ -12,10 +12,8 @@ _begin_fstest auto quick fuzzers
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_scratch
 
 echo "Format and mount"
diff --git a/tests/xfs/493 b/tests/xfs/493
index 58091ad7..e728e7b4 100755
--- a/tests/xfs/493
+++ b/tests/xfs/493
@@ -13,10 +13,8 @@ _begin_fstest auto quick fuzzers
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_scratch_nocheck
 
 echo "Format and mount"
diff --git a/tests/xfs/494 b/tests/xfs/494
index 2ff85758..510ffb10 100755
--- a/tests/xfs/494
+++ b/tests/xfs/494
@@ -12,8 +12,6 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_io_command "crc32cselftest"
 
 rm -f "$seqres.full"
diff --git a/tests/xfs/495 b/tests/xfs/495
index 8da61f23..b42e7e5b 100755
--- a/tests/xfs/495
+++ b/tests/xfs/495
@@ -19,8 +19,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_nocheck
 _require_populate_commands
 _require_xfs_db_command "fuzz"
diff --git a/tests/xfs/496 b/tests/xfs/496
index a2624d2e..22282ba0 100755
--- a/tests/xfs/496
+++ b/tests/xfs/496
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/497 b/tests/xfs/497
index 9a985d8c..f9f36c6b 100755
--- a/tests/xfs/497
+++ b/tests/xfs/497
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/498 b/tests/xfs/498
index 20bd326a..f4671519 100755
--- a/tests/xfs/498
+++ b/tests/xfs/498
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/499 b/tests/xfs/499
index 383e5719..ae6bbee3 100755
--- a/tests/xfs/499
+++ b/tests/xfs/499
@@ -15,8 +15,6 @@ _register_cleanup "_cleanup" BUS
 
 . ./common/tracing
 
-# real QA test starts here
-_supported_fs xfs
 _require_ftrace
 _require_command "$CC_PROG" "cc"
 
diff --git a/tests/xfs/500 b/tests/xfs/500
index 7c336e86..3832f03d 100755
--- a/tests/xfs/500
+++ b/tests/xfs/500
@@ -12,8 +12,6 @@ testfile=$TEST_DIR/$seq.txt
 
 # Import common functions.
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_nocheck
 
 # Try regular extent size hint
diff --git a/tests/xfs/501 b/tests/xfs/501
index a9acf0af..1da4cbf9 100755
--- a/tests/xfs/501
+++ b/tests/xfs/501
@@ -28,8 +28,6 @@ _cleanup()
 # Import common functions.
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_io_error_injection "iunlink_fallback"
 _require_xfs_sysfs debug/log_recovery_delay
 _require_scratch
diff --git a/tests/xfs/502 b/tests/xfs/502
index fb9a82c1..52b8e95a 100755
--- a/tests/xfs/502
+++ b/tests/xfs/502
@@ -19,8 +19,6 @@ testfile=$TEST_DIR/$seq.txt
 . ./common/inject
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_io_error_injection "iunlink_fallback"
 _require_scratch
 _require_test_program "t_open_tmpfiles"
diff --git a/tests/xfs/503 b/tests/xfs/503
index 01cff7b0..0b62e0aa 100755
--- a/tests/xfs/503
+++ b/tests/xfs/503
@@ -27,8 +27,6 @@ _cleanup()
 
 testdir=$TEST_DIR/test-$seq
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_command "$XFS_MDRESTORE_PROG" "xfs_mdrestore"
 _require_loop
diff --git a/tests/xfs/504 b/tests/xfs/504
index 291ee4e4..6000923b 100755
--- a/tests/xfs/504
+++ b/tests/xfs/504
@@ -15,7 +15,6 @@ _begin_fstest auto quick mkfs label
 # Import common functions.
 . ./common/filter
 
-_supported_fs xfs
 _require_scratch_nocheck
 _require_xfs_io_command 'label'
 
diff --git a/tests/xfs/505 b/tests/xfs/505
index 0601b1a8..81f53ffa 100755
--- a/tests/xfs/505
+++ b/tests/xfs/505
@@ -11,8 +11,6 @@ _begin_fstest auto quick spaceman
 
 # Import common functions.
 
-# real QA test starts here
-_supported_fs xfs
 _require_command "$XFS_SPACEMAN_PROG" "xfs_spaceman"
 _require_command "$MAN_PROG" man
 
diff --git a/tests/xfs/506 b/tests/xfs/506
index 1c75fefa..5d56155a 100755
--- a/tests/xfs/506
+++ b/tests/xfs/506
@@ -13,8 +13,6 @@ _begin_fstest auto quick health
 . ./common/fuzzy
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_nocheck
 _require_scrub
 _require_xfs_spaceman_command "health"
diff --git a/tests/xfs/507 b/tests/xfs/507
index 8757152e..75c183c0 100755
--- a/tests/xfs/507
+++ b/tests/xfs/507
@@ -31,8 +31,6 @@ _cleanup()
 . ./common/reflink
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_loop
diff --git a/tests/xfs/508 b/tests/xfs/508
index 47c04f89..ee1a0371 100755
--- a/tests/xfs/508
+++ b/tests/xfs/508
@@ -15,8 +15,6 @@ _begin_fstest auto quick quota
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_quota
 
diff --git a/tests/xfs/509 b/tests/xfs/509
index d04dfbbf..53c6bd9c 100755
--- a/tests/xfs/509
+++ b/tests/xfs/509
@@ -138,7 +138,6 @@ _require_xfs_io_command inumbers
 
 # Real QA test starts here
 
-_supported_fs xfs
 
 DIRCOUNT=8
 INOCOUNT=$((2048 / DIRCOUNT))
diff --git a/tests/xfs/510 b/tests/xfs/510
index 5784077c..ca0f2c39 100755
--- a/tests/xfs/510
+++ b/tests/xfs/510
@@ -19,9 +19,7 @@ _begin_fstest auto ioctl quick
 
 _require_test_program "bulkstat_null_ocount"
 
-# real QA test starts here
 
-_supported_fs xfs
 
 echo "Silence is golden."
 $here/src/bulkstat_null_ocount $TEST_DIR
diff --git a/tests/xfs/511 b/tests/xfs/511
index d2550404..b55c34b9 100755
--- a/tests/xfs/511
+++ b/tests/xfs/511
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_quota
 
diff --git a/tests/xfs/512 b/tests/xfs/512
index 4595770e..120a6d6b 100755
--- a/tests/xfs/512
+++ b/tests/xfs/512
@@ -21,8 +21,6 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_test
 _require_runas
diff --git a/tests/xfs/513 b/tests/xfs/513
index 3a85ed42..5585a9c8 100755
--- a/tests/xfs/513
+++ b/tests/xfs/513
@@ -29,8 +29,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _fixed_by_kernel_commit 237d7887ae72 \
 	"xfs: show the proper user quota options"
 
diff --git a/tests/xfs/514 b/tests/xfs/514
index 94f98398..d3641c3e 100755
--- a/tests/xfs/514
+++ b/tests/xfs/514
@@ -18,8 +18,6 @@ _cleanup()
 
 # Import common functions.
 
-# real QA test starts here
-_supported_fs xfs
 _require_command "$XFS_DB_PROG" "xfs_db"
 _require_command "$MAN_PROG" man
 _require_test
diff --git a/tests/xfs/515 b/tests/xfs/515
index adb2bd6f..7d6e9940 100755
--- a/tests/xfs/515
+++ b/tests/xfs/515
@@ -18,8 +18,6 @@ _cleanup()
 
 # Import common functions.
 
-# real QA test starts here
-_supported_fs xfs
 _require_command "$XFS_QUOTA_PROG" "xfs_quota"
 _require_command "$MAN_PROG" man
 _require_test
diff --git a/tests/xfs/516 b/tests/xfs/516
index 1bf6f858..e52779cf 100755
--- a/tests/xfs/516
+++ b/tests/xfs/516
@@ -20,8 +20,6 @@ _cleanup()
 # Import common functions.
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_nocheck
 
 # Assume that if we can run scrub on the test dev we can run it on the scratch
diff --git a/tests/xfs/517 b/tests/xfs/517
index 68438e54..4d3d24be 100755
--- a/tests/xfs/517
+++ b/tests/xfs/517
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/fuzzy
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_scratch_rmapbt
 _require_xfs_io_command "fsmap"
 _require_xfs_stress_scrub
diff --git a/tests/xfs/518 b/tests/xfs/518
index 332ff16a..ee5558e7 100755
--- a/tests/xfs/518
+++ b/tests/xfs/518
@@ -14,8 +14,6 @@ _begin_fstest auto quick quota
 . ./common/filter
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_quota
 
diff --git a/tests/xfs/519 b/tests/xfs/519
index 49c62b56..ac815f12 100755
--- a/tests/xfs/519
+++ b/tests/xfs/519
@@ -15,8 +15,6 @@ _begin_fstest auto quick clone
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_cp_reflink
 
diff --git a/tests/xfs/520 b/tests/xfs/520
index dd6d845e..3895db3a 100755
--- a/tests/xfs/520
+++ b/tests/xfs/520
@@ -25,9 +25,7 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
-_supported_fs xfs
 _disable_dmesg_check
 _require_check_dmesg
 _require_scratch_nocheck
diff --git a/tests/xfs/521 b/tests/xfs/521
index 60f28740..13982c44 100755
--- a/tests/xfs/521
+++ b/tests/xfs/521
@@ -28,8 +28,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 # Note that we don't _require_realtime because we synthesize a rt volume
 # below.
 _require_scratch_nocheck
diff --git a/tests/xfs/522 b/tests/xfs/522
index 05251b0e..4c502248 100755
--- a/tests/xfs/522
+++ b/tests/xfs/522
@@ -20,10 +20,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_test
 _require_scratch_nocheck
 _require_xfs_mkfs_cfgfile
diff --git a/tests/xfs/523 b/tests/xfs/523
index bd9b7553..f069b15d 100755
--- a/tests/xfs/523
+++ b/tests/xfs/523
@@ -20,10 +20,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_test
 _require_scratch_nocheck
 _require_xfs_mkfs_cfgfile
diff --git a/tests/xfs/524 b/tests/xfs/524
index fe4d134b..ef47a846 100755
--- a/tests/xfs/524
+++ b/tests/xfs/524
@@ -19,10 +19,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_test
 _require_scratch_nocheck
 _require_xfs_mkfs_cfgfile
diff --git a/tests/xfs/525 b/tests/xfs/525
index a17c9f19..8418267b 100755
--- a/tests/xfs/525
+++ b/tests/xfs/525
@@ -19,10 +19,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_test
 _require_scratch_nocheck
 _require_xfs_mkfs_cfgfile
diff --git a/tests/xfs/526 b/tests/xfs/526
index c5c5f9b1..94557e94 100755
--- a/tests/xfs/526
+++ b/tests/xfs/526
@@ -19,10 +19,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_test
 _require_scratch_nocheck
 _require_xfs_mkfs_cfgfile
diff --git a/tests/xfs/527 b/tests/xfs/527
index 8abc866f..2ef428c2 100755
--- a/tests/xfs/527
+++ b/tests/xfs/527
@@ -20,8 +20,6 @@ _begin_fstest auto quick quota
 # Import common functions.
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_debug
 _require_quota
 _require_scratch
diff --git a/tests/xfs/528 b/tests/xfs/528
index 2bd8c289..6ca9a237 100755
--- a/tests/xfs/528
+++ b/tests/xfs/528
@@ -22,8 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_loop
 _require_command "$FILEFRAG_PROG" filefrag
 _require_xfs_io_command "fpunch"
diff --git a/tests/xfs/529 b/tests/xfs/529
index cd176877..14bdd2ee 100755
--- a/tests/xfs/529
+++ b/tests/xfs/529
@@ -17,9 +17,7 @@ _begin_fstest auto quick quota prealloc
 . ./common/inject
 . ./common/populate
 
-# real QA test starts here
 
-_supported_fs xfs
 _require_scratch
 _require_xfs_quota
 _require_xfs_debug
diff --git a/tests/xfs/530 b/tests/xfs/530
index 56f5e7eb..8a182bd6 100755
--- a/tests/xfs/530
+++ b/tests/xfs/530
@@ -24,9 +24,7 @@ _cleanup()
 . ./common/inject
 . ./common/populate
 
-# real QA test starts here
 
-_supported_fs xfs
 # Note that we don't _require_realtime because we synthesize a rt volume
 # below.
 _require_test
diff --git a/tests/xfs/531 b/tests/xfs/531
index 48cb37cd..5b77c22c 100755
--- a/tests/xfs/531
+++ b/tests/xfs/531
@@ -13,9 +13,7 @@ _begin_fstest auto quick punch zero insert collapse
 . ./common/filter
 . ./common/inject
 
-# real QA test starts here
 
-_supported_fs xfs
 _require_scratch
 _require_xfs_debug
 _require_xfs_io_command "fpunch"
diff --git a/tests/xfs/532 b/tests/xfs/532
index 74a7ac30..c196799e 100755
--- a/tests/xfs/532
+++ b/tests/xfs/532
@@ -15,9 +15,7 @@ _begin_fstest auto quick attr
 . ./common/inject
 . ./common/populate
 
-# real QA test starts here
 
-_supported_fs xfs
 _require_scratch
 _require_attrs
 _require_xfs_debug
diff --git a/tests/xfs/533 b/tests/xfs/533
index 31858cc9..8189b943 100755
--- a/tests/xfs/533
+++ b/tests/xfs/533
@@ -14,8 +14,6 @@
 . ./common/preamble
 _begin_fstest auto quick db
 
-# real QA test starts here
-_supported_fs xfs
 _fixed_by_git_commit xfsprogs f4afdcb0ad11 \
 	"xfs_db: clean up the salvage read callsites in set_cur()"
 #skip fs check because invalid superblock 1
diff --git a/tests/xfs/534 b/tests/xfs/534
index f17c45b8..2bbf474d 100755
--- a/tests/xfs/534
+++ b/tests/xfs/534
@@ -13,9 +13,7 @@ _begin_fstest auto quick prealloc
 . ./common/filter
 . ./common/inject
 
-# real QA test starts here
 
-_supported_fs xfs
 _require_scratch
 _require_xfs_debug
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/535 b/tests/xfs/535
index f76c1725..9b1c4150 100755
--- a/tests/xfs/535
+++ b/tests/xfs/535
@@ -14,9 +14,7 @@ _begin_fstest auto quick clone unshare
 . ./common/reflink
 . ./common/inject
 
-# real QA test starts here
 
-_supported_fs xfs
 _require_scratch
 _require_scratch_reflink
 _require_xfs_debug
diff --git a/tests/xfs/536 b/tests/xfs/536
index 64fa4fbf..ff693425 100755
--- a/tests/xfs/536
+++ b/tests/xfs/536
@@ -14,9 +14,7 @@ _begin_fstest auto quick clone
 . ./common/reflink
 . ./common/inject
 
-# real QA test starts here
 
-_supported_fs xfs
 _require_scratch
 _require_scratch_reflink
 _require_xfs_debug
diff --git a/tests/xfs/537 b/tests/xfs/537
index 6364db9b..0967ac99 100755
--- a/tests/xfs/537
+++ b/tests/xfs/537
@@ -13,9 +13,7 @@ _begin_fstest auto quick collapse swapext
 . ./common/filter
 . ./common/inject
 
-# real QA test starts here
 
-_supported_fs xfs
 _require_scratch
 _require_xfs_debug
 _require_xfs_scratch_rmapbt
diff --git a/tests/xfs/538 b/tests/xfs/538
index 0b5772a1..57113d34 100755
--- a/tests/xfs/538
+++ b/tests/xfs/538
@@ -14,9 +14,7 @@ _begin_fstest auto stress
 . ./common/inject
 . ./common/populate
 
-# real QA test starts here
 
-_supported_fs xfs
 _require_scratch
 _require_xfs_debug
 _require_test_program "punch-alternating"
diff --git a/tests/xfs/539 b/tests/xfs/539
index 778dce85..b9bb7cc1 100755
--- a/tests/xfs/539
+++ b/tests/xfs/539
@@ -16,7 +16,6 @@ _begin_fstest auto quick mount
 
 # Import common functions.
 
-_supported_fs xfs
 _fixed_by_kernel_commit 92cf7d36384b \
 	"xfs: Skip repetitive warnings about mount options"
 
diff --git a/tests/xfs/540 b/tests/xfs/540
index 55484dd3..3acb2095 100755
--- a/tests/xfs/540
+++ b/tests/xfs/540
@@ -23,8 +23,6 @@ _begin_fstest auto repair fuzzers
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 
 echo "Format and mount"
diff --git a/tests/xfs/541 b/tests/xfs/541
index ae2fd819..f18b801c 100755
--- a/tests/xfs/541
+++ b/tests/xfs/541
@@ -21,10 +21,8 @@ _begin_fstest auto quick realtime growfs
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_realtime
 _require_scratch
 
diff --git a/tests/xfs/542 b/tests/xfs/542
index 1540541e..09200c00 100755
--- a/tests/xfs/542
+++ b/tests/xfs/542
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/reflink
 . ./common/dmflakey
 
-# real QA test starts here
-_supported_fs xfs
 _fixed_by_kernel_commit 5ca5916b6bc9 \
 	"xfs: punch out data fork delalloc blocks on COW writeback failure"
 
diff --git a/tests/xfs/543 b/tests/xfs/543
index 913276c8..f22fa84c 100755
--- a/tests/xfs/543
+++ b/tests/xfs/543
@@ -21,10 +21,8 @@ _cleanup()
 # Import common functions.
 # . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_test
 _require_xfs_mkfs_cfgfile
 
diff --git a/tests/xfs/544 b/tests/xfs/544
index c7251fc3..bd694453 100755
--- a/tests/xfs/544
+++ b/tests/xfs/544
@@ -24,9 +24,7 @@ _cleanup()
 . ./common/filter
 . ./common/dump
 
-# real QA test starts here
 
-_supported_fs xfs
 
 # Setup
 rm -rf $TEST_DIR/src.$seq
diff --git a/tests/xfs/545 b/tests/xfs/545
index 57a650ac..21f62226 100755
--- a/tests/xfs/545
+++ b/tests/xfs/545
@@ -13,7 +13,6 @@ _begin_fstest auto quick dump prealloc
 # Import common functions.
 . ./common/dump
 
-_supported_fs xfs
 _require_xfs_io_command "falloc"
 _require_scratch
 
diff --git a/tests/xfs/546 b/tests/xfs/546
index 8c903a1b..316ffc50 100755
--- a/tests/xfs/546
+++ b/tests/xfs/546
@@ -25,10 +25,8 @@
 . ./common/preamble
 _begin_fstest auto quick shutdown
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_xfs_io_command syncfs
 _require_scratch_nocheck
 _require_scratch_shutdown
diff --git a/tests/xfs/547 b/tests/xfs/547
index 60121eb9..eada4aad 100755
--- a/tests/xfs/547
+++ b/tests/xfs/547
@@ -16,8 +16,6 @@ _begin_fstest auto quick metadata
 . ./common/inject
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_nrext64
 _require_attrs
diff --git a/tests/xfs/548 b/tests/xfs/548
index 560c90fd..f0b58563 100755
--- a/tests/xfs/548
+++ b/tests/xfs/548
@@ -16,8 +16,6 @@ _begin_fstest auto quick metadata
 . ./common/inject
 . ./common/populate
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_nrext64
 _require_attrs
diff --git a/tests/xfs/549 b/tests/xfs/549
index 925ca993..a7383246 100755
--- a/tests/xfs/549
+++ b/tests/xfs/549
@@ -14,8 +14,6 @@
 . ./common/preamble
 _begin_fstest auto quick mkfs
 
-# real QA test starts here
-_supported_fs xfs
 _fixed_by_git_commit xfsprogs 50dba8189b1f \
 	"mkfs: terminate getsubopt arrays properly"
 _require_test
diff --git a/tests/xfs/550 b/tests/xfs/550
index 87ae4110..cecc2ea2 100755
--- a/tests/xfs/550
+++ b/tests/xfs/550
@@ -13,7 +13,6 @@ _begin_fstest auto quick dax
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_check_dmesg
 _require_scratch_reflink
 _require_cp_reflink
diff --git a/tests/xfs/551 b/tests/xfs/551
index f4af72ed..72f71e25 100755
--- a/tests/xfs/551
+++ b/tests/xfs/551
@@ -13,7 +13,6 @@ _begin_fstest auto quick clone dax
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_check_dmesg
 _require_scratch_reflink
 _require_cp_reflink
diff --git a/tests/xfs/552 b/tests/xfs/552
index cb97b2ff..facee8cd 100755
--- a/tests/xfs/552
+++ b/tests/xfs/552
@@ -14,7 +14,6 @@ _begin_fstest auto quick clone dax
 . ./common/filter
 . ./common/reflink
 
-# real QA test starts here
 _require_check_dmesg
 _require_scratch_reflink
 _require_xfs_scratch_rmapbt
diff --git a/tests/xfs/553 b/tests/xfs/553
index e98c04ed..f4294e9c 100755
--- a/tests/xfs/553
+++ b/tests/xfs/553
@@ -14,8 +14,6 @@ _begin_fstest auto quick clone
 . ./common/reflink
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _fixed_by_kernel_commit d62113303d691 \
 	"xfs: Fix false ENOSPC when performing direct write on a delalloc extent in cow fork"
 _require_scratch_reflink
diff --git a/tests/xfs/554 b/tests/xfs/554
index 16fc052c..450da84d 100755
--- a/tests/xfs/554
+++ b/tests/xfs/554
@@ -14,7 +14,6 @@ _begin_fstest auto quick dump prealloc
 # Import common functions.
 . ./common/dump
 
-_supported_fs xfs
 _fixed_by_git_commit xfsdump \
 	"XXXXXXXXXXXX xfsrestore: fix rootdir due to xfsdump bulkstat misuse"
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/555 b/tests/xfs/555
index a4024501..17d32ab1 100755
--- a/tests/xfs/555
+++ b/tests/xfs/555
@@ -10,8 +10,6 @@
 . ./common/preamble
 _begin_fstest auto quick
 
-# real QA test starts here
-_supported_fs xfs
 _fixed_by_kernel_commit 392c6de98af1 \
 	"xfs: sanitize sb_inopblock in xfs_mount_validate_sb"
 _require_scratch
diff --git a/tests/xfs/556 b/tests/xfs/556
index 2f8cad1a..5a2e7fd6 100755
--- a/tests/xfs/556
+++ b/tests/xfs/556
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/dmerror
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_scratch_xfs_crc
 _require_scrub
diff --git a/tests/xfs/557 b/tests/xfs/557
index 01205377..706b0bba 100755
--- a/tests/xfs/557
+++ b/tests/xfs/557
@@ -13,7 +13,6 @@
 . ./common/preamble
 _begin_fstest auto quick prealloc
 
-_supported_fs xfs
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "bulkstat_single"
 _require_scratch
diff --git a/tests/xfs/558 b/tests/xfs/558
index 270f458c..ec2fbcb6 100755
--- a/tests/xfs/558
+++ b/tests/xfs/558
@@ -96,7 +96,6 @@ _begin_fstest auto quick clone
 . ./common/inject
 . ./common/tracing
 
-# real QA test starts here
 _cleanup()
 {
 	test -n "$sentryfile" && rm -f $sentryfile
@@ -107,7 +106,6 @@ _cleanup()
 }
 
 # Modify as appropriate.
-_supported_fs xfs
 _fixed_by_kernel_commit 5c665e5b5af6 "xfs: remove xfs_map_cow"
 _require_ftrace
 _require_xfs_io_error_injection "wb_delay_ms"
diff --git a/tests/xfs/559 b/tests/xfs/559
index 64fc16eb..fb29d208 100755
--- a/tests/xfs/559
+++ b/tests/xfs/559
@@ -14,7 +14,6 @@ _begin_fstest auto quick rw
 . ./common/inject
 . ./common/tracing
 
-# real QA test starts here
 _cleanup()
 {
 	test -n "$sentryfile" && rm -f $sentryfile
@@ -25,7 +24,6 @@ _cleanup()
 }
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_ftrace
 _require_xfs_io_command "falloc"
 _require_xfs_io_error_injection "write_delay_ms"
diff --git a/tests/xfs/560 b/tests/xfs/560
index 28b45d5f..d2cf2132 100755
--- a/tests/xfs/560
+++ b/tests/xfs/560
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/fuzzy
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_scratch_rmapbt
 _require_xfs_io_command "fsmap"
 _require_xfs_stress_scrub
diff --git a/tests/xfs/561 b/tests/xfs/561
index c1d68c6f..bbfcefcb 100755
--- a/tests/xfs/561
+++ b/tests/xfs/561
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/fuzzy
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/562 b/tests/xfs/562
index a5c6e888..354992a6 100755
--- a/tests/xfs/562
+++ b/tests/xfs/562
@@ -24,8 +24,6 @@ _cleanup()
 . ./common/fuzzy
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/563 b/tests/xfs/563
index 409a42be..3cd00651 100755
--- a/tests/xfs/563
+++ b/tests/xfs/563
@@ -25,8 +25,6 @@ _cleanup()
 . ./common/xfs
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/564 b/tests/xfs/564
index 11b3fecb..ae45952f 100755
--- a/tests/xfs/564
+++ b/tests/xfs/564
@@ -25,8 +25,6 @@ _cleanup()
 . ./common/xfs
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/565 b/tests/xfs/565
index 826bc535..40f1139a 100755
--- a/tests/xfs/565
+++ b/tests/xfs/565
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/566 b/tests/xfs/566
index 4003ff31..19c73ff9 100755
--- a/tests/xfs/566
+++ b/tests/xfs/566
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/567 b/tests/xfs/567
index b19eca23..89e504e5 100755
--- a/tests/xfs/567
+++ b/tests/xfs/567
@@ -15,7 +15,6 @@ _begin_fstest auto dump
 # Import common functions.
 . ./common/dump
 
-_supported_fs xfs
 _fixed_by_git_commit xfsdump \
 	"XXXXXXXXXXXX xfsrestore: fix rootdir due to xfsdump bulkstat misuse"
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/568 b/tests/xfs/568
index 017e17a5..f358b817 100755
--- a/tests/xfs/568
+++ b/tests/xfs/568
@@ -43,8 +43,6 @@ _list_dir()
 	LC_COLLATE=POSIX sort
 }
 
-# real QA test starts here
-_supported_fs xfs
 _fixed_by_git_commit xfsdump \
 	"XXXXXXXXXXXX xfsrestore: fix rootdir due to xfsdump bulkstat misuse"
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/569 b/tests/xfs/569
index b6d57980..7f2ad206 100755
--- a/tests/xfs/569
+++ b/tests/xfs/569
@@ -10,10 +10,8 @@
 . ./common/preamble
 _begin_fstest mkfs
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_scratch_nocheck
 
 ls /usr/share/xfsprogs/mkfs/*.conf &>/dev/null || \
diff --git a/tests/xfs/570 b/tests/xfs/570
index 9f3ba873..4e64a03a 100755
--- a/tests/xfs/570
+++ b/tests/xfs/570
@@ -22,8 +22,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/571 b/tests/xfs/571
index 9d22de8f..016387b4 100755
--- a/tests/xfs/571
+++ b/tests/xfs/571
@@ -22,8 +22,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/572 b/tests/xfs/572
index b0e352af..dfee9825 100755
--- a/tests/xfs/572
+++ b/tests/xfs/572
@@ -22,8 +22,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/573 b/tests/xfs/573
index a2b6bef3..5ff1bdbd 100755
--- a/tests/xfs/573
+++ b/tests/xfs/573
@@ -22,8 +22,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/574 b/tests/xfs/574
index 5a4bad00..6250f514 100755
--- a/tests/xfs/574
+++ b/tests/xfs/574
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/575 b/tests/xfs/575
index 3d29620f..6cf321ce 100755
--- a/tests/xfs/575
+++ b/tests/xfs/575
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/576 b/tests/xfs/576
index e11476d4..d3d3e783 100755
--- a/tests/xfs/576
+++ b/tests/xfs/576
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/577 b/tests/xfs/577
index d1abe6fa..35ca1468 100755
--- a/tests/xfs/577
+++ b/tests/xfs/577
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/578 b/tests/xfs/578
index 8160b7ef..2101eb55 100755
--- a/tests/xfs/578
+++ b/tests/xfs/578
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/579 b/tests/xfs/579
index a00ae02a..e552e499 100755
--- a/tests/xfs/579
+++ b/tests/xfs/579
@@ -24,8 +24,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/xfs
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/580 b/tests/xfs/580
index f49cba64..dac036f4 100755
--- a/tests/xfs/580
+++ b/tests/xfs/580
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_scratch
 _require_xfs_stress_scrub
diff --git a/tests/xfs/581 b/tests/xfs/581
index 1d08bc7d..73b51f99 100755
--- a/tests/xfs/581
+++ b/tests/xfs/581
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_scratch
 _require_xfs_stress_scrub
diff --git a/tests/xfs/582 b/tests/xfs/582
index 7a8c330b..f390b77f 100755
--- a/tests/xfs/582
+++ b/tests/xfs/582
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_scratch
 _require_xfs_stress_scrub
diff --git a/tests/xfs/583 b/tests/xfs/583
index a6121a83..dcc60f12 100755
--- a/tests/xfs/583
+++ b/tests/xfs/583
@@ -24,8 +24,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/xfs
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/584 b/tests/xfs/584
index c80ba575..3f62261c 100755
--- a/tests/xfs/584
+++ b/tests/xfs/584
@@ -24,8 +24,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/xfs
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/585 b/tests/xfs/585
index ea47dada..987c799f 100755
--- a/tests/xfs/585
+++ b/tests/xfs/585
@@ -24,8 +24,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/xfs
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/586 b/tests/xfs/586
index e802ee71..d78dea51 100755
--- a/tests/xfs/586
+++ b/tests/xfs/586
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/587 b/tests/xfs/587
index 71e1ce69..a9d46904 100755
--- a/tests/xfs/587
+++ b/tests/xfs/587
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/588 b/tests/xfs/588
index f56c50ac..bd0788d3 100755
--- a/tests/xfs/588
+++ b/tests/xfs/588
@@ -22,8 +22,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/589 b/tests/xfs/589
index d9cd81e0..806c445f 100755
--- a/tests/xfs/589
+++ b/tests/xfs/589
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/xfs
 . ./common/attr
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_attrs
 _require_xfs_stress_scrub
diff --git a/tests/xfs/590 b/tests/xfs/590
index 4e39109a..59a42f11 100755
--- a/tests/xfs/590
+++ b/tests/xfs/590
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/xfs
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/591 b/tests/xfs/591
index 00d5114e..9f080ebb 100755
--- a/tests/xfs/591
+++ b/tests/xfs/591
@@ -22,8 +22,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/592 b/tests/xfs/592
index 02ac456b..653ad256 100755
--- a/tests/xfs/592
+++ b/tests/xfs/592
@@ -24,8 +24,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/xfs
 . ./common/attr
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_attrs
 _require_xfs_stress_scrub
diff --git a/tests/xfs/593 b/tests/xfs/593
index cf2ac506..118b7e75 100755
--- a/tests/xfs/593
+++ b/tests/xfs/593
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/594 b/tests/xfs/594
index 323b191b..c86234e1 100755
--- a/tests/xfs/594
+++ b/tests/xfs/594
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/595 b/tests/xfs/595
index fc2a89ed..75797b6c 100755
--- a/tests/xfs/595
+++ b/tests/xfs/595
@@ -24,8 +24,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/596 b/tests/xfs/596
index 98659e8c..21cce047 100755
--- a/tests/xfs/596
+++ b/tests/xfs/596
@@ -22,8 +22,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_scratch
 _require_realtime
diff --git a/tests/xfs/597 b/tests/xfs/597
index 35363729..d3bf91a9 100755
--- a/tests/xfs/597
+++ b/tests/xfs/597
@@ -18,7 +18,6 @@ _fixed_by_kernel_commit a9248538facc \
 _fixed_by_kernel_commit 9dceccc5822f \
 	"xfs: use the directory name hash function for dir scrubbing"
 
-_supported_fs xfs
 _require_scratch
 _require_xfs_mkfs_ciname
 
diff --git a/tests/xfs/598 b/tests/xfs/598
index 760cd861..54f50cd6 100755
--- a/tests/xfs/598
+++ b/tests/xfs/598
@@ -24,7 +24,6 @@ _fixed_by_kernel_commit a9248538facc \
 _fixed_by_kernel_commit 9dceccc5822f \
         "xfs: use the directory name hash function for dir scrubbing"
 
-_supported_fs xfs
 _require_test
 _require_scratch
 _require_xfs_mkfs_ciname
diff --git a/tests/xfs/599 b/tests/xfs/599
index 57a797f0..725dbf62 100755
--- a/tests/xfs/599
+++ b/tests/xfs/599
@@ -17,7 +17,6 @@ _begin_fstest auto dir
 _fixed_by_git_commit xfsprogs b7b81f336ac \
 	"xfs_repair: fix incorrect dabtree hashval comparison"
 
-_supported_fs xfs
 _require_xfs_db_command "hashcoll"
 _require_xfs_db_command "path"
 _require_scratch
diff --git a/tests/xfs/600 b/tests/xfs/600
index e6997c53..189194fb 100755
--- a/tests/xfs/600
+++ b/tests/xfs/600
@@ -24,7 +24,6 @@ _fixed_by_git_commit kernel cfa2df68b7ce \
 	"xfs: fix an agbno overflow in __xfs_getfsmap_datadev"
 
 # Modify as appropriate.
-_supported_fs generic
 _require_xfs_io_command fsmap
 _require_xfs_scratch_rmapbt
 
diff --git a/tests/xfs/601 b/tests/xfs/601
index e1e94ca8..bc8fa719 100755
--- a/tests/xfs/601
+++ b/tests/xfs/601
@@ -24,8 +24,6 @@ _cleanup()
 
 testdir=$TEST_DIR/test-$seq
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_xfs_copy
 _require_scratch_nocheck
diff --git a/tests/xfs/602 b/tests/xfs/602
index 3bc2484e..de750ff3 100755
--- a/tests/xfs/602
+++ b/tests/xfs/602
@@ -14,9 +14,7 @@ _begin_fstest auto quick unlink
 . ./common/fuzzy
 . ./common/quota
 
-# real QA test starts here
 
-_supported_fs xfs
 _require_xfs_db_command iunlink
 _require_scratch_nocheck	# we'll run repair ourselves
 
diff --git a/tests/xfs/603 b/tests/xfs/603
index 444ebf40..04122b55 100755
--- a/tests/xfs/603
+++ b/tests/xfs/603
@@ -14,9 +14,7 @@ _begin_fstest auto online_repair
 . ./common/fuzzy
 . ./common/quota
 
-# real QA test starts here
 
-_supported_fs xfs
 _require_xfs_db_command iunlink
 # The iunlink bucket repair code wasn't added to the AGI repair code
 # until after the directory repair code was merged
diff --git a/tests/xfs/604 b/tests/xfs/604
index fdc444c2..0e9393b9 100755
--- a/tests/xfs/604
+++ b/tests/xfs/604
@@ -11,7 +11,6 @@ _begin_fstest auto prealloc punch
 
 . ./common/filter
 
-_supported_fs xfs
 _require_scratch
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "fpunch"
diff --git a/tests/xfs/605 b/tests/xfs/605
index 78458c76..b31fe6b0 100755
--- a/tests/xfs/605
+++ b/tests/xfs/605
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/inject
 . ./common/metadump
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_test
 _require_loop
diff --git a/tests/xfs/606 b/tests/xfs/606
index d52a93d2..02de601d 100755
--- a/tests/xfs/606
+++ b/tests/xfs/606
@@ -22,8 +22,6 @@ _cleanup()
 	rm -f $tmp.*
 }
 
-# real QA test starts here
-_supported_fs xfs
 _fixed_by_kernel_commit 84712492e6da \
 	"xfs: short circuit xfs_growfs_data_private() if delta is zero"
 _require_test
diff --git a/tests/xfs/607 b/tests/xfs/607
index e1120eac..530fea9e 100755
--- a/tests/xfs/607
+++ b/tests/xfs/607
@@ -27,12 +27,10 @@ _cleanup()
 . ./common/reflink
 . ./common/inject
 
-# real QA test starts here
 _fixed_by_kernel_commit d62113303d69 \
 	"xfs: Fix false ENOSPC when performing direct write on a delalloc extent in cow fork"
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_test_program "punch-alternating"
 _require_test_reflink
 _require_xfs_io_error_injection "bmap_alloc_minlen_extent"
diff --git a/tests/xfs/612 b/tests/xfs/612
index 0f6df7de..4bead570 100755
--- a/tests/xfs/612
+++ b/tests/xfs/612
@@ -12,8 +12,6 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_inobtcount
 _require_command "$XFS_ADMIN_PROG" "xfs_admin"
 _require_xfs_repair_upgrade inobtcount
diff --git a/tests/xfs/613 b/tests/xfs/613
index 8bff2171..1947afec 100755
--- a/tests/xfs/613
+++ b/tests/xfs/613
@@ -29,8 +29,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _fixed_by_kernel_commit 237d7887ae72 \
 	"xfs: show the proper user quota options"
 
diff --git a/tests/xfs/614 b/tests/xfs/614
index 046c202c..0f8952e5 100755
--- a/tests/xfs/614
+++ b/tests/xfs/614
@@ -20,8 +20,6 @@ _cleanup()
 	rm -r -f $tmp.* $loop_file
 }
 
-# real QA test starts here
-_supported_fs xfs
 
 _require_test
 _require_loop
diff --git a/tests/xfs/615 b/tests/xfs/615
index 783af4ec..6abc6e01 100755
--- a/tests/xfs/615
+++ b/tests/xfs/615
@@ -13,9 +13,7 @@ _begin_fstest auto quick collapse fiexchange
 . ./common/filter
 . ./common/inject
 
-# real QA test starts here
 
-_supported_fs xfs
 _require_scratch
 _require_xfs_debug
 _require_xfs_scratch_rmapbt
diff --git a/tests/xfs/616 b/tests/xfs/616
index 151b755c..1a7d5606 100755
--- a/tests/xfs/616
+++ b/tests/xfs/616
@@ -13,10 +13,8 @@ _begin_fstest auto fiexchange
 
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_xfs_io_command "falloc"
 _require_xfs_io_command exchangerange
 _require_scratch
diff --git a/tests/xfs/617 b/tests/xfs/617
index 21959673..2f5bf523 100755
--- a/tests/xfs/617
+++ b/tests/xfs/617
@@ -13,10 +13,8 @@ _begin_fstest auto fiexchange
 
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs generic
 _require_xfs_io_command "falloc"
 _require_xfs_io_command exchangerange
 _require_realtime
diff --git a/tests/xfs/618 b/tests/xfs/618
index f68b0eac..b011057e 100755
--- a/tests/xfs/618
+++ b/tests/xfs/618
@@ -15,13 +15,11 @@ _begin_fstest auto quick parent
 . ./common/filter
 
 # Modify as appropriate
-_supported_fs xfs
 _require_scratch
 _require_xfs_sysfs debug/larp
 _require_xfs_parent
 _require_xfs_io_command "parent"
 
-# real QA test starts here
 
 # Create a directory tree using a protofile and
 # make sure all inodes created have parent pointers
diff --git a/tests/xfs/619 b/tests/xfs/619
index efaa94d1..7e542f70 100755
--- a/tests/xfs/619
+++ b/tests/xfs/619
@@ -13,13 +13,11 @@ _begin_fstest auto quick parent
 . ./common/parent
 
 # Modify as appropriate
-_supported_fs xfs
 _require_scratch
 _require_xfs_sysfs debug/larp
 _require_xfs_parent
 _require_xfs_io_command "parent"
 
-# real QA test starts here
 
 # Create a directory tree using a protofile and
 # make sure all inodes created have parent pointers
diff --git a/tests/xfs/620 b/tests/xfs/620
index 35fb8625..42a30630 100755
--- a/tests/xfs/620
+++ b/tests/xfs/620
@@ -15,14 +15,12 @@ _begin_fstest auto quick parent
 . ./common/parent
 
 # Modify as appropriate
-_supported_fs xfs
 _require_scratch
 _require_xfs_sysfs debug/larp
 _require_xfs_io_error_injection "larp"
 _require_xfs_parent
 _require_xfs_io_command "parent"
 
-# real QA test starts here
 
 # Create a directory tree using a protofile and
 # make sure all inodes created have parent pointers
diff --git a/tests/xfs/621 b/tests/xfs/621
index b425d0a6..24fbbc4e 100755
--- a/tests/xfs/621
+++ b/tests/xfs/621
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/622 b/tests/xfs/622
index dfb16260..59503cfa 100755
--- a/tests/xfs/622
+++ b/tests/xfs/622
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/623 b/tests/xfs/623
index 59952f6a..aff3f903 100755
--- a/tests/xfs/623
+++ b/tests/xfs/623
@@ -16,10 +16,8 @@ _begin_fstest auto online_repair
 . ./common/fuzzy
 . ./common/populate
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_xfs_db_command "link"
 _require_xfs_db_command "unlink"
 _require_scratch
diff --git a/tests/xfs/624 b/tests/xfs/624
index 707e886d..e63cfcc6 100755
--- a/tests/xfs/624
+++ b/tests/xfs/624
@@ -16,10 +16,8 @@ _begin_fstest auto online_repair
 . ./common/fuzzy
 . ./common/populate
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_xfs_db_command "link"
 _require_xfs_db_command "unlink"
 _require_scratch
diff --git a/tests/xfs/625 b/tests/xfs/625
index 05225ca5..23013f19 100755
--- a/tests/xfs/625
+++ b/tests/xfs/625
@@ -16,10 +16,8 @@ _begin_fstest auto online_repair
 . ./common/fuzzy
 . ./common/populate
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_xfs_db_command "link"
 _require_xfs_db_command "unlink"
 _require_scratch
diff --git a/tests/xfs/626 b/tests/xfs/626
index e1c28be6..c424819c 100755
--- a/tests/xfs/626
+++ b/tests/xfs/626
@@ -16,10 +16,8 @@ _begin_fstest auto online_repair
 . ./common/fuzzy
 . ./common/populate
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_xfs_db_command "link"
 _require_xfs_db_command "unlink"
 _require_scratch
diff --git a/tests/xfs/627 b/tests/xfs/627
index ff76e585..411a7603 100755
--- a/tests/xfs/627
+++ b/tests/xfs/627
@@ -16,10 +16,8 @@ _begin_fstest auto online_repair
 . ./common/fuzzy
 . ./common/populate
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_xfs_db_command "link"
 _require_xfs_db_command "unlink"
 _require_scratch
diff --git a/tests/xfs/628 b/tests/xfs/628
index 145651f4..8dc26898 100755
--- a/tests/xfs/628
+++ b/tests/xfs/628
@@ -17,8 +17,6 @@ _begin_fstest scrub dangerous_fsstress_scrub
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/708 b/tests/xfs/708
index 76da6338..40c4d92d 100755
--- a/tests/xfs/708
+++ b/tests/xfs/708
@@ -22,8 +22,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/709 b/tests/xfs/709
index 247d1083..3a29ca12 100755
--- a/tests/xfs/709
+++ b/tests/xfs/709
@@ -22,8 +22,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/710 b/tests/xfs/710
index 45a2a2a3..dc599c0b 100755
--- a/tests/xfs/710
+++ b/tests/xfs/710
@@ -22,8 +22,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/711 b/tests/xfs/711
index 0b1adb76..685ada10 100755
--- a/tests/xfs/711
+++ b/tests/xfs/711
@@ -22,8 +22,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/712 b/tests/xfs/712
index 222b2b20..15a94a52 100755
--- a/tests/xfs/712
+++ b/tests/xfs/712
@@ -22,8 +22,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/713 b/tests/xfs/713
index 05b2a1a9..55165391 100755
--- a/tests/xfs/713
+++ b/tests/xfs/713
@@ -22,8 +22,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/714 b/tests/xfs/714
index cd848216..aa209ce5 100755
--- a/tests/xfs/714
+++ b/tests/xfs/714
@@ -22,8 +22,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/715 b/tests/xfs/715
index 09fa0ebd..e6821c02 100755
--- a/tests/xfs/715
+++ b/tests/xfs/715
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/716 b/tests/xfs/716
index ef0af453..cd4fffef 100755
--- a/tests/xfs/716
+++ b/tests/xfs/716
@@ -20,8 +20,6 @@ _cleanup()
 . ./common/inject
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_io_error_injection "force_repair"
 _require_xfs_io_command "falloc"
diff --git a/tests/xfs/717 b/tests/xfs/717
index ba00a710..6368d704 100755
--- a/tests/xfs/717
+++ b/tests/xfs/717
@@ -22,8 +22,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/718 b/tests/xfs/718
index cc0efa7a..7b0fe2c4 100755
--- a/tests/xfs/718
+++ b/tests/xfs/718
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/xfs
 . ./common/attr
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_attrs
 _require_xfs_stress_online_repair
diff --git a/tests/xfs/719 b/tests/xfs/719
index 9e28958e..81805402 100755
--- a/tests/xfs/719
+++ b/tests/xfs/719
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/xfs
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/720 b/tests/xfs/720
index 2b6406da..f928cc43 100755
--- a/tests/xfs/720
+++ b/tests/xfs/720
@@ -17,10 +17,8 @@ _begin_fstest online_repair
 . ./common/inject
 . ./common/quota
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_xfs_io_command "falloc"
 _require_quota
 _require_user
diff --git a/tests/xfs/721 b/tests/xfs/721
index e6ccc8ba..c25cd269 100755
--- a/tests/xfs/721
+++ b/tests/xfs/721
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/722 b/tests/xfs/722
index f53d03b4..b96163e3 100755
--- a/tests/xfs/722
+++ b/tests/xfs/722
@@ -24,8 +24,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/723 b/tests/xfs/723
index b6af6ef1..21b608aa 100755
--- a/tests/xfs/723
+++ b/tests/xfs/723
@@ -24,8 +24,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/xfs
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/724 b/tests/xfs/724
index 2061b51f..a832063b 100755
--- a/tests/xfs/724
+++ b/tests/xfs/724
@@ -24,8 +24,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/xfs
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/725 b/tests/xfs/725
index 7317d048..2972aeb7 100755
--- a/tests/xfs/725
+++ b/tests/xfs/725
@@ -24,8 +24,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/xfs
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/726 b/tests/xfs/726
index e823f996..f4bedcca 100755
--- a/tests/xfs/726
+++ b/tests/xfs/726
@@ -24,8 +24,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/xfs
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/727 b/tests/xfs/727
index 6c5ac7db..2e882775 100755
--- a/tests/xfs/727
+++ b/tests/xfs/727
@@ -24,8 +24,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/xfs
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/728 b/tests/xfs/728
index 17ce9717..b4cf95f5 100755
--- a/tests/xfs/728
+++ b/tests/xfs/728
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/729 b/tests/xfs/729
index 235cb175..45d65892 100755
--- a/tests/xfs/729
+++ b/tests/xfs/729
@@ -22,8 +22,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub
 
diff --git a/tests/xfs/730 b/tests/xfs/730
index c6817e91..cd58d446 100755
--- a/tests/xfs/730
+++ b/tests/xfs/730
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/731 b/tests/xfs/731
index 595ab04d..8cc38f58 100755
--- a/tests/xfs/731
+++ b/tests/xfs/731
@@ -26,8 +26,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/732 b/tests/xfs/732
index a39a1f85..5a6c816a 100755
--- a/tests/xfs/732
+++ b/tests/xfs/732
@@ -26,8 +26,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_realtime
 _require_xfs_stress_scrub
diff --git a/tests/xfs/733 b/tests/xfs/733
index d9f9b1c2..71f16c25 100755
--- a/tests/xfs/733
+++ b/tests/xfs/733
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/734 b/tests/xfs/734
index 9ffe0df3..1ae020ea 100755
--- a/tests/xfs/734
+++ b/tests/xfs/734
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/735 b/tests/xfs/735
index 96a171ff..04bbcc5c 100755
--- a/tests/xfs/735
+++ b/tests/xfs/735
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/736 b/tests/xfs/736
index 4a6c4687..2314d12a 100755
--- a/tests/xfs/736
+++ b/tests/xfs/736
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/737 b/tests/xfs/737
index 6fc0bba4..d85d2512 100755
--- a/tests/xfs/737
+++ b/tests/xfs/737
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/738 b/tests/xfs/738
index e2f8a9c3..32f12a70 100755
--- a/tests/xfs/738
+++ b/tests/xfs/738
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/739 b/tests/xfs/739
index fb7fe2e6..a4f553d8 100755
--- a/tests/xfs/739
+++ b/tests/xfs/739
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
diff --git a/tests/xfs/740 b/tests/xfs/740
index a59fa37e..971bf31e 100755
--- a/tests/xfs/740
+++ b/tests/xfs/740
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
diff --git a/tests/xfs/741 b/tests/xfs/741
index 957bed79..4e24fb4e 100755
--- a/tests/xfs/741
+++ b/tests/xfs/741
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
diff --git a/tests/xfs/742 b/tests/xfs/742
index d9117484..eabe766d 100755
--- a/tests/xfs/742
+++ b/tests/xfs/742
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
diff --git a/tests/xfs/743 b/tests/xfs/743
index 69e865a4..b5cec7d7 100755
--- a/tests/xfs/743
+++ b/tests/xfs/743
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
diff --git a/tests/xfs/744 b/tests/xfs/744
index ea490b52..e2d097c2 100755
--- a/tests/xfs/744
+++ b/tests/xfs/744
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
diff --git a/tests/xfs/745 b/tests/xfs/745
index 7621d457..d139aeef 100755
--- a/tests/xfs/745
+++ b/tests/xfs/745
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
diff --git a/tests/xfs/746 b/tests/xfs/746
index 40123316..696d0245 100755
--- a/tests/xfs/746
+++ b/tests/xfs/746
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
diff --git a/tests/xfs/747 b/tests/xfs/747
index e3a8af77..03d0f5a4 100755
--- a/tests/xfs/747
+++ b/tests/xfs/747
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/748 b/tests/xfs/748
index c69e7a48..66b59fe4 100755
--- a/tests/xfs/748
+++ b/tests/xfs/748
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/749 b/tests/xfs/749
index a1a6530f..ea9c34a5 100755
--- a/tests/xfs/749
+++ b/tests/xfs/749
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/750 b/tests/xfs/750
index f9b65534..0f451ecd 100755
--- a/tests/xfs/750
+++ b/tests/xfs/750
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/751 b/tests/xfs/751
index a9634bfc..dfd9e09b 100755
--- a/tests/xfs/751
+++ b/tests/xfs/751
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/752 b/tests/xfs/752
index 9fb3f438..88c064e7 100755
--- a/tests/xfs/752
+++ b/tests/xfs/752
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/753 b/tests/xfs/753
index 151a964d..b0984e99 100755
--- a/tests/xfs/753
+++ b/tests/xfs/753
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/754 b/tests/xfs/754
index ad9078c4..9a378711 100755
--- a/tests/xfs/754
+++ b/tests/xfs/754
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/755 b/tests/xfs/755
index b83118b8..06b9cafe 100755
--- a/tests/xfs/755
+++ b/tests/xfs/755
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 _require_xfs_finobt
diff --git a/tests/xfs/756 b/tests/xfs/756
index 351c7ed4..02dfc222 100755
--- a/tests/xfs/756
+++ b/tests/xfs/756
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_scratch_rmapbt
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
diff --git a/tests/xfs/757 b/tests/xfs/757
index 06b360fd..46391e1e 100755
--- a/tests/xfs/757
+++ b/tests/xfs/757
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_scratch_rmapbt
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
diff --git a/tests/xfs/758 b/tests/xfs/758
index d2b6e46c..2a32c2f2 100755
--- a/tests/xfs/758
+++ b/tests/xfs/758
@@ -19,8 +19,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/fuzzy
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
diff --git a/tests/xfs/759 b/tests/xfs/759
index 8ed3f0b6..117dc6b1 100755
--- a/tests/xfs/759
+++ b/tests/xfs/759
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/760 b/tests/xfs/760
index 47a5dd3d..f5032b95 100755
--- a/tests/xfs/760
+++ b/tests/xfs/760
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/761 b/tests/xfs/761
index 87d302da..19a2a273 100755
--- a/tests/xfs/761
+++ b/tests/xfs/761
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/762 b/tests/xfs/762
index 0ce1773b..98c48e89 100755
--- a/tests/xfs/762
+++ b/tests/xfs/762
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/763 b/tests/xfs/763
index 98145351..430c01ba 100755
--- a/tests/xfs/763
+++ b/tests/xfs/763
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/764 b/tests/xfs/764
index 3addb9c8..83378ae2 100755
--- a/tests/xfs/764
+++ b/tests/xfs/764
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/765 b/tests/xfs/765
index 1a260c3a..28c96737 100755
--- a/tests/xfs/765
+++ b/tests/xfs/765
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/766 b/tests/xfs/766
index b0ff2ad4..c241d992 100755
--- a/tests/xfs/766
+++ b/tests/xfs/766
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/767 b/tests/xfs/767
index 8ca7e7d4..8fd5dded 100755
--- a/tests/xfs/767
+++ b/tests/xfs/767
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/768 b/tests/xfs/768
index a8faad7e..f77e0942 100755
--- a/tests/xfs/768
+++ b/tests/xfs/768
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/769 b/tests/xfs/769
index e3b439bc..f09424e9 100755
--- a/tests/xfs/769
+++ b/tests/xfs/769
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/770 b/tests/xfs/770
index da12e0a2..96a64142 100755
--- a/tests/xfs/770
+++ b/tests/xfs/770
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/771 b/tests/xfs/771
index c1e8b38f..568c6fd7 100755
--- a/tests/xfs/771
+++ b/tests/xfs/771
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/772 b/tests/xfs/772
index 50577feb..a5588771 100755
--- a/tests/xfs/772
+++ b/tests/xfs/772
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/773 b/tests/xfs/773
index 8d37e0f4..e4e91d65 100755
--- a/tests/xfs/773
+++ b/tests/xfs/773
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/774 b/tests/xfs/774
index ad5d4d71..ca01eb2f 100755
--- a/tests/xfs/774
+++ b/tests/xfs/774
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/775 b/tests/xfs/775
index ec98d688..89f20ad6 100755
--- a/tests/xfs/775
+++ b/tests/xfs/775
@@ -19,8 +19,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/fuzzy
 . ./common/reflink
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_reflink
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
diff --git a/tests/xfs/776 b/tests/xfs/776
index a7b7adda..cfa5874f 100755
--- a/tests/xfs/776
+++ b/tests/xfs/776
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/777 b/tests/xfs/777
index 496a28d5..de30fa32 100755
--- a/tests/xfs/777
+++ b/tests/xfs/777
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/778 b/tests/xfs/778
index 72f7d0dc..893187d7 100755
--- a/tests/xfs/778
+++ b/tests/xfs/778
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/779 b/tests/xfs/779
index 05f27186..7c338b1c 100755
--- a/tests/xfs/779
+++ b/tests/xfs/779
@@ -19,8 +19,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/fuzzy
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 _require_quota
diff --git a/tests/xfs/780 b/tests/xfs/780
index 9dd8f452..06194d32 100755
--- a/tests/xfs/780
+++ b/tests/xfs/780
@@ -19,8 +19,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/fuzzy
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 _require_quota
diff --git a/tests/xfs/781 b/tests/xfs/781
index 604c9bdd..7113a143 100755
--- a/tests/xfs/781
+++ b/tests/xfs/781
@@ -19,8 +19,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/fuzzy
 . ./common/quota
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 _require_quota
diff --git a/tests/xfs/782 b/tests/xfs/782
index c113ea5a..ba89d219 100755
--- a/tests/xfs/782
+++ b/tests/xfs/782
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/783 b/tests/xfs/783
index bbc621ba..32f4ddfc 100755
--- a/tests/xfs/783
+++ b/tests/xfs/783
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/784 b/tests/xfs/784
index 595f0fa8..b7067efc 100755
--- a/tests/xfs/784
+++ b/tests/xfs/784
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/785 b/tests/xfs/785
index 577ef772..a51f62e8 100755
--- a/tests/xfs/785
+++ b/tests/xfs/785
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/786 b/tests/xfs/786
index 73b161d9..0a8bde8c 100755
--- a/tests/xfs/786
+++ b/tests/xfs/786
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 
 echo "Format and populate"
diff --git a/tests/xfs/787 b/tests/xfs/787
index 7477c505..090c3f8b 100755
--- a/tests/xfs/787
+++ b/tests/xfs/787
@@ -18,8 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/788 b/tests/xfs/788
index c2c54cda..46438eab 100755
--- a/tests/xfs/788
+++ b/tests/xfs/788
@@ -17,8 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch_xfs_fuzz_fields
 _disable_dmesg_check
 
diff --git a/tests/xfs/789 b/tests/xfs/789
index e3a332d7..ce88506f 100755
--- a/tests/xfs/789
+++ b/tests/xfs/789
@@ -19,8 +19,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_io_command swapext
 _require_test
 
diff --git a/tests/xfs/790 b/tests/xfs/790
index 88b79611..53e8906b 100755
--- a/tests/xfs/790
+++ b/tests/xfs/790
@@ -22,8 +22,6 @@ _cleanup()
 . ./common/reflink
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_io_command exchangerange
 _require_test_program "punch-alternating"
 _require_xfs_io_command startupdate
diff --git a/tests/xfs/791 b/tests/xfs/791
index 62d89f71..bca58042 100755
--- a/tests/xfs/791
+++ b/tests/xfs/791
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_io_command exchangerange
 _require_xfs_scratch_atomicswap
 _require_xfs_io_error_injection "bmap_finish_one"
diff --git a/tests/xfs/792 b/tests/xfs/792
index 1da36fb9..cdfa6369 100755
--- a/tests/xfs/792
+++ b/tests/xfs/792
@@ -23,8 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/inject
 
-# real QA test starts here
-_supported_fs xfs
 _require_xfs_io_command exchangerange
 _require_xfs_io_command startupdate '-e'
 _require_xfs_scratch_atomicswap
diff --git a/tests/xfs/793 b/tests/xfs/793
index 961c33e3..d942d980 100755
--- a/tests/xfs/793
+++ b/tests/xfs/793
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_realtime
 _require_scratch
 _require_xfs_stress_online_repair
diff --git a/tests/xfs/794 b/tests/xfs/794
index eeb1ceb8..cdccf969 100755
--- a/tests/xfs/794
+++ b/tests/xfs/794
@@ -24,8 +24,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/xfs
 . ./common/attr
 
-# real QA test starts here
-_supported_fs xfs
 _require_attrs
 _require_scratch
 _require_xfs_stress_online_repair
diff --git a/tests/xfs/795 b/tests/xfs/795
index a4e65921..5a67f02e 100755
--- a/tests/xfs/795
+++ b/tests/xfs/795
@@ -17,10 +17,8 @@ _begin_fstest online_repair
 . ./common/inject
 . ./common/quota
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_quota
 _require_user
 _require_scratch
diff --git a/tests/xfs/796 b/tests/xfs/796
index 907e9b59..e6a88cc6 100755
--- a/tests/xfs/796
+++ b/tests/xfs/796
@@ -22,8 +22,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/797 b/tests/xfs/797
index 08117808..642930f2 100755
--- a/tests/xfs/797
+++ b/tests/xfs/797
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/798 b/tests/xfs/798
index 03e94e8e..4ce79282 100755
--- a/tests/xfs/798
+++ b/tests/xfs/798
@@ -14,10 +14,8 @@ _begin_fstest auto quick online_repair
 . ./common/fuzzy
 . ./common/filter
 
-# real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
 _require_scratch_nocheck
 _require_scrub
 _require_xfs_db_command "fuzz"
diff --git a/tests/xfs/799 b/tests/xfs/799
index 4391686e..0a43eb01 100755
--- a/tests/xfs/799
+++ b/tests/xfs/799
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_online_repair
 
diff --git a/tests/xfs/800 b/tests/xfs/800
index a23e4733..f12ef69e 100755
--- a/tests/xfs/800
+++ b/tests/xfs/800
@@ -23,8 +23,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/inject
 . ./common/xfs
 
-# real QA test starts here
-_supported_fs xfs
 _require_scratch
 _require_xfs_stress_scrub