Google Git
Sign in
qemu / qemu / 9dd003a99842d1d82c336e45c5cce656149de382^! / . / tests
commit9dd003a99842d1d82c336e45c5cce656149de382[log] [tgz]
authorVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>Sat Jan 16 16:44:19 2021 +0300
committerEric Blake <eblake@redhat.com>Wed Jan 20 14:53:22 2021 -0600
tree0498e5ed21018e3d50662ac202f5b19dc5fd0e26
parent92a476e9598ebcd03c6dc798dc7024ed9d31b6f1 [diff]
iotests: define group in each iotest

We are going to drop group file. Define group in tests as a preparatory
step.

The patch is generated by

    cd tests/qemu-iotests

    grep '^[0-9]\{3\} ' group | while read line; do
        file=$(awk '{print $1}' <<< "$line");
        groups=$(sed -e 's/^... //' <<< "$line");
        awk "NR==2{print \"# group: $groups\"}1" $file > tmp;
        cat tmp > $file;
    done

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20210116134424.82867-7-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/tests/qemu-iotests/001 b/tests/qemu-iotests/001
index 696726e..6f980fd 100755
--- a/tests/qemu-iotests/001
+++ b/tests/qemu-iotests/001

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test simple read/write using plain bdrv_pread/bdrv_pwrite
 #

diff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002
index 1a0d411..5ce1647 100755
--- a/tests/qemu-iotests/002
+++ b/tests/qemu-iotests/002

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test simple read/write using plain bdrv_pread/bdrv_pwrite
 #

diff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003
index 33eeade..03f902a 100755
--- a/tests/qemu-iotests/003
+++ b/tests/qemu-iotests/003

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto
 #
 # Test simple read/write using bdrv_aio_readv/bdrv_aio_writev
 #

diff --git a/tests/qemu-iotests/004 b/tests/qemu-iotests/004
index d308dc4..e955579 100755
--- a/tests/qemu-iotests/004
+++ b/tests/qemu-iotests/004

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Make sure we can't read and write outside of the image size.
 #

diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
index b6d03ac..40e64a9 100755
--- a/tests/qemu-iotests/005
+++ b/tests/qemu-iotests/005

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: img auto quick
 #
 # Make sure qemu-img can create 5TB images
 #

diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007
index 160683a..936d3f1 100755
--- a/tests/qemu-iotests/007
+++ b/tests/qemu-iotests/007

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: snapshot auto
 #
 # Check for one possible case of qcow2 refcount corruption.
 #

diff --git a/tests/qemu-iotests/008 b/tests/qemu-iotests/008
index 2b81b11..fa4990b 100755
--- a/tests/qemu-iotests/008
+++ b/tests/qemu-iotests/008

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test simple asynchronous read/write operations.
 #

diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009
index 4dc7d21..efa852b 100755
--- a/tests/qemu-iotests/009
+++ b/tests/qemu-iotests/009

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Nolan I qcow2 corruption - incorrectly reports free clusters
 #

diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010
index df809b3..4ae9027 100755
--- a/tests/qemu-iotests/010
+++ b/tests/qemu-iotests/010

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Nolan II qcow2 corruption - wrong used cluster
 #

diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011
index 57b99ae..5c99ac9 100755
--- a/tests/qemu-iotests/011
+++ b/tests/qemu-iotests/011

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test for AIO allocation on the same cluster
 #

diff --git a/tests/qemu-iotests/012 b/tests/qemu-iotests/012
index 1295728..3a24d2c 100755
--- a/tests/qemu-iotests/012
+++ b/tests/qemu-iotests/012

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: auto quick
 #
 # Make sure we can open read-only images
 #

diff --git a/tests/qemu-iotests/013 b/tests/qemu-iotests/013
index 5cb9032..d39d0cd 100755
--- a/tests/qemu-iotests/013
+++ b/tests/qemu-iotests/013

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto
 #
 # qcow2 pattern test, empty and compressed image - 4k cluster patterns
 #

diff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014
index e1221c0..2d23469 100755
--- a/tests/qemu-iotests/014
+++ b/tests/qemu-iotests/014

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw
 #
 # qcow2 pattern test, complex patterns including compression and snapshots
 # Using patterns for 4k cluster size.

diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015
index 4d8effd..40c2323 100755
--- a/tests/qemu-iotests/015
+++ b/tests/qemu-iotests/015

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw snapshot
 #
 # Combined test to grow the refcount table and test snapshots.
 #

diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017
index 3413e34..2024b85 100755
--- a/tests/qemu-iotests/017
+++ b/tests/qemu-iotests/017

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw backing auto quick
 #
 # Simple backing file reads
 #

diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018
index 191b461..6fcebbb 100755
--- a/tests/qemu-iotests/018
+++ b/tests/qemu-iotests/018

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw backing auto quick
 #
 # Merge backing file into test image when converting the image
 #

diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019
index d3c1125..fa4458f 100755
--- a/tests/qemu-iotests/019
+++ b/tests/qemu-iotests/019

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw backing auto quick
 #
 # When using a backing file for the output image in qemu-img convert,
 # the backing file clusters must not copied. The data must still be

diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
index 596505b..60c672e 100755
--- a/tests/qemu-iotests/020
+++ b/tests/qemu-iotests/020

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw backing auto quick
 #
 # Commit changes to backing file
 #

diff --git a/tests/qemu-iotests/021 b/tests/qemu-iotests/021
index f888269..0fc89df 100755
--- a/tests/qemu-iotests/021
+++ b/tests/qemu-iotests/021

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: io auto quick
 #
 # Test handling of invalid patterns arguments to qemu-io
 #

diff --git a/tests/qemu-iotests/022 b/tests/qemu-iotests/022
index 99eb08f..a116cfe 100755
--- a/tests/qemu-iotests/022
+++ b/tests/qemu-iotests/022

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw snapshot auto
 #
 # Test bdrv_load/save_vmstate using the usual patterns
 #

diff --git a/tests/qemu-iotests/023 b/tests/qemu-iotests/023
index 02ed047..d19d13f 100755
--- a/tests/qemu-iotests/023
+++ b/tests/qemu-iotests/023

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw
 #
 # qcow2 pattern test with various cluster sizes
 #

diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024
index 12aceb2..25a564a 100755
--- a/tests/qemu-iotests/024
+++ b/tests/qemu-iotests/024

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw backing auto quick
 #
 # Rebasing COW images
 #

diff --git a/tests/qemu-iotests/025 b/tests/qemu-iotests/025
index 1569d91..da77ed3 100755
--- a/tests/qemu-iotests/025
+++ b/tests/qemu-iotests/025

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Resizing images
 #

diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026
index 9ecc588..d37e266 100755
--- a/tests/qemu-iotests/026
+++ b/tests/qemu-iotests/026

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw blkdbg
 #
 # qcow2 error path testing
 #

diff --git a/tests/qemu-iotests/027 b/tests/qemu-iotests/027
index 494be09..b279c88 100755
--- a/tests/qemu-iotests/027
+++ b/tests/qemu-iotests/027

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test that sub-cluster allocating writes zero the rest of the cluster
 #

diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028
index 57d34aa..8c391f2 100755
--- a/tests/qemu-iotests/028
+++ b/tests/qemu-iotests/028

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw backing quick
 #
 # Test that backing files can be smaller than the image
 #

diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029
index 61d78c0..bd71dd2 100755
--- a/tests/qemu-iotests/029
+++ b/tests/qemu-iotests/029

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # qcow2 internal snapshots/VM state tests
 #

diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030
index dcb4b5d..890784b 100755
--- a/tests/qemu-iotests/030
+++ b/tests/qemu-iotests/030

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw auto backing
 #
 # Tests for image streaming.
 #

diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031
index 2bcbc58..58b57a0 100755
--- a/tests/qemu-iotests/031
+++ b/tests/qemu-iotests/031

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test that all qcow2 header extensions survive a header rewrite
 #

diff --git a/tests/qemu-iotests/032 b/tests/qemu-iotests/032
index 8337a4d..ebbe7cb 100755
--- a/tests/qemu-iotests/032
+++ b/tests/qemu-iotests/032

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test that AIO requests are drained before an image is closed. This used
 # to segfault because the request coroutine kept running even after the

diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033
index 8b40991..da9133c 100755
--- a/tests/qemu-iotests/033
+++ b/tests/qemu-iotests/033

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test aligned and misaligned write zeroes operations.
 #

diff --git a/tests/qemu-iotests/034 b/tests/qemu-iotests/034
index 08f7aea..ac1af8f 100755
--- a/tests/qemu-iotests/034
+++ b/tests/qemu-iotests/034

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto backing quick
 #
 # Test bdrv_pwrite_zeroes with backing files (see also 154)
 #

diff --git a/tests/qemu-iotests/035 b/tests/qemu-iotests/035
index d950a0d..0c0c4fd 100755
--- a/tests/qemu-iotests/035
+++ b/tests/qemu-iotests/035

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Let a few AIO requests run in parallel and have them access different L2
 # tables so that the cache has a chance to get used up.

diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
index 6b82638..5e56701 100755
--- a/tests/qemu-iotests/036
+++ b/tests/qemu-iotests/036

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test qcow2 feature bits
 #

diff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037
index bb893c4..85b1015 100755
--- a/tests/qemu-iotests/037
+++ b/tests/qemu-iotests/037

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto backing quick
 #
 # Test COW from backing files
 #

