diff --git a/doc/group-names.txt b/doc/group-names.txt
index 25a982b6740504..8e1a62331738bb 100644
--- a/doc/group-names.txt
+++ b/doc/group-names.txt
@@ -30,7 +30,6 @@ copy			xfs_copy functionality
 copy_range		copy_file_range syscall
 copyup			overlayfs copyup
 dangerous		dangerous test that can crash the system
-dangerous_bothrepair	fuzzers to evaluate xfs_scrub + xfs_repair repair
 dangerous_fuzzers	fuzzers that can crash your computer
 dangerous_norepair	fuzzers to evaluate kernel metadata verifiers
 dangerous_scrub		fuzzers to evaluate xfs_scrub checking
@@ -56,6 +55,7 @@ fsproperties		Filesystem properties
 fsr			XFS free space reorganizer
 fsstress_online_repair	race fsstress and xfs_scrub online repair
 fsstress_scrub		race fsstress and xfs_scrub checking
+fuzzers_bothrepair	fuzzers to evaluate xfs_scrub + xfs_repair repair
 fuzzers			filesystem fuzz tests
 fuzzers_online_repair	fuzzers to evaluate xfs_scrub online repair
 fuzzers_repair		fuzzers to evaluate xfs_repair offline repair
diff --git a/tests/xfs/743 b/tests/xfs/743
index b5cec7d71a4002..90b3872440cb07 100755
--- a/tests/xfs/743
+++ b/tests/xfs/743
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_scrub dangerous_bothrepair realtime
+_begin_fstest dangerous_fuzzers dangerous_scrub fuzzers_bothrepair realtime
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/744 b/tests/xfs/744
index e2d097c2f0d59f..e7778417b53ff4 100755
--- a/tests/xfs/744
+++ b/tests/xfs/744
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_scrub dangerous_bothrepair realtime
+_begin_fstest dangerous_fuzzers dangerous_scrub fuzzers_bothrepair realtime
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/747 b/tests/xfs/747
index 03d0f5a42c67ec..37682e3c11e8be 100755
--- a/tests/xfs/747
+++ b/tests/xfs/747
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/748 b/tests/xfs/748
index 66b59fe44f2568..c7a89a1c9d5355 100755
--- a/tests/xfs/748
+++ b/tests/xfs/748
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/749 b/tests/xfs/749
index ea9c34a5002b02..37f96e6f7c250e 100755
--- a/tests/xfs/749
+++ b/tests/xfs/749
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/750 b/tests/xfs/750
index 0f451ecdacde2c..1bc6d5d4042535 100755
--- a/tests/xfs/750
+++ b/tests/xfs/750
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/751 b/tests/xfs/751
index dfd9e09b00bd33..542ca4261430c8 100755
--- a/tests/xfs/751
+++ b/tests/xfs/751
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/752 b/tests/xfs/752
index 88c064e73f92f8..f985e52fbdfeb6 100755
--- a/tests/xfs/752
+++ b/tests/xfs/752
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/753 b/tests/xfs/753
index b0984e99a35599..d4d30c165784f7 100755
--- a/tests/xfs/753
+++ b/tests/xfs/753
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/754 b/tests/xfs/754
index 9a37871125a34b..6464e52b88d3dd 100755
--- a/tests/xfs/754
+++ b/tests/xfs/754
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/755 b/tests/xfs/755
index 06b9cafe68b914..f287880d84b72b 100755
--- a/tests/xfs/755
+++ b/tests/xfs/755
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/756 b/tests/xfs/756
index 02dfc222cceeb3..0f6ffc5527a07e 100755
--- a/tests/xfs/756
+++ b/tests/xfs/756
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/757 b/tests/xfs/757
index 46391e1e9a5fe0..21357b83657945 100755
--- a/tests/xfs/757
+++ b/tests/xfs/757
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/758 b/tests/xfs/758
index 2a32c2f2836e27..4652e1c3b88d2f 100755
--- a/tests/xfs/758
+++ b/tests/xfs/758
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/759 b/tests/xfs/759
index 117dc6b1cb9c39..0c0f323fd3a8b0 100755
--- a/tests/xfs/759
+++ b/tests/xfs/759
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/760 b/tests/xfs/760
index f5032b95e55fd5..46aed18dc611a4 100755
--- a/tests/xfs/760
+++ b/tests/xfs/760
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/761 b/tests/xfs/761
index 19a2a273ce708a..10030e42ed3e8f 100755
--- a/tests/xfs/761
+++ b/tests/xfs/761
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/762 b/tests/xfs/762
index 98c48e89ddadc2..cf094ac43b408f 100755
--- a/tests/xfs/762
+++ b/tests/xfs/762
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/763 b/tests/xfs/763
index 430c01ba55eb4c..745684bd4bdd01 100755
--- a/tests/xfs/763
+++ b/tests/xfs/763
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/764 b/tests/xfs/764
index 83378ae2fa13c4..f970e1fe5830bf 100755
--- a/tests/xfs/764
+++ b/tests/xfs/764
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/765 b/tests/xfs/765
index 28c96737ca7dd1..ff0227ee0b9f32 100755
--- a/tests/xfs/765
+++ b/tests/xfs/765
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/766 b/tests/xfs/766
index c241d992bf2d09..bc09949278a374 100755
--- a/tests/xfs/766
+++ b/tests/xfs/766
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/767 b/tests/xfs/767
index 8fd5dded9c4fd0..bdc2d559e0dc72 100755
--- a/tests/xfs/767
+++ b/tests/xfs/767
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/768 b/tests/xfs/768
index f77e0942b7fb51..0f25cb4338247b 100755
--- a/tests/xfs/768
+++ b/tests/xfs/768
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/769 b/tests/xfs/769
index f09424e9e666a1..5eee69e498ba21 100755
--- a/tests/xfs/769
+++ b/tests/xfs/769
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/770 b/tests/xfs/770
index 96a64142f92b7c..baadda2b282a92 100755
--- a/tests/xfs/770
+++ b/tests/xfs/770
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/771 b/tests/xfs/771
index 568c6fd793a642..1eaeaf82ea99e2 100755
--- a/tests/xfs/771
+++ b/tests/xfs/771
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/772 b/tests/xfs/772
index a558877144daa7..a4f0fbac3715bb 100755
--- a/tests/xfs/772
+++ b/tests/xfs/772
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/773 b/tests/xfs/773
index e4e91d65fa9095..93e1d36c21daea 100755
--- a/tests/xfs/773
+++ b/tests/xfs/773
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/774 b/tests/xfs/774
index ca01eb2f4f8dd4..b4dad7d9933e73 100755
--- a/tests/xfs/774
+++ b/tests/xfs/774
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/775 b/tests/xfs/775
index 89f20ad6d255a2..736dfde68cd1a9 100755
--- a/tests/xfs/775
+++ b/tests/xfs/775
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/776 b/tests/xfs/776
index cfa5874ffd6479..6f86e43c465a76 100755
--- a/tests/xfs/776
+++ b/tests/xfs/776
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/777 b/tests/xfs/777
index de30fa32f2a54b..f3fa114e020b67 100755
--- a/tests/xfs/777
+++ b/tests/xfs/777
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/778 b/tests/xfs/778
index 893187d738a2a4..20d91fb3e1f254 100755
--- a/tests/xfs/778
+++ b/tests/xfs/778
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/779 b/tests/xfs/779
index 7c338b1c215abd..60b10511c8a7cd 100755
--- a/tests/xfs/779
+++ b/tests/xfs/779
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/780 b/tests/xfs/780
index 06194d3250c83d..1789c0468e2009 100755
--- a/tests/xfs/780
+++ b/tests/xfs/780
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/781 b/tests/xfs/781
index 7113a143406839..edbf195738b3b2 100755
--- a/tests/xfs/781
+++ b/tests/xfs/781
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/782 b/tests/xfs/782
index ba89d2198cc5fe..1e86dc2d68d600 100755
--- a/tests/xfs/782
+++ b/tests/xfs/782
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 #
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/783 b/tests/xfs/783
index 32f4ddfc9cc36d..dcb1292217d37d 100755
--- a/tests/xfs/783
+++ b/tests/xfs/783
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 #
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_scrub dangerous_bothrepair
+_begin_fstest dangerous_fuzzers dangerous_scrub fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/784 b/tests/xfs/784
index b7067efc60c447..286797257e025e 100755
--- a/tests/xfs/784
+++ b/tests/xfs/784
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 #
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_scrub dangerous_bothrepair
+_begin_fstest dangerous_fuzzers dangerous_scrub fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
diff --git a/tests/xfs/787 b/tests/xfs/787
index 090c3f8b9e1f10..d610ff5a47dfdb 100755
--- a/tests/xfs/787
+++ b/tests/xfs/787
@@ -9,7 +9,7 @@
 # to test the most likely usage pattern.
 
 . ./common/preamble
-_begin_fstest dangerous_fuzzers dangerous_bothrepair
+_begin_fstest dangerous_fuzzers fuzzers_bothrepair
 
 _register_cleanup "_cleanup" BUS
 
