diff --git a/tests/xfs/876 b/tests/xfs/331
similarity index 99%
rename from tests/xfs/876
rename to tests/xfs/331
index dae3f3aa..8a7692d8 100755
--- a/tests/xfs/876
+++ b/tests/xfs/331
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 876
+# FS QA Test No. 331
 #
 # Create a big enough rmapbt that we tickle a fdblocks accounting bug.
 #
diff --git a/tests/xfs/876.out b/tests/xfs/331.out
similarity index 68%
rename from tests/xfs/876.out
rename to tests/xfs/331.out
index 96c19704..fed40254 100644
--- a/tests/xfs/876.out
+++ b/tests/xfs/331.out
@@ -1,4 +1,4 @@
-QA output created by 876
+QA output created by 331
 + create scratch fs
 + mount fs image
 + make some files
diff --git a/tests/xfs/877 b/tests/xfs/332
similarity index 99%
rename from tests/xfs/877
rename to tests/xfs/332
index 04fdb4c5..e10c53bc 100755
--- a/tests/xfs/877
+++ b/tests/xfs/332
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 877
+# FS QA Test No. 332
 #
 # Make sure query_range returns -EINVAL if lowkey > highkey.
 #
diff --git a/tests/xfs/877.out b/tests/xfs/332.out
similarity index 88%
rename from tests/xfs/877.out
rename to tests/xfs/332.out
index 4a2242f4..9beff7cc 100644
--- a/tests/xfs/877.out
+++ b/tests/xfs/332.out
@@ -1,4 +1,4 @@
-QA output created by 877
+QA output created by 332
 Format and mount
 Create some files
 Manipulate file
diff --git a/tests/xfs/878 b/tests/xfs/333
similarity index 99%
rename from tests/xfs/878
rename to tests/xfs/333
index c9ec8c6b..f7f233d1 100755
--- a/tests/xfs/878
+++ b/tests/xfs/333
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 878
+# FS QA Test No. 333
 #
 # Set rrmapino to another inode on an non-rt rmap fs and see if repair fixes it.
 #
diff --git a/tests/xfs/878.out b/tests/xfs/333.out
similarity index 87%
rename from tests/xfs/878.out
rename to tests/xfs/333.out
index e1345068..bee9bbcc 100644
--- a/tests/xfs/878.out
+++ b/tests/xfs/333.out
@@ -1,4 +1,4 @@
-QA output created by 878
+QA output created by 333
 Format and mount
 Create some files
 Corrupt fs
diff --git a/tests/xfs/879 b/tests/xfs/334
similarity index 98%
rename from tests/xfs/879
rename to tests/xfs/334
index 247b3afb..1eb1e38f 100755
--- a/tests/xfs/879
+++ b/tests/xfs/334
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 879
+# FS QA Test No. 334
 #
 # Ensure that we can create a few realtime files on a rmapbt filesystem.
 #
diff --git a/tests/xfs/879.out b/tests/xfs/334.out
similarity index 86%
rename from tests/xfs/879.out
rename to tests/xfs/334.out
index 9dfe48b4..fea41f9f 100644
--- a/tests/xfs/879.out
+++ b/tests/xfs/334.out
@@ -1,4 +1,4 @@
-QA output created by 879
+QA output created by 334
 Format and mount
 Create a few files
 Grab contents
diff --git a/tests/xfs/880 b/tests/xfs/335
similarity index 99%
rename from tests/xfs/880
rename to tests/xfs/335
index 7c3879e8..5e48f59b 100755
--- a/tests/xfs/880
+++ b/tests/xfs/335
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 880
+# FS QA Test No. 335
 #
 # Exercise expanding and shrinking the realtime rmap btree.
 #
diff --git a/tests/xfs/880.out b/tests/xfs/335.out
similarity index 84%
rename from tests/xfs/880.out
rename to tests/xfs/335.out
index b87665be..e7bc0b9a 100644
--- a/tests/xfs/880.out
+++ b/tests/xfs/335.out
@@ -1,4 +1,4 @@
-QA output created by 880
+QA output created by 335
 Format and mount
 Create a three-level rtrmapbt
 Create big file
