diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg
index 1fac3a55ea..f452af62d8 100644
--- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg
+++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg
@@ -8,6 +8,7 @@ acpi = 1
 apic = 1
 hap = 0
 viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -18,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 builder = "hvm"
diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
index d59aa2126c..f750e02074 100644
--- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
+++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
@@ -17,7 +17,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xlconfigdata/test-fullvirt-multiusb.cfg b/tests/xlconfigdata/test-fullvirt-multiusb.cfg
index 68a2614eb3..d0482a83ec 100755
--- a/tests/xlconfigdata/test-fullvirt-multiusb.cfg
+++ b/tests/xlconfigdata/test-fullvirt-multiusb.cfg
@@ -8,6 +8,7 @@ acpi = 1
 apic = 1
 hap = 0
 viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -18,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 builder = "hvm"
diff --git a/tests/xlconfigdata/test-fullvirt-multiusb.xml b/tests/xlconfigdata/test-fullvirt-multiusb.xml
index 0e6d0b6bd9..9e5cad9edc 100644
--- a/tests/xlconfigdata/test-fullvirt-multiusb.xml
+++ b/tests/xlconfigdata/test-fullvirt-multiusb.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xlconfigdata/test-new-disk.cfg b/tests/xlconfigdata/test-new-disk.cfg
index 9e9f1066e7..9b9fb366b6 100644
--- a/tests/xlconfigdata/test-new-disk.cfg
+++ b/tests/xlconfigdata/test-new-disk.cfg
@@ -8,6 +8,7 @@ acpi = 1
 apic = 1
 hap = 0
 viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -17,7 +18,7 @@ sdl = 0
 vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 builder = "hvm"
diff --git a/tests/xlconfigdata/test-new-disk.xml b/tests/xlconfigdata/test-new-disk.xml
index 718a2da008..49f6dbed1a 100644
--- a/tests/xlconfigdata/test-new-disk.xml
+++ b/tests/xlconfigdata/test-new-disk.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xlconfigdata/test-spice-features.cfg b/tests/xlconfigdata/test-spice-features.cfg
index c3e7111862..152cb27ee3 100644
--- a/tests/xlconfigdata/test-spice-features.cfg
+++ b/tests/xlconfigdata/test-spice-features.cfg
@@ -8,12 +8,13 @@ acpi = 1
 apic = 1
 hap = 0
 viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
 device_model = "/usr/lib/xen/bin/qemu-dm"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 builder = "hvm"
diff --git a/tests/xlconfigdata/test-spice-features.xml b/tests/xlconfigdata/test-spice-features.xml
index 3160c2b473..d40a671978 100644
--- a/tests/xlconfigdata/test-spice-features.xml
+++ b/tests/xlconfigdata/test-spice-features.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xlconfigdata/test-spice.cfg b/tests/xlconfigdata/test-spice.cfg
index d89f2bad9a..1a96114a81 100644
--- a/tests/xlconfigdata/test-spice.cfg
+++ b/tests/xlconfigdata/test-spice.cfg
@@ -8,12 +8,13 @@ acpi = 1
 apic = 1
 hap = 0
 viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
 device_model = "/usr/lib/xen/bin/qemu-dm"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 builder = "hvm"
diff --git a/tests/xlconfigdata/test-spice.xml b/tests/xlconfigdata/test-spice.xml
index 30415fb316..d15557ed80 100644
--- a/tests/xlconfigdata/test-spice.xml
+++ b/tests/xlconfigdata/test-spice.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c
index 21f760d03e..31865ff64f 100644
--- a/tests/xlconfigtest.c
+++ b/tests/xlconfigtest.c
@@ -46,7 +46,7 @@ static virDomainXMLOptionPtr xmlopt;
  * parses the xml, creates a domain def and compare with equivalent xm config
  */
 static int
-testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion)
+testCompareParseXML(const char *xmcfg, const char *xml)
 {
     char *gotxmcfgData = NULL;
     virConfPtr conf = NULL;
@@ -70,7 +70,7 @@ testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion)
         goto fail;
     }
 
