diff --git a/tests/bhyveargv2xmltest.c b/tests/bhyveargv2xmltest.c
index e759e4fa30..08b2dfd4be 100644
--- a/tests/bhyveargv2xmltest.c
+++ b/tests/bhyveargv2xmltest.c
@@ -203,7 +203,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/bhyveargv2xmlmock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/bhyveargv2xmlmock.so")
 
 #else
 
diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c
index 475e626669..c8f8c685a9 100644
--- a/tests/bhyvexml2argvtest.c
+++ b/tests/bhyvexml2argvtest.c
@@ -235,7 +235,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/bhyvexml2argvmock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/bhyvexml2argvmock.so")
 
 #else
 
diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c
index 3270fee3ce..d591576ca7 100644
--- a/tests/bhyvexml2xmltest.c
+++ b/tests/bhyvexml2xmltest.c
@@ -127,7 +127,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
 
 #else
 
diff --git a/tests/commandtest.c b/tests/commandtest.c
index bfbf6a42f6..80f10f88fc 100644
--- a/tests/commandtest.c
+++ b/tests/commandtest.c
@@ -1305,6 +1305,6 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
 
 #endif /* !WIN32 */
diff --git a/tests/cputest.c b/tests/cputest.c
index 3d3e43f167..a20e418e4d 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -1012,4 +1012,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index 02cadf8ea3..f871197c25 100644
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -567,9 +567,9 @@ mymain(void)
 }
 
 #if WITH_QEMU
-VIRT_TEST_MAIN_PRELOAD(mymain,
+VIR_TEST_MAIN_PRELOAD(mymain,
                        abs_builddir "/.libs/domaincapsmock.so",
                        abs_builddir "/.libs/qemucpumock.so")
 #else
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/domaincapsmock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/domaincapsmock.so")
 #endif
diff --git a/tests/domainconftest.c b/tests/domainconftest.c
index 196e358e2e..6e7526907a 100644
--- a/tests/domainconftest.c
+++ b/tests/domainconftest.c
@@ -113,4 +113,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/domainsnapshotxml2xmltest.c
index f5fec47520..bb4d60f7da 100644
--- a/tests/domainsnapshotxml2xmltest.c
+++ b/tests/domainsnapshotxml2xmltest.c
@@ -230,7 +230,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
 
 #else
 
diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c
index e9c8d31af7..787da5169e 100644
--- a/tests/esxutilstest.c
+++ b/tests/esxutilstest.c
@@ -263,7 +263,7 @@ mymain(void)
     return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
 
 #else
 
diff --git a/tests/eventtest.c b/tests/eventtest.c
index 03ab318472..ea47fb0cba 100644
--- a/tests/eventtest.c
+++ b/tests/eventtest.c
@@ -528,4 +528,4 @@ mymain(void)
     return EXIT_SUCCESS;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/fchosttest.c b/tests/fchosttest.c
index dc6b9af988..ac4e92910d 100644
--- a/tests/fchosttest.c
+++ b/tests/fchosttest.c
@@ -380,4 +380,4 @@ mymain(void)
     return ret;
 }
 
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virrandommock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virrandommock.so")
diff --git a/tests/fdstreamtest.c b/tests/fdstreamtest.c
index 9c7d65bef6..4605845d3d 100644
--- a/tests/fdstreamtest.c
+++ b/tests/fdstreamtest.c
@@ -342,4 +342,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c
index 488190270f..1cda18cd93 100644
--- a/tests/genericxml2xmltest.c
+++ b/tests/genericxml2xmltest.c
@@ -106,4 +106,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/interfacexml2xmltest.c b/tests/interfacexml2xmltest.c
index 5e3525e440..1a1a919dfa 100644
--- a/tests/interfacexml2xmltest.c
+++ b/tests/interfacexml2xmltest.c
@@ -98,4 +98,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/jsontest.c b/tests/jsontest.c
index 8e44f1ae70..b67f68ccb2 100644
--- a/tests/jsontest.c
+++ b/tests/jsontest.c
@@ -451,4 +451,4 @@ mymain(void)
     return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/lxcconf2xmltest.c b/tests/lxcconf2xmltest.c
