diff --git a/src/mpt/tests/basic/etc/config_any.xml b/src/mpt/tests/basic/etc/config_any.xml
index 71b410f..275eb4b 100644
--- a/src/mpt/tests/basic/etc/config_any.xml
+++ b/src/mpt/tests/basic/etc/config_any.xml
@@ -14,7 +14,6 @@
     <Id>any</Id>
   </Domain>
   <General>
-    <NetworkInterfaceAddress>auto</NetworkInterfaceAddress>
     <AllowMulticast>true</AllowMulticast>
     <EnableMulticastLoopback>true</EnableMulticastLoopback>
   </General>
diff --git a/src/mpt/tests/basic/etc/config_specific.xml b/src/mpt/tests/basic/etc/config_specific.xml
index c6ccf33..0532aa0 100644
--- a/src/mpt/tests/basic/etc/config_specific.xml
+++ b/src/mpt/tests/basic/etc/config_specific.xml
@@ -14,7 +14,6 @@
     <Id>${DOMAIN_ID}</Id>
   </Domain>
   <General>
-   <NetworkInterfaceAddress>auto</NetworkInterfaceAddress>
     <AllowMulticast>true</AllowMulticast>
     <EnableMulticastLoopback>true</EnableMulticastLoopback>
   </General>
diff --git a/src/mpt/tests/basic/helloworld.c b/src/mpt/tests/basic/helloworld.c
index c959edb..934262a 100644
--- a/src/mpt/tests/basic/helloworld.c
+++ b/src/mpt/tests/basic/helloworld.c
@@ -13,13 +13,13 @@
 /* Environments */
 static mpt_env_t environment_any[] = {
     { "ETC_DIR",        MPT_SOURCE_ROOT_DIR"/tests/basic/etc"   },
-    { "CYCLONEDDS_URI", "file://${ETC_DIR}/config_any.xml"      },
+    { "CYCLONEDDS_URI", "${CYCLONEDDS_URI},file://${ETC_DIR}/config_any.xml" },
     { NULL,             NULL                                    }
 };
 static mpt_env_t environment_42[] = {
     { "ETC_DIR",        MPT_SOURCE_ROOT_DIR"/tests/basic/etc"   },
     { "DOMAIN_ID",      "42"                                    },
-    { "CYCLONEDDS_URI", "file://${ETC_DIR}/config_specific.xml" },
+    { "CYCLONEDDS_URI", "${CYCLONEDDS_URI},file://${ETC_DIR}/config_specific.xml" },
     { NULL,             NULL                                    }
 };