diff --git a/tests/qemu-iotests/038 b/tests/qemu-iotests/038
index 30f1f73..65bf7a7 100755
--- a/tests/qemu-iotests/038
+++ b/tests/qemu-iotests/038

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto backing quick
 #
 # Test COW from backing files with AIO
 #

diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039
index ad3867c..12b2c7f 100755
--- a/tests/qemu-iotests/039
+++ b/tests/qemu-iotests/039

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test qcow2 lazy refcounts
 #

diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040
index dc6069e..7ebc9ed 100755
--- a/tests/qemu-iotests/040
+++ b/tests/qemu-iotests/040

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw auto
 #
 # Tests for image block commit.
 #

diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
index a778085..5cc02b2 100755
--- a/tests/qemu-iotests/041
+++ b/tests/qemu-iotests/041

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw auto backing
 #
 # Tests for image mirroring.
 #

diff --git a/tests/qemu-iotests/042 b/tests/qemu-iotests/042
index e8f23a1..411e54a 100755
--- a/tests/qemu-iotests/042
+++ b/tests/qemu-iotests/042

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test qemu-img operation on zero size images
 #

diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043
index 3271737..f8ce328 100755
--- a/tests/qemu-iotests/043
+++ b/tests/qemu-iotests/043

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto backing
 #
 # Test that qemu-img info --backing-chain detects infinite loops
 #

diff --git a/tests/qemu-iotests/044 b/tests/qemu-iotests/044
index 7e99ea7..64b18eb 100755
--- a/tests/qemu-iotests/044
+++ b/tests/qemu-iotests/044

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw
 #
 # Tests growing a large refcount table.
 #

diff --git a/tests/qemu-iotests/045 b/tests/qemu-iotests/045
index 5acc890..45eb239 100755
--- a/tests/qemu-iotests/045
+++ b/tests/qemu-iotests/045

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Tests for fdsets and getfd.
 #

diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046
index ed6fae3..50b0678 100755
--- a/tests/qemu-iotests/046
+++ b/tests/qemu-iotests/046

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto aio quick
 #
 # Test concurrent cluster allocations
 #

