diff --git a/src/test/resources/cachedruntime/config/StrolchConfiguration.xml b/src/test/resources/cachedruntime/config/StrolchConfiguration.xml
index cb7b07605..b7fe77021 100644
--- a/src/test/resources/cachedruntime/config/StrolchConfiguration.xml
+++ b/src/test/resources/cachedruntime/config/StrolchConfiguration.xml
@@ -1,31 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <StrolchConfiguration>
-	<Runtime>
-		<applicationName>StrolchPersistenceTest</applicationName>
-		<Properties>
-			<verbose>true</verbose>
-		</Properties>
-	</Runtime>
-	<Component>
-		<name>RealmHandler</name>
-		<api>li.strolch.agent.api.RealmHandler</api>
-		<impl>li.strolch.agent.impl.DefaultRealmHandler</impl>
-		<depends>PersistenceHandler</depends>
-		<Properties>
-			<dataStoreMode>CACHED</dataStoreMode>
-		</Properties>
-	</Component>
-	<Component>
-		<name>PersistenceHandler</name>
-		<api>li.strolch.persistence.api.PersistenceHandler</api>
-		<impl>li.strolch.persistence.xml.XmlPersistenceHandler</impl>
-		<Properties>
-			<verbose>true</verbose>
-		</Properties>
-	</Component>
-	<Component>
-		<name>ObserverHandler</name>
-		<api>li.strolch.runtime.observer.ObserverHandler</api>
-		<impl>li.strolch.runtime.observer.DefaultObserverHandler</impl>
-	</Component>
+	<env id="dev">
+		<Runtime>
+			<applicationName>StrolchPersistenceTest</applicationName>
+			<Properties>
+				<verbose>true</verbose>
+			</Properties>
+		</Runtime>
+		<Component>
+			<name>RealmHandler</name>
+			<api>li.strolch.agent.api.RealmHandler</api>
+			<impl>li.strolch.agent.impl.DefaultRealmHandler</impl>
+			<depends>PersistenceHandler</depends>
+			<Properties>
+				<dataStoreMode>CACHED</dataStoreMode>
+			</Properties>
+		</Component>
+		<Component>
+			<name>PersistenceHandler</name>
+			<api>li.strolch.persistence.api.PersistenceHandler</api>
+			<impl>li.strolch.persistence.xml.XmlPersistenceHandler</impl>
+			<Properties>
+				<verbose>true</verbose>
+			</Properties>
+		</Component>
+		<Component>
+			<name>ObserverHandler</name>
+			<api>li.strolch.runtime.observer.ObserverHandler</api>
+			<impl>li.strolch.runtime.observer.DefaultObserverHandler</impl>
+		</Component>
+	</env>
 </StrolchConfiguration>
\ No newline at end of file
diff --git a/src/test/resources/existingDbRuntime/config/StrolchConfiguration.xml b/src/test/resources/existingDbRuntime/config/StrolchConfiguration.xml
index cb7b07605..b7fe77021 100644
--- a/src/test/resources/existingDbRuntime/config/StrolchConfiguration.xml
+++ b/src/test/resources/existingDbRuntime/config/StrolchConfiguration.xml
@@ -1,31 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <StrolchConfiguration>
-	<Runtime>
-		<applicationName>StrolchPersistenceTest</applicationName>
-		<Properties>
-			<verbose>true</verbose>
-		</Properties>
-	</Runtime>
-	<Component>
-		<name>RealmHandler</name>
-		<api>li.strolch.agent.api.RealmHandler</api>
-		<impl>li.strolch.agent.impl.DefaultRealmHandler</impl>
-		<depends>PersistenceHandler</depends>
-		<Properties>
-			<dataStoreMode>CACHED</dataStoreMode>
-		</Properties>
-	</Component>
-	<Component>
-		<name>PersistenceHandler</name>
-		<api>li.strolch.persistence.api.PersistenceHandler</api>
-		<impl>li.strolch.persistence.xml.XmlPersistenceHandler</impl>
-		<Properties>
-			<verbose>true</verbose>
-		</Properties>
-	</Component>
-	<Component>
-		<name>ObserverHandler</name>
-		<api>li.strolch.runtime.observer.ObserverHandler</api>
-		<impl>li.strolch.runtime.observer.DefaultObserverHandler</impl>
-	</Component>
+	<env id="dev">
+		<Runtime>
+			<applicationName>StrolchPersistenceTest</applicationName>
+			<Properties>
+				<verbose>true</verbose>
+			</Properties>
+		</Runtime>
+		<Component>
+			<name>RealmHandler</name>
+			<api>li.strolch.agent.api.RealmHandler</api>
+			<impl>li.strolch.agent.impl.DefaultRealmHandler</impl>
+			<depends>PersistenceHandler</depends>
+			<Properties>
+				<dataStoreMode>CACHED</dataStoreMode>
+			</Properties>
+		</Component>
+		<Component>
+			<name>PersistenceHandler</name>
+			<api>li.strolch.persistence.api.PersistenceHandler</api>
+			<impl>li.strolch.persistence.xml.XmlPersistenceHandler</impl>
+			<Properties>
+				<verbose>true</verbose>
+			</Properties>
+		</Component>
+		<Component>
+			<name>ObserverHandler</name>
+			<api>li.strolch.runtime.observer.ObserverHandler</api>
+			<impl>li.strolch.runtime.observer.DefaultObserverHandler</impl>
+		</Component>
+	</env>
 </StrolchConfiguration>
