diff --git a/src/core/ddsc/tests/config_simple_udp.xml b/src/core/ddsc/tests/config_simple_udp.xml
index 426fd10..9367f80 100644
--- a/src/core/ddsc/tests/config_simple_udp.xml
+++ b/src/core/ddsc/tests/config_simple_udp.xml
@@ -30,8 +30,8 @@
     </Tracing>
     <Internal>
       <MaxParticipants>${MAX_PARTICIPANTS}</MaxParticipants>
-      <HeartbeatInterval max="10 s"> 100 ms </HeartbeatInterval>
-      <RediscoveryBlacklistDuration></RediscoveryBlacklistDuration>
+      <HeartbeatInterval>100 ms</HeartbeatInterval>
+      <RediscoveryBlacklistDuration>10s</RediscoveryBlacklistDuration>
     </Internal>
   </Domain>
 </CycloneDDS>
diff --git a/src/mpt/tests/basic/etc/config_any.xml b/src/mpt/tests/basic/etc/config_any.xml
index a00f45c..b9fa04c 100644
--- a/src/mpt/tests/basic/etc/config_any.xml
+++ b/src/mpt/tests/basic/etc/config_any.xml
@@ -13,9 +13,7 @@
   SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 -->
 <CycloneDDS xmlns="https://cdds.io/config">
-  <Domain>
-    <Id>any</Id>
-  </Domain>
+  <Domain Id="any">
   <General>
     <AllowMulticast>true</AllowMulticast>
     <EnableMulticastLoopback>true</EnableMulticastLoopback>
@@ -27,4 +25,5 @@
     <Verbosity>finest</Verbosity>
     <OutputFile>ddsi_${MPT_PROCESS_NAME}.log</OutputFile>
   </Tracing-->
+  </Domain>
 </CycloneDDS>
diff --git a/src/mpt/tests/basic/etc/config_specific.xml b/src/mpt/tests/basic/etc/config_specific.xml
index 2dbd678..ea26cf1 100644
--- a/src/mpt/tests/basic/etc/config_specific.xml
+++ b/src/mpt/tests/basic/etc/config_specific.xml
@@ -13,9 +13,7 @@
   SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 -->
 <CycloneDDS xmlns="https://cdds.io/config">
-  <Domain>
-    <Id>${DOMAIN_ID}</Id>
-  </Domain>
+  <Domain Id="${DOMAIN_ID}">
   <General>
     <AllowMulticast>true</AllowMulticast>
     <EnableMulticastLoopback>true</EnableMulticastLoopback>
@@ -27,4 +25,5 @@
     <Verbosity>finest</Verbosity>
     <OutputFile>ddsi_${MPT_PROCESS_NAME}.log</OutputFile>
   </Tracing-->
+  </Domain>
 </CycloneDDS>