diff --git a/tests/qemu-iotests/047 b/tests/qemu-iotests/047
index 4528465..8dd21e0 100755
--- a/tests/qemu-iotests/047
+++ b/tests/qemu-iotests/047

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Regression test for commit b7ab0fea (which was a corruption fix,
 # despite the commit message claiming otherwise)

diff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048
index 2af6b74..bf8e4bf 100755
--- a/tests/qemu-iotests/048
+++ b/tests/qemu-iotests/048

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: img auto quick
 ##
 ## qemu-img compare test
 ##

diff --git a/tests/qemu-iotests/049 b/tests/qemu-iotests/049
index 82b1e6c..ed12fa4 100755
--- a/tests/qemu-iotests/049
+++ b/tests/qemu-iotests/049

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto
 #
 # Check qemu-img option parsing
 #

diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050
index 741bdb6..1de01c3 100755
--- a/tests/qemu-iotests/050
+++ b/tests/qemu-iotests/050

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto backing quick
 #
 # Test qemu-img rebase with zero clusters
 #

diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
index bee2607..7cbd141 100755
--- a/tests/qemu-iotests/051
+++ b/tests/qemu-iotests/051

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw
 #
 # Test command line configuration of block devices and driver-specific options
 #

diff --git a/tests/qemu-iotests/052 b/tests/qemu-iotests/052
index 8d5c106..2f23ac9 100755
--- a/tests/qemu-iotests/052
+++ b/tests/qemu-iotests/052

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto backing quick
 #
 # Test bdrv_pread/bdrv_pwrite using BDRV_O_SNAPSHOT
 #

diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053
index 71d299c..9a2958d 100755
--- a/tests/qemu-iotests/053
+++ b/tests/qemu-iotests/053

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test qemu-img convert when image length is not a multiple of cluster size
 #

diff --git a/tests/qemu-iotests/054 b/tests/qemu-iotests/054
index 40922db..ea14701 100755
--- a/tests/qemu-iotests/054
+++ b/tests/qemu-iotests/054

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test huge qcow2 images
 #

diff --git a/tests/qemu-iotests/055 b/tests/qemu-iotests/055
index 4d3744b..5d6b607 100755
--- a/tests/qemu-iotests/055
+++ b/tests/qemu-iotests/055

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw
 #
 # Tests for drive-backup and blockdev-backup
 #

diff --git a/tests/qemu-iotests/056 b/tests/qemu-iotests/056
index 052456a..0e6b859 100755
--- a/tests/qemu-iotests/056
+++ b/tests/qemu-iotests/056

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw backing
 #
 # Tests for drive-backup
 #

diff --git a/tests/qemu-iotests/057 b/tests/qemu-iotests/057
index a8b4bb6..b0d4319 100755
--- a/tests/qemu-iotests/057
+++ b/tests/qemu-iotests/057

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw
 #
 # Tests for internal snapshot.
 #

diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058
index d84740e..ce35ff4 100755
--- a/tests/qemu-iotests/058
+++ b/tests/qemu-iotests/058

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test export internal snapshot by qemu-nbd, convert it by qemu-img.
 #

diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
index dcc442b..65c0c32 100755
--- a/tests/qemu-iotests/059
+++ b/tests/qemu-iotests/059

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test case for vmdk
 #

diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
index 4b81d1a..db26c6b 100755
--- a/tests/qemu-iotests/060
+++ b/tests/qemu-iotests/060

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test case for image corruption (overlapping data structures) in qcow2
 #

diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
index 5747beb..e26d94a 100755
--- a/tests/qemu-iotests/061
+++ b/tests/qemu-iotests/061

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto
 #
 # Test case for image option amendment in qcow2.
 #

diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
index f26b88d..3212522 100755
--- a/tests/qemu-iotests/062
+++ b/tests/qemu-iotests/062

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test case for snapshotting images with unallocated zero clusters in
 # qcow2

diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
index c750b38..3a44758 100755
--- a/tests/qemu-iotests/063
+++ b/tests/qemu-iotests/063

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # test of qemu-img convert -n - convert without creation
 #

diff --git a/tests/qemu-iotests/064 b/tests/qemu-iotests/064
index 9067318..71fc575 100755
--- a/tests/qemu-iotests/064
+++ b/tests/qemu-iotests/064

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test VHDX read/write from a sample image created with Hyper-V
 #

diff --git a/tests/qemu-iotests/065 b/tests/qemu-iotests/065
index 29a7f7a..3c2ca27 100755
--- a/tests/qemu-iotests/065
+++ b/tests/qemu-iotests/065

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Test for additional information emitted by qemu-img info on qcow2
 # images

diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
index a4ac613..a780ed7 100755
--- a/tests/qemu-iotests/066
+++ b/tests/qemu-iotests/066

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test case for preallocated zero clusters in qcow2
 #

diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
index ccd1a9f..03e0350 100755
--- a/tests/qemu-iotests/068
+++ b/tests/qemu-iotests/068

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test case for loading a saved VM state from a qcow2 image
 #

diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069
index a4da83b..222dcba 100755
--- a/tests/qemu-iotests/069
+++ b/tests/qemu-iotests/069

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test case for deleting a backing file
 #

diff --git a/tests/qemu-iotests/070 b/tests/qemu-iotests/070
index cb0f927..b181e00 100755
--- a/tests/qemu-iotests/070
+++ b/tests/qemu-iotests/070

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test VHDX log replay from an image with a journal that needs to be
 # replayed

diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
index 49faae6..d99cef5 100755
--- a/tests/qemu-iotests/071
+++ b/tests/qemu-iotests/071

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test case for the QMP blkdebug and blkverify interfaces
 #

diff --git a/tests/qemu-iotests/072 b/tests/qemu-iotests/072
index f0b73e7..c492ab8 100755
--- a/tests/qemu-iotests/072
+++ b/tests/qemu-iotests/072

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test case for nested image formats
 #

diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073
index 6851782..90afd42 100755
--- a/tests/qemu-iotests/073
+++ b/tests/qemu-iotests/073

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test count_contiguous_clusters in qcow2
 #

diff --git a/tests/qemu-iotests/074 b/tests/qemu-iotests/074
index db03edf..c32c94b 100755
--- a/tests/qemu-iotests/074
+++ b/tests/qemu-iotests/074

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 ##
 ## qemu-img compare test (qcow2 only ones)
 ##

diff --git a/tests/qemu-iotests/075 b/tests/qemu-iotests/075
index 389d567..ca2ed2a 100755
--- a/tests/qemu-iotests/075
+++ b/tests/qemu-iotests/075

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # cloop format input validation tests
 #

diff --git a/tests/qemu-iotests/076 b/tests/qemu-iotests/076
index 0d405ef..1a8927d 100755
--- a/tests/qemu-iotests/076
+++ b/tests/qemu-iotests/076

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: io
 #
 # parallels format input validation tests
 #

diff --git a/tests/qemu-iotests/077 b/tests/qemu-iotests/077
index c284952..fbb90d8 100755
--- a/tests/qemu-iotests/077
+++ b/tests/qemu-iotests/077

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test concurrent pread/pwrite
 #

diff --git a/tests/qemu-iotests/078 b/tests/qemu-iotests/078
index 54fc654..0b48b7f 100755
--- a/tests/qemu-iotests/078
+++ b/tests/qemu-iotests/078

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # bochs format input validation tests
 #

diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079
index 0f0d94a..793e1f9 100755
--- a/tests/qemu-iotests/079
+++ b/tests/qemu-iotests/079

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto
 #
 # Test qcow2 preallocation with different cluster_sizes
 #

diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080
index bda8617..3306500 100755
--- a/tests/qemu-iotests/080
+++ b/tests/qemu-iotests/080

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto
 #
 # qcow2 format input validation tests
 #

diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081
index 4e19972..1ac66f1 100755
--- a/tests/qemu-iotests/081
+++ b/tests/qemu-iotests/081

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test Quorum block driver
 #

diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082
index 2135581..021b9be 100755
--- a/tests/qemu-iotests/082
+++ b/tests/qemu-iotests/082

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test qemu-img command line parsing
 #

diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083
index 10fdfc8..bc32b53 100755
--- a/tests/qemu-iotests/083
+++ b/tests/qemu-iotests/083

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw
 #
 # Test NBD client unexpected disconnect
 #

diff --git a/tests/qemu-iotests/084 b/tests/qemu-iotests/084
index c29d739..e51e91a 100755
--- a/tests/qemu-iotests/084
+++ b/tests/qemu-iotests/084

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: img quick
 #
 # Test case for VDI header corruption; image too large, and too many blocks.
 # Also simple test for creating dynamic and static VDI images.

diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085
index e99eb44..d557522 100755
--- a/tests/qemu-iotests/085
+++ b/tests/qemu-iotests/085

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw
 #
 # Live snapshot tests
 #

diff --git a/tests/qemu-iotests/086 b/tests/qemu-iotests/086
index fea1a7b..c055e7b 100755
--- a/tests/qemu-iotests/086
+++ b/tests/qemu-iotests/086

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test qemu-img progress output
 #

diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087
index 678e748..edd43f1 100755
--- a/tests/qemu-iotests/087
+++ b/tests/qemu-iotests/087

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test unsupported blockdev-add cases
 #

diff --git a/tests/qemu-iotests/088 b/tests/qemu-iotests/088
index ef11633..e3102fe 100755
--- a/tests/qemu-iotests/088
+++ b/tests/qemu-iotests/088

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # vpc (VHD) format input validation tests
 #

diff --git a/tests/qemu-iotests/089 b/tests/qemu-iotests/089
index f0929b6..48bdc42 100755
--- a/tests/qemu-iotests/089
+++ b/tests/qemu-iotests/089

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test case for support of JSON filenames
 #

diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090
index 87e872e..2044c09 100755
--- a/tests/qemu-iotests/090
+++ b/tests/qemu-iotests/090

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test for discarding compressed clusters on qcow2 images
 #

diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091
index 8dee168..9d144b9 100755
--- a/tests/qemu-iotests/091
+++ b/tests/qemu-iotests/091

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw migration quick
 #
 # Live migration test
 #

diff --git a/tests/qemu-iotests/092 b/tests/qemu-iotests/092
index 40ec62b..bfa116d 100755
--- a/tests/qemu-iotests/092
+++ b/tests/qemu-iotests/092

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # qcow1 format input validation tests
 #

diff --git a/tests/qemu-iotests/093 b/tests/qemu-iotests/093
index 32ded11..7745cb0 100755
--- a/tests/qemu-iotests/093
+++ b/tests/qemu-iotests/093

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: throttle
 #
 # Tests for IO throttling
 #

diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
index 2d3e100..a295fb2 100755
--- a/tests/qemu-iotests/094
+++ b/tests/qemu-iotests/094

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test case for drive-mirror to NBD
 #

diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095
index 7604ae6..20b5f9b 100755
--- a/tests/qemu-iotests/095
+++ b/tests/qemu-iotests/095

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test for commit of larger active layer
 #

diff --git a/tests/qemu-iotests/096 b/tests/qemu-iotests/096
index 5915f92..b5d7636 100755
--- a/tests/qemu-iotests/096
+++ b/tests/qemu-iotests/096

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Test that snapshots move the throttling configuration to the active
 # layer

diff --git a/tests/qemu-iotests/097 b/tests/qemu-iotests/097
index 1837d4e..30313f8 100755
--- a/tests/qemu-iotests/097
+++ b/tests/qemu-iotests/097

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto backing
 #
 # Commit changes into backing chains and empty the top image if the
 # backing image is not explicitly specified

diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098
index a35ce72..4c37eb0 100755
--- a/tests/qemu-iotests/098
+++ b/tests/qemu-iotests/098

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto backing quick
 #
 # Test qcow2's bdrv_make_empty for images without internal snapshots
 #

diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099
index 65e8e92..2f1199c 100755
--- a/tests/qemu-iotests/099
+++ b/tests/qemu-iotests/099

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test valid filenames for blkdebug and blkverify representatively for
 # other protocols (such as NBD) when queried

diff --git a/tests/qemu-iotests/101 b/tests/qemu-iotests/101
index a4c1b63..4c4a8ce 100755
--- a/tests/qemu-iotests/101
+++ b/tests/qemu-iotests/101

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test short file I/O
 #

diff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102
index 9d747c7..8b4c4c9 100755
--- a/tests/qemu-iotests/102
+++ b/tests/qemu-iotests/102

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test case for qemu-io -c map and qemu-img map
 #

diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103
index 220481d..726f831 100755
--- a/tests/qemu-iotests/103
+++ b/tests/qemu-iotests/103

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test case for qcow2 metadata cache size specification
 #

diff --git a/tests/qemu-iotests/104 b/tests/qemu-iotests/104
index c70f28a..3ebb74c 100755
--- a/tests/qemu-iotests/104
+++ b/tests/qemu-iotests/104

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto
 #
 # Test image creation with aligned and unaligned sizes
 #

diff --git a/tests/qemu-iotests/105 b/tests/qemu-iotests/105
index 4d55a2d..d804685 100755
--- a/tests/qemu-iotests/105
+++ b/tests/qemu-iotests/105

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Create, read, write big image
 #

diff --git a/tests/qemu-iotests/106 b/tests/qemu-iotests/106
index 20ad7bd..3331445 100755
--- a/tests/qemu-iotests/106
+++ b/tests/qemu-iotests/106

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test preallocated resize of raw images
 #

diff --git a/tests/qemu-iotests/107 b/tests/qemu-iotests/107
index d24829c..e68f1e0 100755
--- a/tests/qemu-iotests/107
+++ b/tests/qemu-iotests/107

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Tests updates of the qcow2 L1 table
 #

diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108
index ba67748..8eaef0b 100755
--- a/tests/qemu-iotests/108
+++ b/tests/qemu-iotests/108

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test case for repairing qcow2 images which cannot be repaired using
 # the on-disk refcount structures

diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109
index 3ffeaf3..e207a55 100755
--- a/tests/qemu-iotests/109
+++ b/tests/qemu-iotests/109

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw
 #
 # Test writing image headers of other formats into raw images
 #

diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
index f1813d0..1fa36cc 100755
--- a/tests/qemu-iotests/110
+++ b/tests/qemu-iotests/110

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto backing quick
 #
 # Test case for relative backing file names in complex BDS trees
 #

diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111
index bd839a3..3ba25f6 100755
--- a/tests/qemu-iotests/111
+++ b/tests/qemu-iotests/111

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test case for non-existing backing file when creating a qcow2 image
 # and not specifying the size

diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112
index 6e413f5..07ac74f 100755
--- a/tests/qemu-iotests/112
+++ b/tests/qemu-iotests/112

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw
 #
 # Test cases for different refcount_bits values
 #

diff --git a/tests/qemu-iotests/113 b/tests/qemu-iotests/113
index 71a65de..ee59b9a 100755
--- a/tests/qemu-iotests/113
+++ b/tests/qemu-iotests/113

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test case for accessing creation options on image formats and
 # protocols not supporting image creation

diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114
index 80e5e5e..43cb0bc 100755
--- a/tests/qemu-iotests/114
+++ b/tests/qemu-iotests/114

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test invalid backing file format in qcow2 images
 #

diff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115
index 7f53987..26dd37d 100755
--- a/tests/qemu-iotests/115
+++ b/tests/qemu-iotests/115

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw
 #
 # Test case for non-self-referential qcow2 refcount blocks
 #

diff --git a/tests/qemu-iotests/116 b/tests/qemu-iotests/116
index 941b07a..4f40fcb 100755
--- a/tests/qemu-iotests/116
+++ b/tests/qemu-iotests/116

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test error code paths for invalid QED images
 #

diff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117
index 9039555..48ebc01 100755
--- a/tests/qemu-iotests/117
+++ b/tests/qemu-iotests/117

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto
 #
 # Test case for shared BDS between backend trees
 #

diff --git a/tests/qemu-iotests/118 b/tests/qemu-iotests/118
index 2350929..1a2e219 100755
--- a/tests/qemu-iotests/118
+++ b/tests/qemu-iotests/118

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw
 #
 # Test case for the QMP 'change' command and all other associated
 # commands

diff --git a/tests/qemu-iotests/119 b/tests/qemu-iotests/119
index ea6770a..5770b50 100755
--- a/tests/qemu-iotests/119
+++ b/tests/qemu-iotests/119

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # NBD test case for overriding BDRV_O_PROTOCOL by explicitly specifying
 # a driver

diff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120
index 45c55c1..7187731 100755
--- a/tests/qemu-iotests/120
+++ b/tests/qemu-iotests/120

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Non-NBD test cases for overriding BDRV_O_PROTOCOL by explicitly
 # specifying a driver

diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121
index 8357ce0..ba3d8d9 100755
--- a/tests/qemu-iotests/121
+++ b/tests/qemu-iotests/121

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw
 #
 # Test cases for qcow2 refcount table growth
 #

diff --git a/tests/qemu-iotests/122 b/tests/qemu-iotests/122
index 0f3d4ca..5d550ed 100755
--- a/tests/qemu-iotests/122
+++ b/tests/qemu-iotests/122

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw
 #
 # Test some qemu-img convert cases
 #

diff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123
index 01b771c..e19111f 100755
--- a/tests/qemu-iotests/123
+++ b/tests/qemu-iotests/123

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test case for qemu-img convert to NBD
 #

diff --git a/tests/qemu-iotests/124 b/tests/qemu-iotests/124
index 3705cbb..3b21bc4 100755
--- a/tests/qemu-iotests/124
+++ b/tests/qemu-iotests/124

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw backing
 #
 # Tests for incremental drive-backup
 #

diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125
index 5720e86..bd390b3 100755
--- a/tests/qemu-iotests/125
+++ b/tests/qemu-iotests/125

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw
 #
 # Test preallocated growth of qcow2 images
 #

diff --git a/tests/qemu-iotests/126 b/tests/qemu-iotests/126
index dd5a211..92c0547 100755
--- a/tests/qemu-iotests/126
+++ b/tests/qemu-iotests/126

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto backing
 #
 # Tests handling of colons in filenames (which may be confused with protocol
 # prefixes)

diff --git a/tests/qemu-iotests/127 b/tests/qemu-iotests/127
index 77fdfd0..98e8e82 100755
--- a/tests/qemu-iotests/127
+++ b/tests/qemu-iotests/127

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto backing quick
 #
 # Test case for mirroring with dataplane
 #

diff --git a/tests/qemu-iotests/128 b/tests/qemu-iotests/128
index 3606c41..d0e00d2 100755
--- a/tests/qemu-iotests/128
+++ b/tests/qemu-iotests/128

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test that opening O_DIRECT succeeds when image file I/O produces EIO
 #

diff --git a/tests/qemu-iotests/129 b/tests/qemu-iotests/129
index 0e13244..f57a2e1 100755
--- a/tests/qemu-iotests/129
+++ b/tests/qemu-iotests/129

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Tests that "bdrv_drain_all" doesn't drain block jobs
 #

diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130
index a7b3657..7257f09 100755
--- a/tests/qemu-iotests/130
+++ b/tests/qemu-iotests/130

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test that temporary backing file overrides (on the command line or in
 # blockdev-add) don't replace the original path stored in the image during

diff --git a/tests/qemu-iotests/131 b/tests/qemu-iotests/131
index 2787023..d7456ca 100755
--- a/tests/qemu-iotests/131
+++ b/tests/qemu-iotests/131

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # parallels format validation tests (created by QEMU)
 #

diff --git a/tests/qemu-iotests/132 b/tests/qemu-iotests/132
index 39ea430..367ea08 100755
--- a/tests/qemu-iotests/132
+++ b/tests/qemu-iotests/132

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Test mirror with unmap
 #

diff --git a/tests/qemu-iotests/133 b/tests/qemu-iotests/133
index bc82d8e..d997db1 100755
--- a/tests/qemu-iotests/133
+++ b/tests/qemu-iotests/133

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: auto quick
 #
 # Test for reopen
 #

diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134
index 17fe1d6..ded153c 100755
--- a/tests/qemu-iotests/134
+++ b/tests/qemu-iotests/134

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test encrypted read/write using plain bdrv_pread/bdrv_pwrite
 #

diff --git a/tests/qemu-iotests/135 b/tests/qemu-iotests/135
index 3b3d1dc..299075b 100755
--- a/tests/qemu-iotests/135
+++ b/tests/qemu-iotests/135

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw
 #
 # Test VPC open of image with large Max Table Entries value.
 #

diff --git a/tests/qemu-iotests/136 b/tests/qemu-iotests/136
index d59400c..8fce88b 100755
--- a/tests/qemu-iotests/136
+++ b/tests/qemu-iotests/136

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw
 #
 # Tests for block device statistics
 #

diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137
index de555a9..4680d5d 100755
--- a/tests/qemu-iotests/137
+++ b/tests/qemu-iotests/137

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto
 #
 # Test qcow2 reopen
 #

diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138
index e87a64e..951cfa6 100755
--- a/tests/qemu-iotests/138
+++ b/tests/qemu-iotests/138

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # General test case for qcow2's image check
 #

diff --git a/tests/qemu-iotests/139 b/tests/qemu-iotests/139
index 1452fd2..e79b3c2 100755
--- a/tests/qemu-iotests/139
+++ b/tests/qemu-iotests/139

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Test cases for the QMP 'blockdev-del' command
 #

diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140
index ff6b904..91e08c3 100755
--- a/tests/qemu-iotests/140
+++ b/tests/qemu-iotests/140

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test case for ejecting a BlockBackend with an NBD server attached to it
 #

diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141
index 21aa0b4..115cc16 100755
--- a/tests/qemu-iotests/141
+++ b/tests/qemu-iotests/141

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test case for ejecting BDSs with block jobs still running on them
 #

diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143
index d234990..72151ac 100755
--- a/tests/qemu-iotests/143
+++ b/tests/qemu-iotests/143

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: auto quick
 #
 # Test case for connecting to a non-existing NBD export name
 #

diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144
index 4569ac0..60e9ddd 100755
--- a/tests/qemu-iotests/144
+++ b/tests/qemu-iotests/144

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 # Check live snapshot, followed by active commit, and another snapshot.
 #
 # This test is to catch the error case of BZ #1300209:

diff --git a/tests/qemu-iotests/145 b/tests/qemu-iotests/145
index 9427549..a2ce925 100755
--- a/tests/qemu-iotests/145
+++ b/tests/qemu-iotests/145

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: quick
 #
 # Test the combination of -incoming and snapshot=on
 #

diff --git a/tests/qemu-iotests/146 b/tests/qemu-iotests/146
index ddc3c1f..98aca96 100755
--- a/tests/qemu-iotests/146
+++ b/tests/qemu-iotests/146

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: quick
 #
 # Test VHD image format creator detection and override
 #

diff --git a/tests/qemu-iotests/147 b/tests/qemu-iotests/147
index d7a9f31..47dfa62 100755
--- a/tests/qemu-iotests/147
+++ b/tests/qemu-iotests/147

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: img
 #
 # Test case for NBD's blockdev-add interface
 #

diff --git a/tests/qemu-iotests/148 b/tests/qemu-iotests/148
index 5e14a45..7ccbde4 100755
--- a/tests/qemu-iotests/148
+++ b/tests/qemu-iotests/148

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Test the rate limit of QMP events
 #

diff --git a/tests/qemu-iotests/149 b/tests/qemu-iotests/149
index 852768f..328fd05 100755
--- a/tests/qemu-iotests/149
+++ b/tests/qemu-iotests/149

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw sudo
 #
 # Copyright (C) 2016 Red Hat, Inc.
 #

diff --git a/tests/qemu-iotests/150 b/tests/qemu-iotests/150
index 3b1f321..ac6930a 100755
--- a/tests/qemu-iotests/150
+++ b/tests/qemu-iotests/150

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test that qemu-img convert -S 0 fully allocates the target image
 #

diff --git a/tests/qemu-iotests/151 b/tests/qemu-iotests/151
index f2df72c..182f6b5 100755
--- a/tests/qemu-iotests/151
+++ b/tests/qemu-iotests/151

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw
 #
 # Tests for active mirroring
 #

diff --git a/tests/qemu-iotests/152 b/tests/qemu-iotests/152
index cc2ea09..4e179c3 100755
--- a/tests/qemu-iotests/152
+++ b/tests/qemu-iotests/152

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Tests for drive-mirror with source size unaligned to granularity
 #

diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153
index 34045ea..607af59 100755
--- a/tests/qemu-iotests/153
+++ b/tests/qemu-iotests/153

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test image locking
 #

diff --git a/tests/qemu-iotests/154 b/tests/qemu-iotests/154
index 34a1c05..24e29ae 100755
--- a/tests/qemu-iotests/154
+++ b/tests/qemu-iotests/154

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto backing quick
 #
 # qcow2 specific bdrv_pwrite_zeroes tests with backing files (complements 034)
 #

diff --git a/tests/qemu-iotests/155 b/tests/qemu-iotests/155
index 988f986..bafef9d 100755
--- a/tests/qemu-iotests/155
+++ b/tests/qemu-iotests/155

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw
 #
 # Test whether the backing BDSs are correct after completion of a
 # mirror block job; in "existing" modes (drive-mirror with

diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
index 9c7878d..65dcedd 100755
--- a/tests/qemu-iotests/156
+++ b/tests/qemu-iotests/156

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Tests oVirt-like storage migration:
 #  - Create snapshot

diff --git a/tests/qemu-iotests/157 b/tests/qemu-iotests/157
index 7cbac38..0dc9ba6 100755
--- a/tests/qemu-iotests/157
+++ b/tests/qemu-iotests/157

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: quick
 #
 # Test command line configuration of block devices with qdev
 #

diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158
index cf23742..a95878e 100755
--- a/tests/qemu-iotests/158
+++ b/tests/qemu-iotests/158

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test encrypted read/write using backing files
 #

diff --git a/tests/qemu-iotests/159 b/tests/qemu-iotests/159
index f969005..4eb476d 100755
--- a/tests/qemu-iotests/159
+++ b/tests/qemu-iotests/159

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # qemu-img dd test with different block sizes
 #

diff --git a/tests/qemu-iotests/160 b/tests/qemu-iotests/160
index 0572b5a..7984a9c 100755
--- a/tests/qemu-iotests/160
+++ b/tests/qemu-iotests/160

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # qemu-img dd test for the skip option
 #

diff --git a/tests/qemu-iotests/161 b/tests/qemu-iotests/161
index 4fb7d0c..f25effa 100755
--- a/tests/qemu-iotests/161
+++ b/tests/qemu-iotests/161

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test reopening a backing image after block-stream and block-commit
 #

diff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162
index c0053ed9..cf17f49 100755
--- a/tests/qemu-iotests/162
+++ b/tests/qemu-iotests/162

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: quick
 #
 # Test case for specifying runtime options of the wrong type to some
 # block drivers

diff --git a/tests/qemu-iotests/163 b/tests/qemu-iotests/163
index 5a3cc84..dedce8e 100755
--- a/tests/qemu-iotests/163
+++ b/tests/qemu-iotests/163

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw
 #
 # Tests for shrinking images
 #

diff --git a/tests/qemu-iotests/165 b/tests/qemu-iotests/165
index fb56a76..abc4ffa 100755
--- a/tests/qemu-iotests/165
+++ b/tests/qemu-iotests/165

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Tests for persistent dirty bitmaps.
 #

diff --git a/tests/qemu-iotests/169 b/tests/qemu-iotests/169
index 40afb15..a5c7bc8 100755
--- a/tests/qemu-iotests/169
+++ b/tests/qemu-iotests/169

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw migration
 #
 # Tests for dirty bitmaps migration.
 #

diff --git a/tests/qemu-iotests/170 b/tests/qemu-iotests/170
index 6c8f0e8..41387e4 100755
--- a/tests/qemu-iotests/170
+++ b/tests/qemu-iotests/170

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # qemu-img dd test
 #

diff --git a/tests/qemu-iotests/171 b/tests/qemu-iotests/171
index f3582ed..d1d77f7 100755
--- a/tests/qemu-iotests/171
+++ b/tests/qemu-iotests/171

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test 'offset' and 'size' options of the raw driver. Make sure we can't
 # (or can) read and write outside of the image size.

diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172
index b45782e..0ac942a 100755
--- a/tests/qemu-iotests/172
+++ b/tests/qemu-iotests/172

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: auto
 #
 # Test floppy configuration
 #

diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173
index ec6d170..9594f3c 100755
--- a/tests/qemu-iotests/173
+++ b/tests/qemu-iotests/173

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw
 #
 # Test QAPI commands looking up protocol based images with relative
 # filename backing strings

diff --git a/tests/qemu-iotests/174 b/tests/qemu-iotests/174
index 1b0dd2e..d4cecb5 100755
--- a/tests/qemu-iotests/174
+++ b/tests/qemu-iotests/174

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: auto
 #
 # Test that qemu-io fail with non-zero exit code
 #

diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175
index 21a77a2..f74f053 100755
--- a/tests/qemu-iotests/175
+++ b/tests/qemu-iotests/175

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: quick
 #
 # Test creating raw image preallocation mode
 #

diff --git a/tests/qemu-iotests/176 b/tests/qemu-iotests/176
index 5ce3b27..27ac254 100755
--- a/tests/qemu-iotests/176
+++ b/tests/qemu-iotests/176

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto backing
 #
 # Commit changes into backing chains and empty the top image if the
 # backing image is not explicitly specified.

diff --git a/tests/qemu-iotests/177 b/tests/qemu-iotests/177
index 595bfd4..8d8745b 100755
--- a/tests/qemu-iotests/177
+++ b/tests/qemu-iotests/177

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test corner cases with unusual block geometries
 #

diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178
index f09b27c..3b1a7ad 100755
--- a/tests/qemu-iotests/178
+++ b/tests/qemu-iotests/178

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: img
 #
 # qemu-img measure sub-command tests
 #

diff --git a/tests/qemu-iotests/179 b/tests/qemu-iotests/179
index 7ada04c..09447b5 100755
--- a/tests/qemu-iotests/179
+++ b/tests/qemu-iotests/179

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test case for write zeroes with unmap
 #

diff --git a/tests/qemu-iotests/181 b/tests/qemu-iotests/181
index 438c2dc..820c53e 100755
--- a/tests/qemu-iotests/181
+++ b/tests/qemu-iotests/181

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto migration quick
 #
 # Test postcopy live migration with shared storage
 #

diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182
index 56a2dd5..55a0384 100755
--- a/tests/qemu-iotests/182
+++ b/tests/qemu-iotests/182

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test image locking for POSIX locks
 #

diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183
index d889a3b..ee62939 100755
--- a/tests/qemu-iotests/183
+++ b/tests/qemu-iotests/183

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw migration quick
 #
 # Test old-style block migration (migrate -b)
 #

diff --git a/tests/qemu-iotests/184 b/tests/qemu-iotests/184
index eebb53f..513d167 100755
--- a/tests/qemu-iotests/184
+++ b/tests/qemu-iotests/184

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test I/O throttle block filter driver interface
 #

diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185
index fd5e6eb..7bc8fe5 100755
--- a/tests/qemu-iotests/185
+++ b/tests/qemu-iotests/185

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw
 #
 # Test exiting qemu while jobs are still running
 #

diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186
index 0db25b0..072e54e 100755
--- a/tests/qemu-iotests/186
+++ b/tests/qemu-iotests/186

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto
 #
 # Test 'info block' with all kinds of configurations
 #

diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187
index f262d83..70b74b0 100755
--- a/tests/qemu-iotests/187
+++ b/tests/qemu-iotests/187

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto
 #
 # Test switching between read-only and read-write
 #

diff --git a/tests/qemu-iotests/188 b/tests/qemu-iotests/188
index 13b225f..ce087d1 100755
--- a/tests/qemu-iotests/188
+++ b/tests/qemu-iotests/188

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test encrypted read/write using plain bdrv_pread/bdrv_pwrite
 #

diff --git a/tests/qemu-iotests/189 b/tests/qemu-iotests/189
index 3e5ded1..4e46338 100755
--- a/tests/qemu-iotests/189
+++ b/tests/qemu-iotests/189

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw
 #
 # Test encrypted read/write using backing files
 #

diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190
index c22d8d6..7fb8447 100755
--- a/tests/qemu-iotests/190
+++ b/tests/qemu-iotests/190

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # qemu-img measure sub-command tests on huge qcow2 files
 #

diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
index 95a8913..ce695b9 100755
--- a/tests/qemu-iotests/191
+++ b/tests/qemu-iotests/191

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto
 #
 # Test commit block job where top has two parents
 #

diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192
index d2ba55d..d809187 100755
--- a/tests/qemu-iotests/192
+++ b/tests/qemu-iotests/192

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test NBD export with -incoming (non-shared storage migration use case from
 # libvirt)

diff --git a/tests/qemu-iotests/194 b/tests/qemu-iotests/194
index 7a4863a..3889266 100755
--- a/tests/qemu-iotests/194
+++ b/tests/qemu-iotests/194

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw migration quick
 #
 # Copyright (C) 2017 Red Hat, Inc.
 #

diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195
index 967af5b..f1df690 100755
--- a/tests/qemu-iotests/195
+++ b/tests/qemu-iotests/195

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test change-backing-file command
 #

diff --git a/tests/qemu-iotests/196 b/tests/qemu-iotests/196
index e8fcf37..2451515 100755
--- a/tests/qemu-iotests/196
+++ b/tests/qemu-iotests/196

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick migration
 #
 # Test clearing unknown autoclear_features flag by qcow2 after
 # migration. This test mimics migration to older qemu.

diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
index a161c89..a2547bc 100755
--- a/tests/qemu-iotests/197
+++ b/tests/qemu-iotests/197

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test case for copy-on-read into qcow2
 #

diff --git a/tests/qemu-iotests/198 b/tests/qemu-iotests/198
index 46f0c54..b333a8f 100755
--- a/tests/qemu-iotests/198
+++ b/tests/qemu-iotests/198

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw
 #
 # Test commit of encrypted qcow2 files
 #

diff --git a/tests/qemu-iotests/199 b/tests/qemu-iotests/199
index 58fad87..dbf10e5 100755
--- a/tests/qemu-iotests/199
+++ b/tests/qemu-iotests/199

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw migration
 #
 # Tests for dirty bitmaps postcopy migration.
 #

diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
index 0465391..f80517e 100755
--- a/tests/qemu-iotests/200
+++ b/tests/qemu-iotests/200

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw
 #
 # Block job co-routine race condition test.
 #

diff --git a/tests/qemu-iotests/201 b/tests/qemu-iotests/201
index 483eb18..1b8eb51 100755
--- a/tests/qemu-iotests/201
+++ b/tests/qemu-iotests/201

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw migration quick
 #
 # Test savevm and loadvm after live migration with postcopy flag
 #

diff --git a/tests/qemu-iotests/202 b/tests/qemu-iotests/202
index e3900a4..8eb5f32 100755
--- a/tests/qemu-iotests/202
+++ b/tests/qemu-iotests/202

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Copyright (C) 2017 Red Hat, Inc.
 #

diff --git a/tests/qemu-iotests/203 b/tests/qemu-iotests/203
index 4b4bd33..ea30e50 100755
--- a/tests/qemu-iotests/203
+++ b/tests/qemu-iotests/203

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw auto migration quick
 #
 # Copyright (C) 2017 Red Hat, Inc.
 #

diff --git a/tests/qemu-iotests/204 b/tests/qemu-iotests/204
index 536bb8b..ab68b6d 100755
--- a/tests/qemu-iotests/204
+++ b/tests/qemu-iotests/204

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test corner cases with unusual block geometries
 #

diff --git a/tests/qemu-iotests/205 b/tests/qemu-iotests/205
index 43432cb..c0e1073 100755
--- a/tests/qemu-iotests/205
+++ b/tests/qemu-iotests/205

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Tests for qmp command nbd-server-remove.
 #

diff --git a/tests/qemu-iotests/206 b/tests/qemu-iotests/206
index d12d7cb..c3cdad4 100755
--- a/tests/qemu-iotests/206
+++ b/tests/qemu-iotests/206

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw
 #
 # Test qcow2 and file image creation
 #

diff --git a/tests/qemu-iotests/207 b/tests/qemu-iotests/207
index a662141..f9f3fd7 100755
--- a/tests/qemu-iotests/207
+++ b/tests/qemu-iotests/207

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw
 #
 # Test ssh image creation
 #

diff --git a/tests/qemu-iotests/208 b/tests/qemu-iotests/208
index 54aa4be..6117f16 100755
--- a/tests/qemu-iotests/208
+++ b/tests/qemu-iotests/208

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Copyright (C) 2018 Red Hat, Inc.
 #

diff --git a/tests/qemu-iotests/209 b/tests/qemu-iotests/209
index 8c804f4..ff7efea 100755
--- a/tests/qemu-iotests/209
+++ b/tests/qemu-iotests/209

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Tests for NBD BLOCK_STATUS extension
 #

diff --git a/tests/qemu-iotests/210 b/tests/qemu-iotests/210
index 7bf591f..5a62ed4 100755
--- a/tests/qemu-iotests/210
+++ b/tests/qemu-iotests/210

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw
 #
 # Test luks and file image creation
 #

diff --git a/tests/qemu-iotests/211 b/tests/qemu-iotests/211
index 4969edb..f52cada 100755
--- a/tests/qemu-iotests/211
+++ b/tests/qemu-iotests/211

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Test VDI and file image creation
 #

diff --git a/tests/qemu-iotests/212 b/tests/qemu-iotests/212
index 45d0884..d4af0c4 100755
--- a/tests/qemu-iotests/212
+++ b/tests/qemu-iotests/212

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Test parallels and file image creation
 #

diff --git a/tests/qemu-iotests/213 b/tests/qemu-iotests/213
index cf638eb..78d839a 100755
--- a/tests/qemu-iotests/213
+++ b/tests/qemu-iotests/213

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Test vhdx and file image creation
 #

diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214
index 75ae7a1..0889089 100755
--- a/tests/qemu-iotests/214
+++ b/tests/qemu-iotests/214

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto
 #
 # Test qcow2 image compression
 #

diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215
index f99bae7..d464596 100755
--- a/tests/qemu-iotests/215
+++ b/tests/qemu-iotests/215

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test case for copy-on-read into qcow2, using the COR filter driver
 #

diff --git a/tests/qemu-iotests/216 b/tests/qemu-iotests/216
index f93c61a..c02f8d2 100755
--- a/tests/qemu-iotests/216
+++ b/tests/qemu-iotests/216

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Copy-on-read tests using a COR filter node
 #

diff --git a/tests/qemu-iotests/217 b/tests/qemu-iotests/217
index 7385342..e693f32 100755
--- a/tests/qemu-iotests/217
+++ b/tests/qemu-iotests/217

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # I/O errors when working with internal qcow2 snapshots, and repairing
 # the result

diff --git a/tests/qemu-iotests/218 b/tests/qemu-iotests/218
index 5586870..ae7c4fb 100755
--- a/tests/qemu-iotests/218
+++ b/tests/qemu-iotests/218

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # This test covers what happens when a mirror block job is cancelled
 # in various phases of its existence.

diff --git a/tests/qemu-iotests/219 b/tests/qemu-iotests/219
index db272c5..16c3ca7 100755
--- a/tests/qemu-iotests/219
+++ b/tests/qemu-iotests/219

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw
 #
 # Copyright (C) 2018 Red Hat, Inc.
 #

diff --git a/tests/qemu-iotests/220 b/tests/qemu-iotests/220
index 9ba3b3f..7d08b9b 100755
--- a/tests/qemu-iotests/220
+++ b/tests/qemu-iotests/220

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto
 #
 # max limits on compression in huge qcow2 files
 #

diff --git a/tests/qemu-iotests/221 b/tests/qemu-iotests/221
index 7e6086b..c463fd4 100755
--- a/tests/qemu-iotests/221
+++ b/tests/qemu-iotests/221

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test qemu-img vs. unaligned images
 # (See also 253, which is the O_DIRECT version)

diff --git a/tests/qemu-iotests/222 b/tests/qemu-iotests/222
index 14d67c8..b48afe6 100755
--- a/tests/qemu-iotests/222
+++ b/tests/qemu-iotests/222

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # This test covers the basic fleecing workflow, which provides a
 # point-in-time snapshot of a node that can be queried over NBD.

diff --git a/tests/qemu-iotests/223 b/tests/qemu-iotests/223
index d68bc3c..da87f2f 100755
--- a/tests/qemu-iotests/223
+++ b/tests/qemu-iotests/223

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test reading dirty bitmap over NBD
 #

diff --git a/tests/qemu-iotests/224 b/tests/qemu-iotests/224
index 017b068..38dd153 100755
--- a/tests/qemu-iotests/224
+++ b/tests/qemu-iotests/224

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Test json:{} filenames with qemu-internal BDSs
 # (the one of commit, to be precise)

diff --git a/tests/qemu-iotests/225 b/tests/qemu-iotests/225
index 0186ec8..c005379 100755
--- a/tests/qemu-iotests/225
+++ b/tests/qemu-iotests/225

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test vmdk backing file correlation
 #

diff --git a/tests/qemu-iotests/226 b/tests/qemu-iotests/226
index c1e1fb2..6a9adb4 100755
--- a/tests/qemu-iotests/226
+++ b/tests/qemu-iotests/226

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: auto quick
 #
 # This test covers expected filetypes for the file, host_cdrom and
 # host_device drivers.

diff --git a/tests/qemu-iotests/227 b/tests/qemu-iotests/227
index 637d7c3..7e45a47 100755
--- a/tests/qemu-iotests/227
+++ b/tests/qemu-iotests/227

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: quick
 #
 # Test query-blockstats with different ways to create a BB
 #

diff --git a/tests/qemu-iotests/228 b/tests/qemu-iotests/228
index 266fce6..a5eda2e 100755
--- a/tests/qemu-iotests/228
+++ b/tests/qemu-iotests/228

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Test for when a backing file is considered overridden (thus, a
 # json:{} filename is generated for the overlay) and when it is not

diff --git a/tests/qemu-iotests/229 b/tests/qemu-iotests/229
index 273ac24..4bc9939 100755
--- a/tests/qemu-iotests/229
+++ b/tests/qemu-iotests/229

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: auto quick
 #
 # Test for force canceling a running blockjob that is paused in
 # an error state.

diff --git a/tests/qemu-iotests/231 b/tests/qemu-iotests/231
index c0b053a..0f66d0c 100755
--- a/tests/qemu-iotests/231
+++ b/tests/qemu-iotests/231

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: quick
 #
 # Test legacy and modern option parsing for rbd/ceph.  This will not
 # actually connect to a ceph server, but rather looks for the appropriate

diff --git a/tests/qemu-iotests/232 b/tests/qemu-iotests/232
index 685356a..b30faaa 100755
--- a/tests/qemu-iotests/232
+++ b/tests/qemu-iotests/232

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: quick
 #
 # Test for auto-read-only
 #

diff --git a/tests/qemu-iotests/233 b/tests/qemu-iotests/233
index a5c17c3..7ce5764 100755
--- a/tests/qemu-iotests/233
+++ b/tests/qemu-iotests/233

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: quick
 #
 # Test NBD TLS certificate / authorization integration
 #

diff --git a/tests/qemu-iotests/234 b/tests/qemu-iotests/234
index 73c899d..cb5f175 100755
--- a/tests/qemu-iotests/234
+++ b/tests/qemu-iotests/234

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: quick migration
 #
 # Copyright (C) 2018 Red Hat, Inc.
 #

diff --git a/tests/qemu-iotests/235 b/tests/qemu-iotests/235
index d1b10ac..20d16db 100755
--- a/tests/qemu-iotests/235
+++ b/tests/qemu-iotests/235

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: quick
 #
 # Simple mirror test
 #

diff --git a/tests/qemu-iotests/236 b/tests/qemu-iotests/236
index 6f5cee2..f6c4451 100755
--- a/tests/qemu-iotests/236
+++ b/tests/qemu-iotests/236

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: quick
 #
 # Test bitmap merges.
 #

diff --git a/tests/qemu-iotests/237 b/tests/qemu-iotests/237
index 5b21ad3..43dfd3b 100755
--- a/tests/qemu-iotests/237
+++ b/tests/qemu-iotests/237

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Test vmdk and file image creation
 #

diff --git a/tests/qemu-iotests/238 b/tests/qemu-iotests/238
index b8fcf15..8a10af5 100755
--- a/tests/qemu-iotests/238
+++ b/tests/qemu-iotests/238

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: quick
 #
 # Regression test for throttle group member unregister segfault with iothread
 #

diff --git a/tests/qemu-iotests/239 b/tests/qemu-iotests/239
index b0991ff..4f00371 100755
--- a/tests/qemu-iotests/239
+++ b/tests/qemu-iotests/239

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test case for dmg
 #

diff --git a/tests/qemu-iotests/240 b/tests/qemu-iotests/240
index c0f71f0..ab077f4 100755
--- a/tests/qemu-iotests/240
+++ b/tests/qemu-iotests/240

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: quick
 
 # Test hot plugging and unplugging with iothreads
 #

diff --git a/tests/qemu-iotests/241 b/tests/qemu-iotests/241
index 8dae8d3..c962c8b 100755
--- a/tests/qemu-iotests/241
+++ b/tests/qemu-iotests/241

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test qemu-nbd vs. unaligned images
 #

diff --git a/tests/qemu-iotests/242 b/tests/qemu-iotests/242
index a16de30..a9b2766 100755
--- a/tests/qemu-iotests/242
+++ b/tests/qemu-iotests/242

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Test for qcow2 bitmap printed information
 #

diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
index 17388a4..8bbb510 100755
--- a/tests/qemu-iotests/243
+++ b/tests/qemu-iotests/243

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test qcow2 preallocation
 #

diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
index f2b2ddd..a46b441 100755
--- a/tests/qemu-iotests/244
+++ b/tests/qemu-iotests/244

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test qcow2 with external data files
 #

diff --git a/tests/qemu-iotests/245 b/tests/qemu-iotests/245
index e60c832..86f00f2 100755
--- a/tests/qemu-iotests/245
+++ b/tests/qemu-iotests/245

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw
 #
 # Test cases for the QMP 'x-blockdev-reopen' command
 #

diff --git a/tests/qemu-iotests/246 b/tests/qemu-iotests/246
index 58a479c..fa3102c 100755
--- a/tests/qemu-iotests/246
+++ b/tests/qemu-iotests/246

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Test persistent bitmap resizing.
 #

diff --git a/tests/qemu-iotests/247 b/tests/qemu-iotests/247
index 6cf2679..ace6dba 100755
--- a/tests/qemu-iotests/247
+++ b/tests/qemu-iotests/247

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test for auto-read-only with commit block job
 #

diff --git a/tests/qemu-iotests/248 b/tests/qemu-iotests/248
index 18ba034..4daaed1 100755
--- a/tests/qemu-iotests/248
+++ b/tests/qemu-iotests/248

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Test resume mirror after auto pause on ENOSPC
 #

diff --git a/tests/qemu-iotests/249 b/tests/qemu-iotests/249
index 29453b8..28bffd4 100755
--- a/tests/qemu-iotests/249
+++ b/tests/qemu-iotests/249

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test that a backing image is put back in read-only mode after
 # block-commit (both when it fails and when it succeeds).

diff --git a/tests/qemu-iotests/250 b/tests/qemu-iotests/250
index 3df275c..f069ca1 100755
--- a/tests/qemu-iotests/250
+++ b/tests/qemu-iotests/250

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test big discard in qcow2 shrink
 #

diff --git a/tests/qemu-iotests/251 b/tests/qemu-iotests/251
index 294773b..8bdec37 100755
--- a/tests/qemu-iotests/251
+++ b/tests/qemu-iotests/251

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test qemu-img convert --salvage
 #

diff --git a/tests/qemu-iotests/252 b/tests/qemu-iotests/252
index 1d74aff..2134b99 100755
--- a/tests/qemu-iotests/252
+++ b/tests/qemu-iotests/252

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto backing quick
 #
 # Tests for rebasing COW images that require zero cluster support
 #

diff --git a/tests/qemu-iotests/253 b/tests/qemu-iotests/253
index d88d5af..35039d2 100755
--- a/tests/qemu-iotests/253
+++ b/tests/qemu-iotests/253

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test qemu-img vs. unaligned images; O_DIRECT version
 # (Originates from 221)

diff --git a/tests/qemu-iotests/254 b/tests/qemu-iotests/254
index 150e58b..49da948 100755
--- a/tests/qemu-iotests/254
+++ b/tests/qemu-iotests/254

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw backing quick
 #
 # Test external snapshot with bitmap copying and moving.
 #

diff --git a/tests/qemu-iotests/255 b/tests/qemu-iotests/255
index 8f08f74..c43aa9c 100755
--- a/tests/qemu-iotests/255
+++ b/tests/qemu-iotests/255

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Test commit job graph modifications while requests are active
 #

diff --git a/tests/qemu-iotests/256 b/tests/qemu-iotests/256
index db8d6f3..8d82a1d 100755
--- a/tests/qemu-iotests/256
+++ b/tests/qemu-iotests/256

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw auto quick
 #
 # Test incremental/backup across iothread contexts
 #

diff --git a/tests/qemu-iotests/257 b/tests/qemu-iotests/257
index c80e06a..a2f4b5a 100755
--- a/tests/qemu-iotests/257
+++ b/tests/qemu-iotests/257

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw
 #
 # Test bitmap-sync backups (incremental, differential, and partials)
 #

diff --git a/tests/qemu-iotests/258 b/tests/qemu-iotests/258
index e305a15..9a2d33a 100755
--- a/tests/qemu-iotests/258
+++ b/tests/qemu-iotests/258

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Very specific tests for adjacent commit/stream block jobs
 #

diff --git a/tests/qemu-iotests/259 b/tests/qemu-iotests/259
index 62e29af..76cde42 100755
--- a/tests/qemu-iotests/259
+++ b/tests/qemu-iotests/259

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test generic image creation fallback (by using NBD)
 #

diff --git a/tests/qemu-iotests/260 b/tests/qemu-iotests/260
index 804a7ad..a35cb7b 100755
--- a/tests/qemu-iotests/260
+++ b/tests/qemu-iotests/260

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Tests for temporary external snapshot when we have bitmaps.
 #

diff --git a/tests/qemu-iotests/261 b/tests/qemu-iotests/261
index 847b4c6..d1c8037 100755
--- a/tests/qemu-iotests/261
+++ b/tests/qemu-iotests/261

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw
 #
 # Test case for qcow2's handling of extra data in snapshot table entries
 # (and more generally, how certain cases of broken snapshot tables are

diff --git a/tests/qemu-iotests/262 b/tests/qemu-iotests/262
index 03af061..32d6998 100755
--- a/tests/qemu-iotests/262
+++ b/tests/qemu-iotests/262

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick migration
 #
 # Copyright (C) 2019 Red Hat, Inc.
 #

diff --git a/tests/qemu-iotests/263 b/tests/qemu-iotests/263
index f598a12..ec09b41 100755
--- a/tests/qemu-iotests/263
+++ b/tests/qemu-iotests/263

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test encrypted write that crosses cluster boundary of two unallocated clusters
 # Based on 188

diff --git a/tests/qemu-iotests/264 b/tests/qemu-iotests/264
index 666f164..960f044 100755
--- a/tests/qemu-iotests/264
+++ b/tests/qemu-iotests/264

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw
 #
 # Test nbd reconnect
 #

diff --git a/tests/qemu-iotests/265 b/tests/qemu-iotests/265
index 0e800fb..4b3b52c 100755
--- a/tests/qemu-iotests/265
+++ b/tests/qemu-iotests/265

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test reverse-ordered qcow2 writes on a sub-cluster level
 #

diff --git a/tests/qemu-iotests/266 b/tests/qemu-iotests/266
index 91bdf87..71ce81d 100755
--- a/tests/qemu-iotests/266
+++ b/tests/qemu-iotests/266

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Test VPC and file image creation
 #

diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267
index e44be49..2e2afda 100755
--- a/tests/qemu-iotests/267
+++ b/tests/qemu-iotests/267

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick snapshot
 #
 # Test which nodes are involved in internal snapshots
 #

diff --git a/tests/qemu-iotests/268 b/tests/qemu-iotests/268
index ddf4312..9a8a563 100755
--- a/tests/qemu-iotests/268
+++ b/tests/qemu-iotests/268

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test write request with required alignment larger than the cluster size
 #

diff --git a/tests/qemu-iotests/270 b/tests/qemu-iotests/270
index 00339c0..7435234 100755
--- a/tests/qemu-iotests/270
+++ b/tests/qemu-iotests/270

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw backing quick
 #
 # Test large write to a qcow2 image
 #

diff --git a/tests/qemu-iotests/271 b/tests/qemu-iotests/271
index e242b28..599b849 100755
--- a/tests/qemu-iotests/271
+++ b/tests/qemu-iotests/271

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto
 #
 # Test qcow2 images with extended L2 entries
 #

diff --git a/tests/qemu-iotests/272 b/tests/qemu-iotests/272
index de475bf..4bcf410 100755
--- a/tests/qemu-iotests/272
+++ b/tests/qemu-iotests/272

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw
 #
 # Test compressed write to a qcow2 image at an offset above 4 GB
 #

diff --git a/tests/qemu-iotests/273 b/tests/qemu-iotests/273
index 79b4ab4..6c33305 100755
--- a/tests/qemu-iotests/273
+++ b/tests/qemu-iotests/273

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: backing quick
 #
 # Test multiple blockdev-snapshot calls with 'backing': null
 #

diff --git a/tests/qemu-iotests/274 b/tests/qemu-iotests/274
index 76b1ba6..caab008 100755
--- a/tests/qemu-iotests/274
+++ b/tests/qemu-iotests/274

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw backing
 #
 # Copyright (C) 2019 Red Hat, Inc.
 #

diff --git a/tests/qemu-iotests/277 b/tests/qemu-iotests/277
index a39ce2d..24833e7 100755
--- a/tests/qemu-iotests/277
+++ b/tests/qemu-iotests/277

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Test NBD client reconnection
 #

diff --git a/tests/qemu-iotests/279 b/tests/qemu-iotests/279
index 2a6315c..6afef78 100755
--- a/tests/qemu-iotests/279
+++ b/tests/qemu-iotests/279

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw backing quick
 #
 # Test qemu-img --backing-chain --image-opts
 #

diff --git a/tests/qemu-iotests/280 b/tests/qemu-iotests/280
index f594bb9..628f3c3 100755
--- a/tests/qemu-iotests/280
+++ b/tests/qemu-iotests/280

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw migration quick
 #
 # Copyright (C) 2019 Red Hat, Inc.
 #

diff --git a/tests/qemu-iotests/281 b/tests/qemu-iotests/281
index 0bf973b..9566980 100755
--- a/tests/qemu-iotests/281
+++ b/tests/qemu-iotests/281

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Test cases for blockdev + IOThread interactions
 #

diff --git a/tests/qemu-iotests/282 b/tests/qemu-iotests/282
index 27da2a0..3140445 100755
--- a/tests/qemu-iotests/282
+++ b/tests/qemu-iotests/282

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw img quick
 #
 # Test qemu-img file cleanup for LUKS when using a non-UTF8 secret
 #

diff --git a/tests/qemu-iotests/283 b/tests/qemu-iotests/283
index 383797e..79643e3 100755
--- a/tests/qemu-iotests/283
+++ b/tests/qemu-iotests/283

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: auto quick
 #
 # Test for backup-top filter permission activation failure
 #

diff --git a/tests/qemu-iotests/284 b/tests/qemu-iotests/284
index 9f6c29a..5a82639 100755
--- a/tests/qemu-iotests/284
+++ b/tests/qemu-iotests/284

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw
 #
 # Test ref count checks on encrypted images
 #

diff --git a/tests/qemu-iotests/286 b/tests/qemu-iotests/286
index f64e0ec..120a837 100755
--- a/tests/qemu-iotests/286
+++ b/tests/qemu-iotests/286

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test qemu-img snapshot -l
 #

diff --git a/tests/qemu-iotests/287 b/tests/qemu-iotests/287
index 3bb383f..22ce9ff 100755
--- a/tests/qemu-iotests/287
+++ b/tests/qemu-iotests/287

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: auto quick
 #
 # Test case for an image using zstd compression
 #

diff --git a/tests/qemu-iotests/288 b/tests/qemu-iotests/288
index 6c62065..47aca65 100755
--- a/tests/qemu-iotests/288
+++ b/tests/qemu-iotests/288

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: quick
 #
 # qemu-img measure tests for LUKS images
 #

diff --git a/tests/qemu-iotests/289 b/tests/qemu-iotests/289
index fe69bde..5dd6ec6 100755
--- a/tests/qemu-iotests/289
+++ b/tests/qemu-iotests/289

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # qcow2 v3-exclusive error path testing
 # (026 tests paths common to v2 and v3)

diff --git a/tests/qemu-iotests/290 b/tests/qemu-iotests/290
index 35c38d4..ed80da2 100755
--- a/tests/qemu-iotests/290
+++ b/tests/qemu-iotests/290

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test how 'qemu-io -c discard' behaves on v2 and v3 qcow2 images
 #

diff --git a/tests/qemu-iotests/291 b/tests/qemu-iotests/291
index bc70d5e..20efb08 100755
--- a/tests/qemu-iotests/291
+++ b/tests/qemu-iotests/291

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test qemu-img bitmap handling
 #

diff --git a/tests/qemu-iotests/292 b/tests/qemu-iotests/292
index 3ae2772..73cbb93 100755
--- a/tests/qemu-iotests/292
+++ b/tests/qemu-iotests/292

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test resizing a qcow2 image with a backing file
 #

diff --git a/tests/qemu-iotests/293 b/tests/qemu-iotests/293
index 3363bf0..3729448 100755
--- a/tests/qemu-iotests/293
+++ b/tests/qemu-iotests/293

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw
 #
 # Test encryption key management with luks
 # Based on 134

diff --git a/tests/qemu-iotests/294 b/tests/qemu-iotests/294
index 4c375ed..9059eb2 100755
--- a/tests/qemu-iotests/294
+++ b/tests/qemu-iotests/294

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Copyright (C) 2019 Red Hat, Inc.
 #

diff --git a/tests/qemu-iotests/295 b/tests/qemu-iotests/295
index 59e674f..01a6c0b 100755
--- a/tests/qemu-iotests/295
+++ b/tests/qemu-iotests/295

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw
 #
 # Test case QMP's encrypted key management
 #

diff --git a/tests/qemu-iotests/296 b/tests/qemu-iotests/296
index fb7dec8..0bc3c6c 100755
--- a/tests/qemu-iotests/296
+++ b/tests/qemu-iotests/296

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw
 #
 # Test case for encryption key management versus image sharing
 #

diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297
index 5c54207..85bc1c0 100755
--- a/tests/qemu-iotests/297
+++ b/tests/qemu-iotests/297

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: meta
 #
 # Copyright (C) 2020 Red Hat, Inc.
 #

diff --git a/tests/qemu-iotests/299 b/tests/qemu-iotests/299
index e129c7f..a712294 100755
--- a/tests/qemu-iotests/299
+++ b/tests/qemu-iotests/299

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: auto quick
 #
 # Test shutdown when bitmap is exported through NBD server
 #

diff --git a/tests/qemu-iotests/300 b/tests/qemu-iotests/300
index 5b75121..23aca59 100755
--- a/tests/qemu-iotests/300
+++ b/tests/qemu-iotests/300

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: migration
 #
 # Copyright (C) 2020 Red Hat, Inc.
 #

diff --git a/tests/qemu-iotests/301 b/tests/qemu-iotests/301
index 3823e95..9f943ca 100755
--- a/tests/qemu-iotests/301
+++ b/tests/qemu-iotests/301

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: backing quick
 #
 # Test qcow backing file warnings
 #

diff --git a/tests/qemu-iotests/302 b/tests/qemu-iotests/302
index a8506bd..5695af4 100755
--- a/tests/qemu-iotests/302
+++ b/tests/qemu-iotests/302

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: quick
 #
 # Tests converting qcow2 compressed to NBD
 #

diff --git a/tests/qemu-iotests/303 b/tests/qemu-iotests/303
index 11cd9ee..425544c 100755
--- a/tests/qemu-iotests/303
+++ b/tests/qemu-iotests/303

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Test for dumping of qcow2 image metadata
 #

diff --git a/tests/qemu-iotests/304 b/tests/qemu-iotests/304
index aaf9e14..198f282 100755
--- a/tests/qemu-iotests/304
+++ b/tests/qemu-iotests/304

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick
 #
 # Tests dirty-bitmap backup with unaligned bitmap granularity
 #

diff --git a/tests/qemu-iotests/305 b/tests/qemu-iotests/305
index 5a415eb..8b26156 100755
--- a/tests/qemu-iotests/305
+++ b/tests/qemu-iotests/305

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test the handling of errors in write requests with multiple allocations
 #

diff --git a/tests/qemu-iotests/307 b/tests/qemu-iotests/307
index de7c25f..9008974 100755
--- a/tests/qemu-iotests/307
+++ b/tests/qemu-iotests/307

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# group: rw quick export
 #
 # Copyright (C) 2020 Red Hat, Inc.
 #

diff --git a/tests/qemu-iotests/308 b/tests/qemu-iotests/308
index b30f440..f122065 100755
--- a/tests/qemu-iotests/308
+++ b/tests/qemu-iotests/308

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw
 #
 # Test FUSE exports (in ways that are not captured by the generic
 # tests)

diff --git a/tests/qemu-iotests/309 b/tests/qemu-iotests/309
index fb61157..b90b279 100755
--- a/tests/qemu-iotests/309
+++ b/tests/qemu-iotests/309

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw auto quick
 #
 # Test qemu-nbd -A
 #

diff --git a/tests/qemu-iotests/312 b/tests/qemu-iotests/312
index 4134049..4139745 100755
--- a/tests/qemu-iotests/312
+++ b/tests/qemu-iotests/312

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# group: rw quick
 #
 # Test drive-mirror with quorum
 #