-    if (!(conf = xenFormatXL(def, conn,  xendConfigVersion)))
+    if (!(conf = xenFormatXL(def, conn, 4)))
         goto fail;
 
     if (virConfWriteMem(gotxmcfgData, &wrote, conf) < 0)
@@ -95,7 +95,7 @@ testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion)
  * parses the xl config, develops domain def and compares with equivalent xm config
  */
 static int
-testCompareFormatXML(const char *xmcfg, const char *xml, int xendConfigVersion)
+testCompareFormatXML(const char *xmcfg, const char *xml)
 {
     char *xmcfgData = NULL;
     char *gotxml = NULL;
@@ -113,7 +113,7 @@ testCompareFormatXML(const char *xmcfg, const char *xml, int xendConfigVersion)
     if (!(conf = virConfReadMem(xmcfgData, strlen(xmcfgData), 0)))
         goto fail;
 
-    if (!(def = xenParseXL(conf, caps, xmlopt, xendConfigVersion)))
+    if (!(def = xenParseXL(conf, caps, xmlopt, 4)))
         goto fail;
 
     if (!(gotxml = virDomainDefFormat(def, VIR_DOMAIN_XML_INACTIVE |
@@ -139,7 +139,6 @@ testCompareFormatXML(const char *xmcfg, const char *xml, int xendConfigVersion)
 
 struct testInfo {
     const char *name;
-    int version;
     int mode;
 };
 
@@ -158,9 +157,9 @@ testCompareHelper(const void *data)
         goto cleanup;
 
     if (info->mode == 0)
-        result = testCompareParseXML(cfg, xml, info->version);
+        result = testCompareParseXML(cfg, xml);
     else
-        result = testCompareFormatXML(cfg, xml, info->version);
+        result = testCompareFormatXML(cfg, xml);
 
  cleanup:
     VIR_FREE(xml);
@@ -181,10 +180,10 @@ mymain(void)
     if (!(xmlopt = libxlCreateXMLConf()))
         return EXIT_FAILURE;
 
-#define DO_TEST(name, version)                                          \
+#define DO_TEST(name)                                                   \
     do {                                                                \
-        struct testInfo info0 = { name, version, 0 };                   \
-        struct testInfo info1 = { name, version, 1 };                   \
+        struct testInfo info0 = { name, 0 };                            \
+        struct testInfo info1 = { name, 1 };                            \
         if (virtTestRun("Xen XM-2-XML Parse  " name,                    \
                         testCompareHelper, &info0) < 0)                 \
             ret = -1;                                                   \
@@ -193,15 +192,15 @@ mymain(void)
             ret = -1;                                                   \
     } while (0)
 
-    DO_TEST("new-disk", 3);
-    DO_TEST("spice", 3);
-    DO_TEST("spice-features", 3);
+    DO_TEST("new-disk");
+    DO_TEST("spice");
+    DO_TEST("spice-features");
 
 #ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST
-    DO_TEST("fullvirt-multiusb", 3);
+    DO_TEST("fullvirt-multiusb");
 #endif
 #ifdef LIBXL_HAVE_BUILDINFO_KERNEL
-    DO_TEST("fullvirt-direct-kernel-boot", 3);
+    DO_TEST("fullvirt-direct-kernel-boot");
 #endif
 
     virObjectUnref(caps);
diff --git a/tests/xmconfigdata/test-escape-paths.cfg b/tests/xmconfigdata/test-escape-paths.cfg
index 64c9eedfc4..98570bdcdf 100644
--- a/tests/xmconfigdata/test-escape-paths.cfg
+++ b/tests/xmconfigdata/test-escape-paths.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 soundhw = "sb16,es1370"
diff --git a/tests/xmconfigdata/test-escape-paths.xml b/tests/xmconfigdata/test-escape-paths.xml
index d2ec843dd6..db01910999 100644
--- a/tests/xmconfigdata/test-escape-paths.xml
+++ b/tests/xmconfigdata/test-escape-paths.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xmconfigdata/test-fullvirt-default-feature.cfg b/tests/xmconfigdata/test-fullvirt-default-feature.cfg
index 5ce234f0a7..c9d072d9da 100644
--- a/tests/xmconfigdata/test-fullvirt-default-feature.cfg
+++ b/tests/xmconfigdata/test-fullvirt-default-feature.cfg
@@ -7,6 +7,9 @@ builder = "hvm"
 kernel = "/usr/lib/xen/boot/hvmloader"
 boot = "d"
 hpet = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -17,7 +20,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
diff --git a/tests/xmconfigdata/test-fullvirt-default-feature.xml b/tests/xmconfigdata/test-fullvirt-default-feature.xml
index 06ad44eb81..231aea6b56 100644
--- a/tests/xmconfigdata/test-fullvirt-default-feature.xml
+++ b/tests/xmconfigdata/test-fullvirt-default-feature.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'>
+  <clock offset='variable' adjustment='0' basis='utc'>
     <timer name='hpet' present='yes'/>
   </clock>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.cfg b/tests/xmconfigdata/test-fullvirt-force-hpet.cfg
index 0bd76d3fb4..b89ed424de 100644
--- a/tests/xmconfigdata/test-fullvirt-force-hpet.cfg
+++ b/tests/xmconfigdata/test-fullvirt-force-hpet.cfg
@@ -6,7 +6,10 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
 hpet = 1
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -17,7 +20,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 builder = "hvm"
diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.xml b/tests/xmconfigdata/test-fullvirt-force-hpet.xml
index 06ad44eb81..231aea6b56 100644
--- a/tests/xmconfigdata/test-fullvirt-force-hpet.xml
+++ b/tests/xmconfigdata/test-fullvirt-force-hpet.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'>
+  <clock offset='variable' adjustment='0' basis='utc'>
     <timer name='hpet' present='yes'/>
   </clock>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg b/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg
index a4c2fa0cd6..99e6d38846 100644
--- a/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg
+++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg
@@ -6,7 +6,10 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
 hpet = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -17,7 +20,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 builder = "hvm"
diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
index 148c372f34..ef216c3c27 100644
--- a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
+++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'>
+  <clock offset='variable' adjustment='0' basis='utc'>
     <timer name='hpet' present='no'/>
   </clock>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/xmconfigdata/test-fullvirt-localtime.cfg b/tests/xmconfigdata/test-fullvirt-localtime.cfg
index 38c558b5c6..5d0742328d 100755
--- a/tests/xmconfigdata/test-fullvirt-localtime.cfg
+++ b/tests/xmconfigdata/test-fullvirt-localtime.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 1
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 builder = "hvm"
diff --git a/tests/xmconfigdata/test-fullvirt-localtime.xml b/tests/xmconfigdata/test-fullvirt-localtime.xml
index 5db392caed..0162246d2b 100644
--- a/tests/xmconfigdata/test-fullvirt-localtime.xml
+++ b/tests/xmconfigdata/test-fullvirt-localtime.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='localtime' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='localtime'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.cfg b/tests/xmconfigdata/test-fullvirt-net-netfront.cfg
index 21d81be700..da1d3684a6 100644
--- a/tests/xmconfigdata/test-fullvirt-net-netfront.cfg
+++ b/tests/xmconfigdata/test-fullvirt-net-netfront.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.xml b/tests/xmconfigdata/test-fullvirt-net-netfront.xml
index 4d23802cd9..172a530aa6 100644
--- a/tests/xmconfigdata/test-fullvirt-net-netfront.xml
+++ b/tests/xmconfigdata/test-fullvirt-net-netfront.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg b/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg
index 722f02148d..67e2511300 100755
--- a/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg
+++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 builder = "hvm"
diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
index ad15ddef8a..6544cb3da4 100644
--- a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
+++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg b/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg
index 0d999ad0ba..1bbce5697f 100755
--- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg
+++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "tcp:127.0.0.1:7777"
 serial = "none"
 builder = "hvm"
diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
index a2897f1fb3..5aef2dec7c 100644
--- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
+++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.cfg b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.cfg
index f0fb178b8b..c72279281a 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = [ "/dev/ttyS0", "/dev/ttyS1" ]
 builder = "hvm"
diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
index 5cbca37c5d..a9e68b5edb 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.cfg b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.cfg
index b2cb1eaa52..4baffe6326 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = [ "none", "/dev/ttyS1" ]
 builder = "hvm"
diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
index 27c29c6c7b..5564fa8b1d 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.cfg b/tests/xmconfigdata/test-fullvirt-serial-file.cfg
index 65c09e80a3..3d26e26fb9 100755
--- a/tests/xmconfigdata/test-fullvirt-serial-file.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-file.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "file:/tmp/serial.log"
 builder = "hvm"
diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.xml b/tests/xmconfigdata/test-fullvirt-serial-file.xml
index 092c0628d5..f592d446f0 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-file.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-file.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.cfg b/tests/xmconfigdata/test-fullvirt-serial-null.cfg
index 4c83216a73..6b0f2a4392 100755
--- a/tests/xmconfigdata/test-fullvirt-serial-null.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-null.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "null"
 builder = "hvm"
diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.xml b/tests/xmconfigdata/test-fullvirt-serial-null.xml
index a1394d97ff..78142a7674 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-null.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-null.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg b/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg
index 09bfd3b0ee..2bd83774bd 100755
--- a/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "pipe:/tmp/serial.pipe"
 builder = "hvm"
diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
index 321d309ec3..d3f06535c9 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.cfg b/tests/xmconfigdata/test-fullvirt-serial-pty.cfg
index e5d7c93dd4..022f975820 100755
--- a/tests/xmconfigdata/test-fullvirt-serial-pty.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-pty.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "pty"
 builder = "hvm"
diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.xml b/tests/xmconfigdata/test-fullvirt-serial-pty.xml
index 05c82fe081..bc8e1827ed 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-pty.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-pty.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg b/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg
index 5f5628c8a6..c339a94cf8 100755
--- a/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "stdio"
 builder = "hvm"
diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
index c6c702c7c9..9244a7cbd8 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg
index e28b97b350..56eefacf90 100755
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "telnet:127.0.0.1:9999,server,nowait"
 builder = "hvm"
diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
index 72c169e03c..2ffdc8a261 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg b/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg
index 64b709d293..d569852afa 100755
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "tcp:127.0.0.1:7777"
 builder = "hvm"
diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
index ab179ecb0e..ff7ec9b09b 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.cfg b/tests/xmconfigdata/test-fullvirt-serial-udp.cfg
index acf594dcf1..b1ef8f5ba7 100755
--- a/tests/xmconfigdata/test-fullvirt-serial-udp.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-udp.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "udp:127.0.0.1:9999@0.0.0.0:99998"
 builder = "hvm"
diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.xml b/tests/xmconfigdata/test-fullvirt-serial-udp.xml
index 8c8d19a632..f2f2b1ff74 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-udp.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-udp.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.cfg b/tests/xmconfigdata/test-fullvirt-serial-unix.cfg
index 1b7da437ed..30f03991ab 100755
--- a/tests/xmconfigdata/test-fullvirt-serial-unix.cfg
+++ b/tests/xmconfigdata/test-fullvirt-serial-unix.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "unix:/tmp/serial.sock,server,nowait"
 builder = "hvm"
diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.xml b/tests/xmconfigdata/test-fullvirt-serial-unix.xml
index 0e25cacb0f..eaa484b035 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-unix.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-unix.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xmconfigdata/test-fullvirt-sound.cfg b/tests/xmconfigdata/test-fullvirt-sound.cfg
index c621fb1e8e..c11336a14c 100644
--- a/tests/xmconfigdata/test-fullvirt-sound.cfg
+++ b/tests/xmconfigdata/test-fullvirt-sound.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 soundhw = "sb16,es1370"
diff --git a/tests/xmconfigdata/test-fullvirt-sound.xml b/tests/xmconfigdata/test-fullvirt-sound.xml
index 25364eb4df..6ee3dfdb0b 100644
--- a/tests/xmconfigdata/test-fullvirt-sound.xml
+++ b/tests/xmconfigdata/test-fullvirt-sound.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.cfg b/tests/xmconfigdata/test-fullvirt-usbmouse.cfg
index c8004e7c16..33738ad0aa 100755
--- a/tests/xmconfigdata/test-fullvirt-usbmouse.cfg
+++ b/tests/xmconfigdata/test-fullvirt-usbmouse.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 builder = "hvm"
diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.xml b/tests/xmconfigdata/test-fullvirt-usbmouse.xml
index c7526ae628..5d739f137e 100644
--- a/tests/xmconfigdata/test-fullvirt-usbmouse.xml
+++ b/tests/xmconfigdata/test-fullvirt-usbmouse.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.cfg b/tests/xmconfigdata/test-fullvirt-usbtablet.cfg
index 4f2417b95e..8e222bb6b7 100755
--- a/tests/xmconfigdata/test-fullvirt-usbtablet.cfg
+++ b/tests/xmconfigdata/test-fullvirt-usbtablet.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 builder = "hvm"
diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.xml b/tests/xmconfigdata/test-fullvirt-usbtablet.xml
index aa16eb1b35..9933ef7637 100644
--- a/tests/xmconfigdata/test-fullvirt-usbtablet.xml
+++ b/tests/xmconfigdata/test-fullvirt-usbtablet.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xmconfigdata/test-fullvirt-utc.cfg b/tests/xmconfigdata/test-fullvirt-utc.cfg
index 722f02148d..67e2511300 100755
--- a/tests/xmconfigdata/test-fullvirt-utc.cfg
+++ b/tests/xmconfigdata/test-fullvirt-utc.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
@@ -16,7 +19,7 @@ vnc = 1
 vncunused = 1
 vnclisten = "127.0.0.1"
 vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "none"
 builder = "hvm"
diff --git a/tests/xmconfigdata/test-fullvirt-utc.xml b/tests/xmconfigdata/test-fullvirt-utc.xml
index ad15ddef8a..6544cb3da4 100644
--- a/tests/xmconfigdata/test-fullvirt-utc.xml
+++ b/tests/xmconfigdata/test-fullvirt-utc.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
diff --git a/tests/xmconfigdata/test-no-source-cdrom.cfg b/tests/xmconfigdata/test-no-source-cdrom.cfg
index 8d0061881e..70980059ad 100644
--- a/tests/xmconfigdata/test-no-source-cdrom.cfg
+++ b/tests/xmconfigdata/test-no-source-cdrom.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "destroy"
@@ -14,7 +17,7 @@ device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
-vif = [ "mac=00:16:3e:0a:7b:39,bridge=xenbr0,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:0a:7b:39,bridge=xenbr0,script=vif-bridge,model=e1000" ]
 parallel = "none"
 serial = "pty"
 builder = "hvm"
diff --git a/tests/xmconfigdata/test-no-source-cdrom.xml b/tests/xmconfigdata/test-no-source-cdrom.xml
index a0952e8ec9..08ee70178f 100644
--- a/tests/xmconfigdata/test-no-source-cdrom.xml
+++ b/tests/xmconfigdata/test-no-source-cdrom.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
diff --git a/tests/xmconfigdata/test-pci-devs.cfg b/tests/xmconfigdata/test-pci-devs.cfg
index a90dd940fa..777314fa09 100644
--- a/tests/xmconfigdata/test-pci-devs.cfg
+++ b/tests/xmconfigdata/test-pci-devs.cfg
@@ -6,6 +6,9 @@ vcpus = 1
 pae = 1
 acpi = 1
 apic = 1
+hap = 0
+viridian = 0
+rtc_timeoffset = 0
 localtime = 0
 on_poweroff = "destroy"
 on_reboot = "destroy"
@@ -14,7 +17,7 @@ device_model = "/usr/lib/xen/bin/qemu-dm"
 sdl = 0
 vnc = 1
 vncunused = 1
-vif = [ "mac=00:16:3e:0a:7b:39,bridge=xenbr0,script=vif-bridge,model=e1000,type=ioemu" ]
+vif = [ "mac=00:16:3e:0a:7b:39,bridge=xenbr0,script=vif-bridge,model=e1000" ]
 pci = [ "0001:0c:1b.2", "0000:01:13.0" ]
 parallel = "none"
 serial = "pty"
diff --git a/tests/xmconfigdata/test-pci-devs.xml b/tests/xmconfigdata/test-pci-devs.xml
index bdb1e82624..31db26f052 100644
--- a/tests/xmconfigdata/test-pci-devs.xml
+++ b/tests/xmconfigdata/test-pci-devs.xml
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc' adjustment='reset'/>
+  <clock offset='variable' adjustment='0' basis='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c
index bfbd9c4e61..f2705eb0ce 100644
--- a/tests/xmconfigtest.c
+++ b/tests/xmconfigtest.c
@@ -43,7 +43,7 @@ static virCapsPtr caps;
 static virDomainXMLOptionPtr xmlopt;
 
 static int
-testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion)
+testCompareParseXML(const char *xmcfg, const char *xml)
 {
     char *gotxmcfgData = NULL;
     virConfPtr conf = NULL;
@@ -60,7 +60,7 @@ testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion)
     if (!conn) goto fail;
 
     /* Many puppies died to bring you this code. */
-    priv.xendConfigVersion = xendConfigVersion;
+    priv.xendConfigVersion = 4;
     priv.caps = caps;
     conn->privateData = &priv;
 
@@ -73,7 +73,7 @@ testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion)
         goto fail;
     }
 
-    if (!(conf = xenFormatXM(conn, def, xendConfigVersion)))
+    if (!(conf = xenFormatXM(conn, def, 4)))
         goto fail;
 
     if (virConfWriteMem(gotxmcfgData, &wrote, conf) < 0)
@@ -96,7 +96,7 @@ testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion)
 }
 
 static int