index 779b590612..d2f1c1d45a 100644
--- a/tests/lxcconf2xmltest.c
+++ b/tests/lxcconf2xmltest.c
@@ -127,7 +127,7 @@ mymain(void)
     return ret;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
 
 #else
 
diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c
index 2f7f779734..226a73d274 100644
--- a/tests/lxcxml2xmltest.c
+++ b/tests/lxcxml2xmltest.c
@@ -105,7 +105,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
 
 #else
 
diff --git a/tests/metadatatest.c b/tests/metadatatest.c
index 55dc841254..aed8e5a870 100644
--- a/tests/metadatatest.c
+++ b/tests/metadatatest.c
@@ -308,4 +308,4 @@ mymain(void)
     return ret;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c
index e2522fccd7..ab3c13aa0a 100644
--- a/tests/networkxml2conftest.c
+++ b/tests/networkxml2conftest.c
@@ -151,4 +151,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c
index f3a501a0b0..58a9516686 100644
--- a/tests/networkxml2firewalltest.c
+++ b/tests/networkxml2firewalltest.c
@@ -147,7 +147,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
 
 #else /* ! defined (__linux__) */
 
diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c
index effd85ad05..ea1a08988e 100644
--- a/tests/networkxml2xmltest.c
+++ b/tests/networkxml2xmltest.c
@@ -164,4 +164,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/networkxml2xmlupdatetest.c b/tests/networkxml2xmlupdatetest.c
index 7b01abc6f9..1cbd811a2f 100644
--- a/tests/networkxml2xmlupdatetest.c
+++ b/tests/networkxml2xmlupdatetest.c
@@ -363,4 +363,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c
index 5e1ae170c3..f023d8a133 100644
--- a/tests/nodedevxml2xmltest.c
+++ b/tests/nodedevxml2xmltest.c
@@ -105,4 +105,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/nsstest.c b/tests/nsstest.c
index 915a8bceb5..ca5b47527b 100644
--- a/tests/nsstest.c
+++ b/tests/nsstest.c
@@ -198,7 +198,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/nssmock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/nssmock.so")
 #else
 int
 main(void)
diff --git a/tests/nwfilterebiptablestest.c b/tests/nwfilterebiptablestest.c
index 74f9ebd366..4357133783 100644
--- a/tests/nwfilterebiptablestest.c
+++ b/tests/nwfilterebiptablestest.c
@@ -569,4 +569,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewalltest.c
index ba327d0195..95ab46e22e 100644
--- a/tests/nwfilterxml2firewalltest.c
+++ b/tests/nwfilterxml2firewalltest.c
@@ -516,7 +516,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
 
 #else /* ! defined (__linux__) */
 
diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c
index 9beb8b663a..d7457a0687 100644
--- a/tests/nwfilterxml2xmltest.c
+++ b/tests/nwfilterxml2xmltest.c
@@ -152,4 +152,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/objecteventtest.c b/tests/objecteventtest.c
index 5df6ff91e7..77a48a1495 100644
--- a/tests/objecteventtest.c
+++ b/tests/objecteventtest.c
@@ -849,4 +849,4 @@ mymain(void)
     return ret;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c
index c7336e7e87..8250277caf 100644
--- a/tests/openvzutilstest.c
+++ b/tests/openvzutilstest.c
@@ -155,7 +155,7 @@ mymain(void)
     return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
 
 #else
 
diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c
index 3be745e7c2..41a0196c46 100644
--- a/tests/qemuagenttest.c
+++ b/tests/qemuagenttest.c
@@ -938,4 +938,4 @@ mymain(void)
     return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c