diff --git a/tests/xfs/881 b/tests/xfs/336
similarity index 99%
rename from tests/xfs/881
rename to tests/xfs/336
index 437895cf..b3b703d1 100755
--- a/tests/xfs/881
+++ b/tests/xfs/336
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 881
+# FS QA Test No. 336
 #
 # Exercise metadump on realtime rmapbt preservation.
 #
diff --git a/tests/xfs/881.out b/tests/xfs/336.out
similarity index 84%
rename from tests/xfs/881.out
rename to tests/xfs/336.out
index 6ad156cd..aa61973d 100644
--- a/tests/xfs/881.out
+++ b/tests/xfs/336.out
@@ -1,4 +1,4 @@
-QA output created by 881
+QA output created by 336
 Format and mount
 Create a three-level rtrmapbt
 Create big file
diff --git a/tests/xfs/882 b/tests/xfs/337
similarity index 99%
rename from tests/xfs/882
rename to tests/xfs/337
index 17bd4f09..96a7be09 100755
--- a/tests/xfs/882
+++ b/tests/xfs/337
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 882
+# FS QA Test No. 337
 #
 # Corrupt the realtime rmapbt and see how the kernel and xfs_repair deal.
 #
diff --git a/tests/xfs/882.out b/tests/xfs/337.out
similarity index 86%
rename from tests/xfs/882.out
rename to tests/xfs/337.out
index 5ebe6202..1ee2db79 100644
--- a/tests/xfs/882.out
+++ b/tests/xfs/337.out
@@ -1,4 +1,4 @@
-QA output created by 882
+QA output created by 337
 + create scratch fs
 + mount fs image
 + make some files
diff --git a/tests/xfs/883 b/tests/xfs/338
similarity index 99%
rename from tests/xfs/883
rename to tests/xfs/338
index 8b20b2be..755510c8 100755
--- a/tests/xfs/883
+++ b/tests/xfs/338
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 883
+# FS QA Test No. 338
 #
 # Set rrmapino to zero on an rtrmap fs and see if repair fixes it.
 #
diff --git a/tests/xfs/883.out b/tests/xfs/338.out
similarity index 82%
rename from tests/xfs/883.out
rename to tests/xfs/338.out
index ac5117f6..751d87b6 100644
--- a/tests/xfs/883.out
+++ b/tests/xfs/338.out
@@ -1,4 +1,4 @@
-QA output created by 883
+QA output created by 338
 Format and mount
 Create some files
 Corrupt fs
diff --git a/tests/xfs/884 b/tests/xfs/339
similarity index 99%
rename from tests/xfs/884
rename to tests/xfs/339
index 3097fa00..734d47bb 100755
--- a/tests/xfs/884
+++ b/tests/xfs/339
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 884
+# FS QA Test No. 339
 #
 # Link rrmapino into the rootdir on an rtrmap fs and see if repair fixes it.
 #
diff --git a/tests/xfs/884.out b/tests/xfs/339.out
similarity index 87%
rename from tests/xfs/884.out
rename to tests/xfs/339.out
index 17a73eff..7b0a775b 100644
--- a/tests/xfs/884.out
+++ b/tests/xfs/339.out
@@ -1,4 +1,4 @@
-QA output created by 884
+QA output created by 339
 Format and mount
 Create some files
 Corrupt fs
diff --git a/tests/xfs/885 b/tests/xfs/340
similarity index 99%
rename from tests/xfs/885
rename to tests/xfs/340
index 3e8aba9e..8cc50a29 100755
--- a/tests/xfs/885
+++ b/tests/xfs/340
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 885
+# FS QA Test No. 340
 #
 # Set rrmapino to another inode on an rtrmap fs and see if repair fixes it.
 #
diff --git a/tests/xfs/885.out b/tests/xfs/340.out
similarity index 82%
rename from tests/xfs/885.out
rename to tests/xfs/340.out
index 8bfd9b37..2f1e4110 100644
--- a/tests/xfs/885.out
+++ b/tests/xfs/340.out
@@ -1,4 +1,4 @@
-QA output created by 885
+QA output created by 340
 Format and mount
 Create some files
 Corrupt fs
diff --git a/tests/xfs/886 b/tests/xfs/341
similarity index 99%
rename from tests/xfs/886
rename to tests/xfs/341
index 59704c79..8a47b77f 100755
--- a/tests/xfs/886
+++ b/tests/xfs/341
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 886
+# FS QA Test No. 341
 #
 # Cross-link file block into rtrmapbt and see if repair fixes it.
 #
