diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
index 87807b413509d37ee6cfe01202205425a910cbcc..acfa1106e40839f960ff0e237d5efb52ec790299 100644
--- a/tests/qemucapabilitiestest.c
+++ b/tests/qemucapabilitiestest.c
@@ -192,6 +192,9 @@ mymain(void)
     /*
      * Run "tests/qemucapsprobe /path/to/qemu/binary >foo.replies"
      * to generate updated or new *.replies data files.
+     *
+     * If you manually edit replies files you can run
+     * "tests/qemucapsfixreplies foo.replies" to fix the replies ids.
      */
 
     qemuTestDriverFree(&driver);
diff --git a/tests/qemucapsfixreplies b/tests/qemucapsfixreplies
new file mode 100755
index 0000000000000000000000000000000000000000..4e3371a1f750e95fa287a2999930d3a60e32f967
--- /dev/null
+++ b/tests/qemucapsfixreplies
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+if [ "$#" -ne 1 ] || [ "$1" = "--help" ] || [ ! -f "$1" ]; then
+    echo "This script fixes replies ids in QEMU replies files."
+    echo ""
+    echo "      Usage: $0 path/to/qemu.replies"
+    exit 0
+fi
+
+awk -i inplace \
+    'BEGIN {count=1; pattern="libvirt-[0-9]+"}
+    {
+        if (match($0, "libvirt-1[^0-9]")) {
+            count=1;
+        }
+        if (match($0, pattern)) {
+            str="libvirt-" count;
+            sub(pattern, str, $0);
+            count++;
+        }
+        print
+    }' "$1"