diff --git a/tests/qemuxml2argvdata/hugepages-pages6.args b/tests/qemuxml2argvdata/hugepages-default-system-size.args
similarity index 71%
rename from tests/qemuxml2argvdata/hugepages-pages6.args
rename to tests/qemuxml2argvdata/hugepages-default-system-size.args
index fa81399283..ac7cb167e3 100644
--- a/tests/qemuxml2argvdata/hugepages-pages6.args
+++ b/tests/qemuxml2argvdata/hugepages-default-system-size.args
@@ -20,8 +20,4 @@ path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--usb \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
--device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\
-bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-usb
diff --git a/tests/qemuxml2argvdata/hugepages-pages6.xml b/tests/qemuxml2argvdata/hugepages-default-system-size.xml
similarity index 63%
rename from tests/qemuxml2argvdata/hugepages-pages6.xml
rename to tests/qemuxml2argvdata/hugepages-default-system-size.xml
index fc4f57fbc0..8a809ead5e 100644
--- a/tests/qemuxml2argvdata/hugepages-pages6.xml
+++ b/tests/qemuxml2argvdata/hugepages-default-system-size.xml
@@ -19,23 +19,12 @@
destroy
/usr/bin/qemu-system-i686
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index da961e0977..ee71ab34aa 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -953,6 +953,7 @@ mymain(void)
QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
DO_TEST("hugepages-default", NONE);
DO_TEST("hugepages-default-2M", NONE);
+ DO_TEST("hugepages-default-system-size", NONE);
DO_TEST("hugepages-numa-default",
QEMU_CAPS_OBJECT_MEMORY_FILE);
DO_TEST("hugepages-numa-default-2M",
@@ -974,7 +975,6 @@ mymain(void)
QEMU_CAPS_OBJECT_MEMORY_RAM,
QEMU_CAPS_OBJECT_MEMORY_FILE);
DO_TEST_PARSE_ERROR("hugepages-memaccess-invalid", NONE);
- DO_TEST("hugepages-pages6", NONE);
DO_TEST("hugepages-pages7",
QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_OBJECT_MEMORY_FILE,
QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
diff --git a/tests/qemuxml2xmloutdata/hugepages-default-system-size.xml b/tests/qemuxml2xmloutdata/hugepages-default-system-size.xml
new file mode 120000
index 0000000000..e64e3fb282
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hugepages-default-system-size.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/hugepages-default-system-size.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/hugepages-pages6.xml b/tests/qemuxml2xmloutdata/hugepages-pages6.xml
deleted file mode 120000
index 584b7c92c8..0000000000
--- a/tests/qemuxml2xmloutdata/hugepages-pages6.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/hugepages-pages6.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 1367160682..9e2ec6e1b4 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -329,12 +329,12 @@ mymain(void)
DO_TEST("pages-discard-hugepages", NONE);
DO_TEST("hugepages-default", NONE);
DO_TEST("hugepages-default-2M", NONE);
+ DO_TEST("hugepages-default-system-size", NONE);
DO_TEST("hugepages-numa-default-2M", NONE);
DO_TEST("hugepages-numa-default-dimm", NONE);
DO_TEST("hugepages-numa-nodeset", NONE);
DO_TEST("hugepages-numa-nodeset-part", NONE);
DO_TEST("hugepages-numa-nodeset-nonexist", NONE);
- DO_TEST("hugepages-pages6", NONE);
DO_TEST("hugepages-pages7", NONE);
DO_TEST("hugepages-shared", NONE);
DO_TEST("hugepages-memaccess", NONE);