index a709c72cf1..0b519a460b 100644
--- a/tests/qemuargv2xmltest.c
+++ b/tests/qemuargv2xmltest.c
@@ -293,7 +293,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
 
 #else
 
diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
index 2918ff4695..bbb683eb83 100644
--- a/tests/qemucapabilitiestest.c
+++ b/tests/qemucapabilitiestest.c
@@ -186,4 +186,4 @@ mymain(void)
     return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c
index 1b1ff7c1e6..65ba27048f 100644
--- a/tests/qemucaps2xmltest.c
+++ b/tests/qemucaps2xmltest.c
@@ -189,4 +189,4 @@ mymain(void)
     return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/qemucaps2xmlmock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/qemucaps2xmlmock.so")
diff --git a/tests/qemucapsprobe.c b/tests/qemucapsprobe.c
index 561c5d7c14..662c7036ed 100644
--- a/tests/qemucapsprobe.c
+++ b/tests/qemucapsprobe.c
@@ -48,7 +48,7 @@ main(int argc, char **argv)
     virThread thread;
     virQEMUCapsPtr caps;
 
-    VIRT_TEST_PRELOAD(abs_builddir "/.libs/qemucapsprobemock.so");
+    VIR_TEST_PRELOAD(abs_builddir "/.libs/qemucapsprobemock.so");
 
     if (argc != 2) {
         fprintf(stderr, "%s QEMU_binary\n", argv[0]);
diff --git a/tests/qemucommandutiltest.c b/tests/qemucommandutiltest.c
index 1985983dac..b11dfbc730 100644
--- a/tests/qemucommandutiltest.c
+++ b/tests/qemucommandutiltest.c
@@ -155,4 +155,4 @@ mymain(void)
 
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index c7355e3d53..e3751b2d03 100644
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -431,7 +431,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
 
 #else
 
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index cdeb3f1bfb..e835999c72 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -856,4 +856,4 @@ mymain(void)
     return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c
index 48b0565d68..6cf17a4b4a 100644
--- a/tests/qemumemlocktest.c
+++ b/tests/qemumemlocktest.c
@@ -129,7 +129,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
 
 #else
 
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 5d53609349..a2911b0f40 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -2941,4 +2941,4 @@ mymain(void)
     return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/qemumonitortest.c b/tests/qemumonitortest.c
index 48f7ad2100..cfb55143e1 100644
--- a/tests/qemumonitortest.c
+++ b/tests/qemumonitortest.c
@@ -191,7 +191,7 @@ mymain(void)
     return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
 
 #else
 
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index cfd6dcd55e..0b26cd5c7c 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2523,7 +2523,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN_PRELOAD(mymain,
+VIR_TEST_MAIN_PRELOAD(mymain,
                        abs_builddir "/.libs/qemuxml2argvmock.so",
                        abs_builddir "/.libs/virrandommock.so",
                        abs_builddir "/.libs/qemucpumock.so")
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index eae999dd63..252f1ed5f2 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1139,7 +1139,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/qemuxml2xmlmock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/qemuxml2xmlmock.so")
 
 #else
 
diff --git a/tests/scsihosttest.c b/tests/scsihosttest.c
index 9efc2d250f..6989e4fc4a 100644
--- a/tests/scsihosttest.c
+++ b/tests/scsihosttest.c
@@ -303,7 +303,7 @@ mymain(void)
     return ret;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
 #else
 int
 main(void)
diff --git a/tests/seclabeltest.c b/tests/seclabeltest.c
index be6e79ff6a..4cda80cec2 100644
--- a/tests/seclabeltest.c
+++ b/tests/seclabeltest.c
@@ -43,4 +43,4 @@ mymain(void)
     return 0;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/secretxml2xmltest.c b/tests/secretxml2xmltest.c
index 714c709090..19bd60a911 100644
--- a/tests/secretxml2xmltest.c
+++ b/tests/secretxml2xmltest.c
@@ -85,4 +85,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c
index 6d9c7bada9..d4ef9831ad 100644
--- a/tests/securityselinuxlabeltest.c
+++ b/tests/securityselinuxlabeltest.c
@@ -379,4 +379,4 @@ mymain(void)
     return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelper.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelper.so")
diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c
index aba1e8e34e..63161b9b3b 100644
--- a/tests/securityselinuxtest.c
+++ b/tests/securityselinuxtest.c
@@ -340,4 +340,4 @@ mymain(void)
     return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelper.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelper.so")
diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c
index 9982fad9f7..107509b31a 100644
--- a/tests/sexpr2xmltest.c
+++ b/tests/sexpr2xmltest.c
@@ -196,4 +196,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/sockettest.c b/tests/sockettest.c
index 4d49b38aa1..2db90bd02e 100644
--- a/tests/sockettest.c
+++ b/tests/sockettest.c
@@ -482,4 +482,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c
index 1f6341f8ad..75c3dd5dda 100644
--- a/tests/storagebackendsheepdogtest.c
+++ b/tests/storagebackendsheepdogtest.c
@@ -227,4 +227,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c
index 355871c618..2f44c3f342 100644
--- a/tests/storagepoolxml2xmltest.c
+++ b/tests/storagepoolxml2xmltest.c
@@ -106,4 +106,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c
index 24c3bac20d..9e432045fe 100644
--- a/tests/storagevolxml2argvtest.c
+++ b/tests/storagevolxml2argvtest.c
@@ -282,4 +282,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/storagevolxml2xmltest.c b/tests/storagevolxml2xmltest.c
index 18e8016cb3..8521adf966 100644
--- a/tests/storagevolxml2xmltest.c
+++ b/tests/storagevolxml2xmltest.c
@@ -120,4 +120,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c
index 047e87b7a4..2b32828199 100644
--- a/tests/sysinfotest.c
+++ b/tests/sysinfotest.c
@@ -150,4 +150,4 @@ mymain(void)
 #undef TEST
 #undef TEST_FULL
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/testutils.c b/tests/testutils.c
index f3feb6d3f9..817fffa041 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -904,11 +904,11 @@ int virTestMain(int argc,
     virLogOutputPtr *outputs = NULL;
 
     if (getenv("VIR_TEST_FILE_ACCESS"))
-        VIRT_TEST_PRELOAD(TEST_MOCK);
+        VIR_TEST_PRELOAD(TEST_MOCK);
 
     va_start(ap, func);
     while ((lib = va_arg(ap, const char *)))
-        VIRT_TEST_PRELOAD(lib);
+        VIR_TEST_PRELOAD(lib);
     va_end(ap);
 
     progname = last_component(argv[0]);
diff --git a/tests/testutils.h b/tests/testutils.h
index c16fe6cc1e..c7f02e468f 100644
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -110,12 +110,12 @@ int virTestMain(int argc,
                 ...);
 
 /* Setup, then call func() */
-# define VIRT_TEST_MAIN(func)                           \
+# define VIR_TEST_MAIN(func)                            \
     int main(int argc, char **argv) {                   \
         return virTestMain(argc, argv, func, NULL);     \
     }
 
-# define VIRT_TEST_PRELOAD(lib)                                         \
+# define VIR_TEST_PRELOAD(lib)                                          \
     do {                                                                \
         const char *preload = getenv("LD_PRELOAD");                     \
         if (preload == NULL || strstr(preload, lib) == NULL) {          \
@@ -135,7 +135,7 @@ int virTestMain(int argc,
         }                                                               \
     } while (0)
 
-# define VIRT_TEST_MAIN_PRELOAD(func, ...)                              \
+# define VIR_TEST_MAIN_PRELOAD(func, ...)                               \
     int main(int argc, char **argv) {                                   \
         return virTestMain(argc, argv, func, __VA_ARGS__, NULL);        \
     }
diff --git a/tests/utiltest.c b/tests/utiltest.c
index bd55d447b1..f80329b30e 100644
--- a/tests/utiltest.c
+++ b/tests/utiltest.c
@@ -284,4 +284,4 @@ mymain(void)
     return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/vboxsnapshotxmltest.c b/tests/vboxsnapshotxmltest.c
index f84d199e60..1faac50652 100644
--- a/tests/vboxsnapshotxmltest.c
+++ b/tests/vboxsnapshotxmltest.c
@@ -152,7 +152,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
 
 #else
 
diff --git a/tests/viralloctest.c b/tests/viralloctest.c
index 82c33114f9..27cbdcbbe4 100644
--- a/tests/viralloctest.c
+++ b/tests/viralloctest.c
@@ -441,4 +441,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/viratomictest.c b/tests/viratomictest.c
index 5185045386..52f17154e9 100644
--- a/tests/viratomictest.c
+++ b/tests/viratomictest.c
@@ -175,4 +175,4 @@ mymain(void)
     return ret;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c
index 6879a29d9d..cf40ec4659 100644
--- a/tests/virauthconfigtest.c
+++ b/tests/virauthconfigtest.c
@@ -138,4 +138,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c
index e007efc28b..e5305d0223 100644
--- a/tests/virbitmaptest.c
+++ b/tests/virbitmaptest.c
@@ -714,4 +714,4 @@ mymain(void)
     return ret;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/virbuftest.c b/tests/virbuftest.c
index 8ec6ce51ed..5905fee7d4 100644
--- a/tests/virbuftest.c
+++ b/tests/virbuftest.c
@@ -495,4 +495,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c
index ffbe9a7838..670bb8c375 100644
--- a/tests/vircaps2xmltest.c
+++ b/tests/vircaps2xmltest.c
@@ -107,4 +107,4 @@ mymain(void)
     return ret;
 }
 
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnumamock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnumamock.so")
diff --git a/tests/vircapstest.c b/tests/vircapstest.c
index 27d17bdde9..bc6362dc4c 100644
--- a/tests/vircapstest.c
+++ b/tests/vircapstest.c
@@ -345,4 +345,4 @@ mymain(void)
     return ret;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
index f55ef74a1b..8af5e2c8ef 100644
--- a/tests/vircgrouptest.c
+++ b/tests/vircgrouptest.c
@@ -944,7 +944,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/vircgroupmock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/vircgroupmock.so")
 
 #else
 int
diff --git a/tests/virconftest.c b/tests/virconftest.c
index 4fc7993ddc..1f4b561bb6 100644
--- a/tests/virconftest.c
+++ b/tests/virconftest.c
@@ -430,4 +430,4 @@ mymain(void)
 }
 
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/vircryptotest.c b/tests/vircryptotest.c
index 98bd059e66..b702b70b5e 100644
--- a/tests/vircryptotest.c
+++ b/tests/vircryptotest.c
@@ -179,4 +179,4 @@ mymain(void)
 }
 
 /* Forces usage of not so random virRandomBytes */
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virrandommock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virrandommock.so")
diff --git a/tests/virdbustest.c b/tests/virdbustest.c
index 4e61cb3464..3be9cf17ed 100644
--- a/tests/virdbustest.c
+++ b/tests/virdbustest.c
@@ -727,4 +727,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c
index 13d51a8e9a..cfb2dbdb4d 100644
--- a/tests/virdrivermoduletest.c
+++ b/tests/virdrivermoduletest.c
@@ -107,4 +107,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/virendiantest.c b/tests/virendiantest.c
index f858e5cb75..263acc8e52 100644
--- a/tests/virendiantest.c
+++ b/tests/virendiantest.c
@@ -117,4 +117,4 @@ mymain(void)
     return ret;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/virfiletest.c b/tests/virfiletest.c
index 05148e94ad..702a76a501 100644
--- a/tests/virfiletest.c
+++ b/tests/virfiletest.c
@@ -189,4 +189,4 @@ mymain(void)
     return ret != 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c
index 6f4fed5ce3..0f703a6bdc 100644
--- a/tests/virfirewalltest.c
+++ b/tests/virfirewalltest.c
@@ -1184,9 +1184,9 @@ mymain(void)
 }
 
 # if WITH_DBUS
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virdbusmock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virdbusmock.so")
 # else
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
 # endif
 
 #else /* ! defined (__linux__) */
