diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-both.args b/tests/qemuxml2argvdata/aarch64-gic-default-both.args
new file mode 120000
index 0000000000..04ecd4ce76
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-default-both.args
@@ -0,0 +1 @@
+aarch64-gic-v2.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-both.xml b/tests/qemuxml2argvdata/aarch64-gic-default-both.xml
new file mode 120000
index 0000000000..3e2183c920
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-default-both.xml
@@ -0,0 +1 @@
+aarch64-gic-default.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v2.args b/tests/qemuxml2argvdata/aarch64-gic-default-v2.args
new file mode 120000
index 0000000000..04ecd4ce76
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-default-v2.args
@@ -0,0 +1 @@
+aarch64-gic-v2.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v2.xml b/tests/qemuxml2argvdata/aarch64-gic-default-v2.xml
new file mode 120000
index 0000000000..3e2183c920
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-default-v2.xml
@@ -0,0 +1 @@
+aarch64-gic-default.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v3.args b/tests/qemuxml2argvdata/aarch64-gic-default-v3.args
new file mode 120000
index 0000000000..04ecd4ce76
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-default-v3.args
@@ -0,0 +1 @@
+aarch64-gic-v2.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v3.xml b/tests/qemuxml2argvdata/aarch64-gic-default-v3.xml
new file mode 120000
index 0000000000..3e2183c920
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-default-v3.xml
@@ -0,0 +1 @@
+aarch64-gic-default.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 70e66de148..fec4da3652 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2606,13 +2606,13 @@ mymain(void)
     DO_TEST_GIC("aarch64-gic-default", GIC_NONE,
             QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT,
             QEMU_CAPS_MACH_VIRT_GIC_VERSION);
-    DO_TEST_GIC("aarch64-gic-default", GIC_V2,
+    DO_TEST_GIC("aarch64-gic-default-v2", GIC_V2,
             QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT,
             QEMU_CAPS_MACH_VIRT_GIC_VERSION);
-    DO_TEST_GIC("aarch64-gic-default", GIC_V3,
+    DO_TEST_GIC("aarch64-gic-default-v3", GIC_V3,
             QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT,
             QEMU_CAPS_MACH_VIRT_GIC_VERSION);
-    DO_TEST_GIC("aarch64-gic-default", GIC_BOTH,
+    DO_TEST_GIC("aarch64-gic-default-both", GIC_BOTH,
             QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT,
             QEMU_CAPS_MACH_VIRT_GIC_VERSION);
     DO_TEST_GIC("aarch64-gic-v2", GIC_NONE,
diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml b/tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml
new file mode 120000
index 0000000000..ee470fb1fa
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/aarch64-gic-v2.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml b/tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml
new file mode 120000
index 0000000000..ee470fb1fa
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/aarch64-gic-v2.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml b/tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml
new file mode 120000
index 0000000000..ee470fb1fa
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/aarch64-gic-v2.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index d3544a1efd..83809574c3 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1265,9 +1265,9 @@ mymain(void)
     DO_TEST_FULL("aarch64-gic-none-both", WHEN_BOTH, GIC_BOTH, NONE);
     DO_TEST_FULL("aarch64-gic-none-tcg", WHEN_BOTH, GIC_BOTH, NONE);
     DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_NONE, NONE);
-    DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_V2, NONE);
-    DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_V3, NONE);
-    DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_BOTH, NONE);
+    DO_TEST_FULL("aarch64-gic-default-v2", WHEN_BOTH, GIC_V2, NONE);
+    DO_TEST_FULL("aarch64-gic-default-v3", WHEN_BOTH, GIC_V3, NONE);
+    DO_TEST_FULL("aarch64-gic-default-both", WHEN_BOTH, GIC_BOTH, NONE);
     DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, GIC_NONE, NONE);
     DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, GIC_V2, NONE);
     DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, GIC_V3, NONE);