diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c
index adff05aef5..8338af3318 100644
--- a/tests/qemuargv2xmltest.c
+++ b/tests/qemuargv2xmltest.c
@@ -13,7 +13,7 @@
 
 # include "internal.h"
 # include "testutils.h"
-# include "qemu/qemu_conf.h"
+# include "qemu/qemu_command.h"
 
 # include "testutilsqemu.h"
 
diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index 6ff1feb816..553abbc9ab 100644
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -6,7 +6,7 @@
 # include <stdlib.h>
 
 # include "testutils.h"
-# include "qemu/qemu_conf.h"
+# include "qemu/qemu_capabilities.h"
 
 # define MAX_HELP_OUTPUT_SIZE 1024*64
 
@@ -50,8 +50,8 @@ static int testHelpStrParsing(const void *data)
     if (virtTestLoadFile(path, &help, MAX_HELP_OUTPUT_SIZE) < 0)
         return -1;
 
-    if (qemudParseHelpStr("QEMU", help, &flags,
-                          &version, &is_kvm, &kvm_version) == -1)
+    if (qemuCapsParseHelpStr("QEMU", help, &flags,
+                             &version, &is_kvm, &kvm_version) == -1)
         return -1;
 
     if (flags != info->flags) {
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 5387432f41..6760f671d0 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -13,7 +13,8 @@
 
 # include "internal.h"
 # include "testutils.h"
-# include "qemu/qemu_conf.h"
+# include "qemu/qemu_capabilities.h"
+# include "qemu/qemu_command.h"
 # include "datatypes.h"
 # include "cpu/cpu_map.h"
 
@@ -110,9 +111,9 @@ static int testCompareXMLToArgvFiles(const char *xml,
     free(virtTestLogContentAndReset());
     virResetLastError();
 
-    if (!(cmd = qemudBuildCommandLine(conn, &driver,
-                                      vmdef, &monitor_chr, false, flags,
-                                      migrateFrom, NULL, VIR_VM_OP_CREATE)))
+    if (!(cmd = qemuBuildCommandLine(conn, &driver,
+                                     vmdef, &monitor_chr, false, flags,
+                                     migrateFrom, NULL, VIR_VM_OP_CREATE)))
         goto fail;
 
     if (!!virGetLastError() != expectError) {
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 72fc8aa99f..bfac307284 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -8,6 +8,7 @@
 # include "memory.h"
 # include "cpu_conf.h"
 # include "qemu/qemu_driver.h"
+# include "qemu/qemu_domain.h"
 
 static virCapsGuestMachinePtr *testQemuAllocMachines(int *nmachines)
 {
@@ -102,10 +103,7 @@ virCapsPtr testQemuCapsInit(void) {
         (machines = testQemuAllocMachines(&nmachines)) == NULL)
         goto cleanup;
 
-    caps->ns.parse = qemuDomainDefNamespaceParse;
-    caps->ns.free = qemuDomainDefNamespaceFree;
-    caps->ns.format = qemuDomainDefNamespaceFormatXML;
-    caps->ns.href = qemuDomainDefNamespaceHref;
+    qemuDomainSetNamespaceHooks(caps);
 
     if ((guest = virCapabilitiesAddGuest(caps, "hvm", "i686", 32,
                                          "/usr/bin/qemu", NULL,