diff --git a/tests/virhashtest.c b/tests/virhashtest.c
index 40afd63e71..dbf07ae7f7 100644
--- a/tests/virhashtest.c
+++ b/tests/virhashtest.c
@@ -639,4 +639,4 @@ mymain(void)
     return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c
index 10e49ea4f0..b415ec5f1b 100644
--- a/tests/virhostcputest.c
+++ b/tests/virhostcputest.c
@@ -265,6 +265,6 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virhostcpumock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virhostcpumock.so")
 
 #endif /* __linux__ */
diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c
index 889701cf63..b3beee99f2 100644
--- a/tests/virhostdevtest.c
+++ b/tests/virhostdevtest.c
@@ -633,7 +633,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virpcimock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virpcimock.so")
 #else
 int
 main(void)
diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c
index c7dc89da2d..dfa29478e0 100644
--- a/tests/viridentitytest.c
+++ b/tests/viridentitytest.c
@@ -243,7 +243,7 @@ mymain(void)
 }
 
 #if WITH_SELINUX
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelper.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelper.so")
 #else
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
 #endif
diff --git a/tests/viriscsitest.c b/tests/viriscsitest.c
index ed66497a00..c95171aa31 100644
--- a/tests/viriscsitest.c
+++ b/tests/viriscsitest.c
@@ -217,5 +217,5 @@ mymain(void)
     return EXIT_SUCCESS;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
 #endif /* WIN32 */