\ No newline at end of file
diff --git a/src/test/resources/transactionalruntime/config/StrolchConfiguration.xml b/src/test/resources/transactionalruntime/config/StrolchConfiguration.xml
index f89b40c3a..17f718909 100644
--- a/src/test/resources/transactionalruntime/config/StrolchConfiguration.xml
+++ b/src/test/resources/transactionalruntime/config/StrolchConfiguration.xml
@@ -1,31 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <StrolchConfiguration>
-	<Runtime>
-		<applicationName>StrolchPersistenceTest</applicationName>
-		<Properties>
-			<verbose>true</verbose>
-		</Properties>
-	</Runtime>
-	<Component>
-		<name>RealmHandler</name>
-		<api>li.strolch.agent.api.RealmHandler</api>
-		<impl>li.strolch.agent.impl.DefaultRealmHandler</impl>
-		<depends>PersistenceHandler</depends>
-		<Properties>
-			<dataStoreMode>TRANSACTIONAL</dataStoreMode>
-		</Properties>
-	</Component>
-	<Component>
-		<name>PersistenceHandler</name>
-		<api>li.strolch.persistence.api.PersistenceHandler</api>
-		<impl>li.strolch.persistence.xml.XmlPersistenceHandler</impl>
-		<Properties>
-			<verbose>true</verbose>
-		</Properties>
-	</Component>
-	<Component>
-		<name>ObserverHandler</name>
-		<api>li.strolch.runtime.observer.ObserverHandler</api>
-		<impl>li.strolch.runtime.observer.DefaultObserverHandler</impl>
-	</Component>
+	<env id="dev">
+		<Runtime>
+			<applicationName>StrolchPersistenceTest</applicationName>
+			<Properties>
+				<verbose>true</verbose>
+			</Properties>
+		</Runtime>
+		<Component>
+			<name>RealmHandler</name>
+			<api>li.strolch.agent.api.RealmHandler</api>
+			<impl>li.strolch.agent.impl.DefaultRealmHandler</impl>
+			<depends>PersistenceHandler</depends>
+			<Properties>
+				<dataStoreMode>TRANSACTIONAL</dataStoreMode>
+			</Properties>
+		</Component>
+		<Component>
+			<name>PersistenceHandler</name>
+			<api>li.strolch.persistence.api.PersistenceHandler</api>
+			<impl>li.strolch.persistence.xml.XmlPersistenceHandler</impl>
+			<Properties>
+				<verbose>true</verbose>
+			</Properties>
+		</Component>
+		<Component>
+			<name>ObserverHandler</name>
+			<api>li.strolch.runtime.observer.ObserverHandler</api>
+			<impl>li.strolch.runtime.observer.DefaultObserverHandler</impl>
+		</Component>
+	</env>
 </StrolchConfiguration>
\ No newline at end of file