-testCompareFormatXML(const char *xmcfg, const char *xml, int xendConfigVersion)
+testCompareFormatXML(const char *xmcfg, const char *xml)
 {
     char *xmcfgData = NULL;
     char *gotxml = NULL;
@@ -113,7 +113,7 @@ testCompareFormatXML(const char *xmcfg, const char *xml, int xendConfigVersion)
         goto fail;
 
     /* Many puppies died to bring you this code. */
-    priv.xendConfigVersion = xendConfigVersion;
+    priv.xendConfigVersion = 4;
     priv.caps = caps;
     conn->privateData = &priv;
 
@@ -146,7 +146,6 @@ testCompareFormatXML(const char *xmcfg, const char *xml, int xendConfigVersion)
 
 struct testInfo {
     const char *name;
-    int version;
     int mode;
 };
 
@@ -166,9 +165,9 @@ testCompareHelper(const void *data)
         goto cleanup;
 
     if (info->mode == 0)
-        result = testCompareParseXML(cfg, xml, info->version);
+        result = testCompareParseXML(cfg, xml);
     else
-        result = testCompareFormatXML(cfg, xml, info->version);
+        result = testCompareFormatXML(cfg, xml);
 
  cleanup:
     VIR_FREE(xml);
@@ -190,66 +189,66 @@ mymain(void)
     if (!(xmlopt = xenDomainXMLConfInit()))
         return EXIT_FAILURE;
 
-#define DO_TEST_PARSE(name, version)                                    \
+#define DO_TEST_PARSE(name)                                             \
     do {                                                                \
-        struct testInfo info0 = { name, version, 0 };                   \
+        struct testInfo info0 = { name, 0 };                            \
         if (virtTestRun("Xen XM-2-XML Parse  " name,                    \
                         testCompareHelper, &info0) < 0)                 \
             ret = -1;                                                   \
     } while (0)
 
 
-#define DO_TEST_FORMAT(name, version)                                   \
+#define DO_TEST_FORMAT(name)                                            \
     do {                                                                \
-        struct testInfo info1 = { name, version, 1 };                   \
+        struct testInfo info1 = { name, 1 };                            \
         if (virtTestRun("Xen XM-2-XML Format " name,                    \
                         testCompareHelper, &info1) < 0)                 \
             ret = -1;                                                   \
     } while (0)
 
 
-#define DO_TEST(name, version)                                          \
+#define DO_TEST(name)                                                   \
     do {                                                                \
-        DO_TEST_PARSE(name, version);                                   \
-        DO_TEST_FORMAT(name, version);                                  \
+        DO_TEST_PARSE(name);                                            \
+        DO_TEST_FORMAT(name);                                           \
     } while (0)
 
-    DO_TEST("paravirt-new-pvfb", 3);
-    DO_TEST("paravirt-new-pvfb-vncdisplay", 3);
-    DO_TEST("paravirt-net-e1000", 3);
-    DO_TEST("paravirt-net-vifname", 3);
-    DO_TEST("paravirt-vcpu", 2);
-    DO_TEST("fullvirt-new-cdrom", 2);
-    DO_TEST("fullvirt-utc", 2);
-    DO_TEST("fullvirt-localtime", 2);
-    DO_TEST("fullvirt-usbtablet", 2);
-    DO_TEST("fullvirt-usbmouse", 2);
-    DO_TEST("fullvirt-serial-file", 2);
-    DO_TEST("fullvirt-serial-dev-2-ports", 2);
-    DO_TEST("fullvirt-serial-dev-2nd-port", 2);
-    DO_TEST("fullvirt-serial-null", 2);
-    DO_TEST("fullvirt-serial-pipe", 2);
-    DO_TEST("fullvirt-serial-pty", 2);
-    DO_TEST("fullvirt-serial-stdio", 2);
-    DO_TEST("fullvirt-serial-tcp", 2);
-    DO_TEST("fullvirt-serial-tcp-telnet", 2);
-    DO_TEST("fullvirt-serial-udp", 2);
-    DO_TEST("fullvirt-serial-unix", 2);
+    DO_TEST("paravirt-new-pvfb");
+    DO_TEST("paravirt-new-pvfb-vncdisplay");
+    DO_TEST("paravirt-net-e1000");
+    DO_TEST("paravirt-net-vifname");
+    DO_TEST("paravirt-vcpu");
+    DO_TEST("fullvirt-new-cdrom");
+    DO_TEST("fullvirt-utc");
+    DO_TEST("fullvirt-localtime");
+    DO_TEST("fullvirt-usbtablet");
+    DO_TEST("fullvirt-usbmouse");
+    DO_TEST("fullvirt-serial-file");
+    DO_TEST("fullvirt-serial-dev-2-ports");
+    DO_TEST("fullvirt-serial-dev-2nd-port");
+    DO_TEST("fullvirt-serial-null");
+    DO_TEST("fullvirt-serial-pipe");
+    DO_TEST("fullvirt-serial-pty");
+    DO_TEST("fullvirt-serial-stdio");
+    DO_TEST("fullvirt-serial-tcp");
+    DO_TEST("fullvirt-serial-tcp-telnet");
+    DO_TEST("fullvirt-serial-udp");
+    DO_TEST("fullvirt-serial-unix");
 
-    DO_TEST("fullvirt-force-hpet", 2);
-    DO_TEST("fullvirt-force-nohpet", 2);
+    DO_TEST("fullvirt-force-hpet");
+    DO_TEST("fullvirt-force-nohpet");
 
-    DO_TEST("fullvirt-parallel-tcp", 2);
+    DO_TEST("fullvirt-parallel-tcp");
 
-    DO_TEST("fullvirt-sound", 2);
+    DO_TEST("fullvirt-sound");
 
-    DO_TEST("fullvirt-net-netfront", 2);
+    DO_TEST("fullvirt-net-netfront");
 
-    DO_TEST_FORMAT("fullvirt-default-feature", 2);
+    DO_TEST_FORMAT("fullvirt-default-feature");
 
-    DO_TEST("escape-paths", 2);
-    DO_TEST("no-source-cdrom", 2);
-    DO_TEST("pci-devs", 2);
+    DO_TEST("escape-paths");
+    DO_TEST("no-source-cdrom");
+    DO_TEST("pci-devs");
 
     virObjectUnref(caps);
     virObjectUnref(xmlopt);