diff --git a/tests/virkeycodetest.c b/tests/virkeycodetest.c
index d092209d44..d4cb973dbe 100644
--- a/tests/virkeycodetest.c
+++ b/tests/virkeycodetest.c
@@ -105,4 +105,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/virkeyfiletest.c b/tests/virkeyfiletest.c
index c4ce320dc7..aec692468f 100644
--- a/tests/virkeyfiletest.c
+++ b/tests/virkeyfiletest.c
@@ -120,4 +120,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/virkmodtest.c b/tests/virkmodtest.c
index b98edf9b0f..47ca181fae 100644
--- a/tests/virkmodtest.c
+++ b/tests/virkmodtest.c
@@ -174,7 +174,7 @@ mymain(void)
 
 }
 
-VIRT_TEST_MAIN(mymain);
+VIR_TEST_MAIN(mymain);
 #else
 int
 main(void)
diff --git a/tests/virlockspacetest.c b/tests/virlockspacetest.c
index cb0b88913d..75ad98a02c 100644
--- a/tests/virlockspacetest.c
+++ b/tests/virlockspacetest.c
@@ -371,4 +371,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/virlogtest.c b/tests/virlogtest.c
index b2c66f7a0d..eb07fab902 100644
--- a/tests/virlogtest.c
+++ b/tests/virlogtest.c
@@ -154,4 +154,4 @@ mymain(void)
     return ret;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/virmacmaptest.c b/tests/virmacmaptest.c