diff --git a/tests/xfs/886.out b/tests/xfs/341.out
similarity index 82%
rename from tests/xfs/886.out
rename to tests/xfs/341.out
index 7f00c5de..75a5bc6c 100644
--- a/tests/xfs/886.out
+++ b/tests/xfs/341.out
@@ -1,4 +1,4 @@
-QA output created by 886
+QA output created by 341
 Format and mount
 Create some files
 Corrupt fs
diff --git a/tests/xfs/887 b/tests/xfs/342
similarity index 99%
rename from tests/xfs/887
rename to tests/xfs/342
index 9a145431..e0d2f333 100755
--- a/tests/xfs/887
+++ b/tests/xfs/342
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 887
+# FS QA Test No. 342
 #
 # Cross-link rtrmapbt block into a file and see if repair fixes it.
 #
diff --git a/tests/xfs/887.out b/tests/xfs/342.out
similarity index 82%
rename from tests/xfs/887.out
rename to tests/xfs/342.out
index 30cf0321..340ab9d7 100644
--- a/tests/xfs/887.out
+++ b/tests/xfs/342.out
@@ -1,4 +1,4 @@
-QA output created by 887
+QA output created by 342
 Format and mount
 Create some files
 Corrupt fs
diff --git a/tests/xfs/888 b/tests/xfs/343
similarity index 99%
rename from tests/xfs/888
rename to tests/xfs/343
index 2441bfdd..19b3c8c9 100755
--- a/tests/xfs/888
+++ b/tests/xfs/343
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 888
+# FS QA Test No. 343
 #
 # Basic rmap manipulation tests for realtime files.
 #
diff --git a/tests/xfs/888.out b/tests/xfs/343.out
similarity index 81%
rename from tests/xfs/888.out
rename to tests/xfs/343.out
index 2587697b..b26afd5b 100644
--- a/tests/xfs/888.out
+++ b/tests/xfs/343.out
@@ -1,4 +1,4 @@
-QA output created by 888
+QA output created by 343
 Format and mount
 Create some files
 Manipulate file
diff --git a/tests/xfs/897 b/tests/xfs/344
similarity index 99%
rename from tests/xfs/897
rename to tests/xfs/344
index e7da5c0c..25bff1af 100755
--- a/tests/xfs/897
+++ b/tests/xfs/344
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 897
+# FS QA Test No. 344
 #
 # Test fragmentation after a lot of random CoW:
 # - Create two reflinked files.  Set zero extsz hint on second file.
diff --git a/tests/xfs/344.out b/tests/xfs/344.out
new file mode 100644
index 00000000..50fffc9c
--- /dev/null
+++ b/tests/xfs/344.out
@@ -0,0 +1,10 @@
+QA output created by 344
+Format and mount
+Create the original files
+Compare files
+2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-344/file1
+2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-344/file2
+CoW and unmount
+Compare files
+2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-344/file1
+Check extent counts
diff --git a/tests/xfs/898 b/tests/xfs/345
similarity index 99%
rename from tests/xfs/898
rename to tests/xfs/345
index aa62ee26..edb4443f 100755
--- a/tests/xfs/898
+++ b/tests/xfs/345
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 898
+# FS QA Test No. 345
 #
 # Test fragmentation after a lot of random CoW:
 # - Create two reflinked files.  Set zero extsz hint on second file.
diff --git a/tests/xfs/345.out b/tests/xfs/345.out
new file mode 100644
index 00000000..ebb90b41
--- /dev/null
+++ b/tests/xfs/345.out
@@ -0,0 +1,10 @@
+QA output created by 345
+Format and mount
+Create the original files
+Compare files
+2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-345/file1
+2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-345/file2
+CoW and unmount
+Compare files
+2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-345/file1
+Check extent counts
diff --git a/tests/xfs/899 b/tests/xfs/346
similarity index 99%
rename from tests/xfs/899
rename to tests/xfs/346
index 0eea9151..d0463eb5 100755
--- a/tests/xfs/899
+++ b/tests/xfs/346
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 899
+# FS QA Test No. 346
 #
 # Test fragmentation after writing and dropping CoW extent hint reservation:
 # - Create two reflinked files.  Set extsz hint on second file.