index 4daa048848..35e3127717 100644
--- a/tests/virmacmaptest.c
+++ b/tests/virmacmaptest.c
@@ -234,4 +234,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virmacmapmock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virmacmapmock.so")
diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c
index 91030f42c0..b86eea0ae3 100644
--- a/tests/virnetdaemontest.c
+++ b/tests/virnetdaemontest.c
@@ -344,12 +344,12 @@ mymain(void)
 
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnetdaemonmock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnetdaemonmock.so")
 #else
 static int
 mymain(void)
 {
     return EXIT_AM_SKIP;
 }
-VIRT_TEST_MAIN(mymain);
+VIR_TEST_MAIN(mymain);
 #endif
diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c
index 49283fec4a..a8f4ab1966 100644
--- a/tests/virnetdevbandwidthtest.c
+++ b/tests/virnetdevbandwidthtest.c
@@ -167,4 +167,4 @@ mymain(void)
     return ret;
 }
 
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnetdevbandwidthmock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnetdevbandwidthmock.so")
diff --git a/tests/virnetdevtest.c b/tests/virnetdevtest.c
index 7c8a03f9b7..06e4a03a9b 100644
--- a/tests/virnetdevtest.c
+++ b/tests/virnetdevtest.c
@@ -84,7 +84,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnetdevmock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnetdevmock.so")
 #else
 int
 main(void)
diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c
index 8189031f54..be7d019c31 100644
--- a/tests/virnetmessagetest.c
+++ b/tests/virnetmessagetest.c
@@ -547,4 +547,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/virnetserverclienttest.c b/tests/virnetserverclienttest.c
index 893db8a759..c80870141c 100644
--- a/tests/virnetserverclienttest.c
+++ b/tests/virnetserverclienttest.c
@@ -149,12 +149,12 @@ mymain(void)
 
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnetserverclientmock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnetserverclientmock.so")
 #else
 static int
 mymain(void)
 {
     return EXIT_AM_SKIP;
 }
-VIRT_TEST_MAIN(mymain);
+VIR_TEST_MAIN(mymain);
 #endif
diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
index cafdca997d..c36886137a 100644
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -597,4 +597,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c
index 9f62413eed..a5583bdfc2 100644
--- a/tests/virnettlscontexttest.c
+++ b/tests/virnettlscontexttest.c
@@ -633,7 +633,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virrandommock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virrandommock.so")
 
 #else
 
diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c
index 24de212d9b..47be5a0243 100644
--- a/tests/virnettlssessiontest.c
+++ b/tests/virnettlssessiontest.c
@@ -487,7 +487,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virrandommock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virrandommock.so")
 
 #else
 
diff --git a/tests/virpcitest.c b/tests/virpcitest.c
index 9221c991f4..fba6189767 100644
--- a/tests/virpcitest.c
+++ b/tests/virpcitest.c
@@ -456,7 +456,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virpcimock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virpcimock.so")
 #else
 int
 main(void)
diff --git a/tests/virpolkittest.c b/tests/virpolkittest.c
index 4495c7c888..fe7666bd35 100644
--- a/tests/virpolkittest.c
+++ b/tests/virpolkittest.c
@@ -350,7 +350,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virdbusmock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virdbusmock.so")
 
 #else /* ! __ELF__ */
 int
diff --git a/tests/virportallocatortest.c b/tests/virportallocatortest.c
index 2c8bc24406..ed9c4f2854 100644
--- a/tests/virportallocatortest.c
+++ b/tests/virportallocatortest.c
@@ -174,7 +174,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virportallocatormock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virportallocatormock.so")
 #else /* defined(__linux__) && defined(RTLD_NEXT) */
 int
 main(void)
diff --git a/tests/virrotatingfiletest.c b/tests/virrotatingfiletest.c
index 81e7b3ff4c..89ceda8e49 100644
--- a/tests/virrotatingfiletest.c
+++ b/tests/virrotatingfiletest.c
@@ -741,4 +741,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/virschematest.c b/tests/virschematest.c
index 4f194804af..1f990f7cd5 100644
--- a/tests/virschematest.c
+++ b/tests/virschematest.c
@@ -241,4 +241,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/virscsitest.c b/tests/virscsitest.c
index 4a0bbb80f9..dd1689c7f1 100644
--- a/tests/virscsitest.c
+++ b/tests/virscsitest.c
@@ -247,4 +247,4 @@ mymain(void)
     return ret;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/virshtest.c b/tests/virshtest.c