diff --git a/tests/xfs/346.out b/tests/xfs/346.out
new file mode 100644
index 00000000..17d2c4ef
--- /dev/null
+++ b/tests/xfs/346.out
@@ -0,0 +1,10 @@
+QA output created by 346
+Format and mount
+Create the original files
+Compare files
+2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-346/file1
+2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-346/file2
+CoW and unmount
+Compare files
+2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-346/file1
+Check extent counts
diff --git a/tests/xfs/900 b/tests/xfs/347
similarity index 99%
rename from tests/xfs/900
rename to tests/xfs/347
index 659ca23e..15782168 100755
--- a/tests/xfs/900
+++ b/tests/xfs/347
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 900
+# FS QA Test No. 347
 #
 # Test fragmentation after writing and dropping CoW extent hint reservation:
 # - Create two reflinked files.  Set extsz hint on second file.
diff --git a/tests/xfs/347.out b/tests/xfs/347.out
new file mode 100644
index 00000000..08c1e0e2
--- /dev/null
+++ b/tests/xfs/347.out
@@ -0,0 +1,10 @@
+QA output created by 347
+Format and mount
+Create the original files
+Compare files
+2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-347/file1
+2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-347/file2
+CoW and unmount
+Compare files
+2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-347/file1
+Check extent counts
diff --git a/tests/xfs/897.out b/tests/xfs/897.out
deleted file mode 100644
index b4185524..00000000
--- a/tests/xfs/897.out
+++ /dev/null
@@ -1,10 +0,0 @@
-QA output created by 897
-Format and mount
-Create the original files
-Compare files
-2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-897/file1
-2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-897/file2
-CoW and unmount
-Compare files
-2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-897/file1
-Check extent counts
diff --git a/tests/xfs/898.out b/tests/xfs/898.out
deleted file mode 100644
index e50bb3b2..00000000
--- a/tests/xfs/898.out
+++ /dev/null
@@ -1,10 +0,0 @@
-QA output created by 898
-Format and mount
-Create the original files
-Compare files
-2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-898/file1
-2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-898/file2
-CoW and unmount
-Compare files
-2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-898/file1
-Check extent counts
diff --git a/tests/xfs/899.out b/tests/xfs/899.out
deleted file mode 100644
index fd3d7fe9..00000000
--- a/tests/xfs/899.out
+++ /dev/null
@@ -1,10 +0,0 @@
-QA output created by 899
-Format and mount
-Create the original files
-Compare files
-2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-899/file1
-2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-899/file2
-CoW and unmount
-Compare files
-2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-899/file1
-Check extent counts
diff --git a/tests/xfs/900.out b/tests/xfs/900.out
deleted file mode 100644
index 5ebf3e92..00000000
--- a/tests/xfs/900.out
+++ /dev/null
@@ -1,10 +0,0 @@
-QA output created by 900
-Format and mount
-Create the original files
-Compare files
-2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-900/file1
-2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-900/file2
-CoW and unmount
-Compare files
-2909feb63a37b0e95fe5cfb7f274f7b1  SCRATCH_MNT/test-900/file1
-Check extent counts
diff --git a/tests/xfs/group b/tests/xfs/group
index 02e34dc1..3296eb98 100644
--- a/tests/xfs/group
+++ b/tests/xfs/group
@@ -316,20 +316,20 @@
 328 auto quick clone fsr
 329 auto quick clone fsr
 330 auto quick clone fsr quota
-876 auto quick rmap clone
-877 auto quick rmap clone
-878 auto quick rmap
-879 auto quick rmap
-880 auto rmap
-881 auto rmap
-882 fuzzers rmap
-883 auto quick rmap
-884 auto quick rmap
-885 auto quick rmap
-886 auto quick rmap
-887 auto quick rmap
-888 auto quick rmap
-897 auto quick clone
-898 auto quick clone
-899 auto quick clone
-900 auto quick clone
+331 auto quick rmap clone
+332 auto quick rmap clone
+333 auto quick rmap
+334 auto quick rmap
+335 auto rmap
+336 auto rmap
+337 fuzzers rmap
+338 auto quick rmap
+339 auto quick rmap
+340 auto quick rmap
+341 auto quick rmap
+342 auto quick rmap
+343 auto quick rmap
+344 auto quick clone
+345 auto quick clone
+346 auto quick clone
+347 auto quick clone