index 2f1022416a..16a584d74a 100644
--- a/tests/virshtest.c
+++ b/tests/virshtest.c
@@ -419,6 +419,6 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
 
 #endif /* WIN32 */
diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index 984994d8e7..70e24a1b70 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -1512,4 +1512,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/virstorageutiltest.c b/tests/virstorageutiltest.c
index f82d5174f6..cc860a3056 100644
--- a/tests/virstorageutiltest.c
+++ b/tests/virstorageutiltest.c
@@ -111,4 +111,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/virstringtest.c b/tests/virstringtest.c
index db1731f96a..96bc79f832 100644
--- a/tests/virstringtest.c
+++ b/tests/virstringtest.c
@@ -961,4 +961,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c
index 4cf4021308..15642759e9 100644
--- a/tests/virsystemdtest.c
+++ b/tests/virsystemdtest.c
@@ -604,7 +604,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virdbusmock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virdbusmock.so")
 
 #else /* ! (WITH_DBUS && __linux__) */
 int
diff --git a/tests/virtimetest.c b/tests/virtimetest.c
index dd521779ed..93be91f62d 100644
--- a/tests/virtimetest.c
+++ b/tests/virtimetest.c
@@ -223,4 +223,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/virtypedparamtest.c b/tests/virtypedparamtest.c
index 97dd82a66a..fbacfa85ad 100644
--- a/tests/virtypedparamtest.c
+++ b/tests/virtypedparamtest.c
@@ -307,4 +307,4 @@ mymain(void)
     return EXIT_SUCCESS;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/viruritest.c b/tests/viruritest.c
index 0d392eee15..c297574bd7 100644
--- a/tests/viruritest.c
+++ b/tests/viruritest.c
@@ -226,4 +226,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/virusbtest.c b/tests/virusbtest.c
index 7cddb89afb..1a2ad56510 100644
--- a/tests/virusbtest.c
+++ b/tests/virusbtest.c
@@ -291,4 +291,4 @@ mymain(void)
     return EXIT_SUCCESS;
 }
 
-VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virusbmock.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virusbmock.so")
diff --git a/tests/vmwarevertest.c b/tests/vmwarevertest.c
index 9c17cc6500..3dbe08b389 100644
--- a/tests/vmwarevertest.c
+++ b/tests/vmwarevertest.c
@@ -94,7 +94,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
 
 #else
 
diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c
index 9b59fd5ea7..4eedbac2bc 100644
--- a/tests/vmx2xmltest.c
+++ b/tests/vmx2xmltest.c
@@ -295,7 +295,7 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
 
 #else
 
diff --git a/tests/xencapstest.c b/tests/xencapstest.c
index 0e83d8acf1..7cbd43faa0 100644
--- a/tests/xencapstest.c
+++ b/tests/xencapstest.c
@@ -221,4 +221,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c
index e74e4d60db..73702acc21 100644
--- a/tests/xlconfigtest.c
+++ b/tests/xlconfigtest.c
@@ -299,4 +299,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c
index 63997777cc..aa3845bf00 100644
--- a/tests/xmconfigtest.c
+++ b/tests/xmconfigtest.c
@@ -256,4 +256,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c
index 0b95113118..fddccf0296 100644
--- a/tests/xml2sexprtest.c
+++ b/tests/xml2sexprtest.c
@@ -167,4 +167,4 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c
index b77be893c6..71c4cb9dc8 100644
--- a/tests/xml2vmxtest.c
+++ b/tests/xml2vmxtest.c
@@ -304,7 +304,7 @@ mymain(void)
     return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIRT_TEST_MAIN(mymain)
+VIR_TEST_MAIN(mymain)
 
 #else