diff --git a/src/test/profile/hsql/olat.local.properties b/src/test/profile/hsql/olat.local.properties
index 97a33125b4dc551e26da145469f47ca8cc434744..b7a2473d297c6adf998b663919e4cf49c2afbf60 100644
--- a/src/test/profile/hsql/olat.local.properties
+++ b/src/test/profile/hsql/olat.local.properties
@@ -2,16 +2,19 @@
 #
 # This olat.local.properties file is only used when running junit tests! (Unit tests run in its own classpath environment)
 # Use this file to set properties that affect or are a prerequisite for your tests.
-# from test/profile/hsql
+#
 #########################
 
 db.vendor=test
 defaultlang=de
 db.show_sql=false
-
+#force use of java.io.tmpDir for unit tests
 archive.dir=
 log.dir=
 folder.root=
+
+instance.id=${test.env.instance.id}
+
 generate.index.at.startup=false
 
 # for UserTest
@@ -20,19 +23,23 @@ keepUserLoginAfterDeletion=true
 
 # do not run upgrades and scheduled jobs and such
 cluster.singleton.services = disabled
+jmx.rmi.port=${test.env.jmx.rmi.port.0}
 
 # SingleVM jms.broker.url
 jms.broker.url=vm://embedded?broker.persistent=false
 search.broker.url=vm://embedded?broker.persistent=false
 codepoint.jms.broker.url=vm://embedded?broker.persistent=false
 # Cluster (remote) jms.broker.url
-#jms.broker.url=failover:(tcp://localhost:61616?wireFormat.maxInactivityDuration=0)
-#search.broker.url=failover:(tcp://localhost:61616?wireFormat.maxInactivityDuration=0)
-#codepoint.jms.broker.url=failover:(tcp://localhost:61616?wireFormat.maxInactivityDuration=0)
+#jms.broker.url=failover:(tcp://localhost:${test.env.jms.broker.port}?wireFormat.maxInactivityDuration=0)
+#search.broker.url=failover:(tcp://localhost:${test.env.jms.broker.port}?wireFormat.maxInactivityDuration=0)
+#codepoint.jms.broker.url=failover:(tcp://localhost:${test.env.jms.broker.port}?wireFormat.maxInactivityDuration=0)
 
 
 # enable/disable codepoint/breakpoint framework
 codepoint_server.enabled=true
+smtp.host=testing
+
+#
 #
 # if you like to run your tests against mysql just uncomment the following. Please do not commit it!
 #
diff --git a/src/test/profile/mysql/olat.eclipse.properties b/src/test/profile/mysql/olat.eclipse.properties
index 08edf50ff967f802d06f8368e46f560d8debef56..083ca6909ef338e2a83bc35db12942fcad5c727a 100644
--- a/src/test/profile/mysql/olat.eclipse.properties
+++ b/src/test/profile/mysql/olat.eclipse.properties
@@ -7,6 +7,10 @@
 
 defaultlang=de
 db.show_sql=false
+#force use of java.io.tmpDir for unit tests
+archive.dir=
+log.dir=
+folder.root=
 
 instance.id=2
 
diff --git a/src/test/profile/mysql/olat.local.properties b/src/test/profile/mysql/olat.local.properties
index 57d094e8e83c2c5a1840f6106d0a85a16e40fc08..af36acb73d20ba4b6916ed7b8f5d13b607689eec 100644
--- a/src/test/profile/mysql/olat.local.properties
+++ b/src/test/profile/mysql/olat.local.properties
@@ -7,6 +7,7 @@
 
 defaultlang=de
 db.show_sql=false
+#force use of java.io.tmpDir for unit tests
 archive.dir=
 log.dir=
 folder.root=
@@ -41,15 +42,10 @@ smtp.host=testing
 #
 # if you like to run your tests against mysql just uncomment the following. Please do not commit it!
 #
-
 db.vendor=mysql
-#
-#
 db.name=${test.env.db.name}
 db.user=${test.env.db.user}
 db.pass=${test.env.db.pass}
 db.host.port=${test.env.db.host.port}
-#
 db.database.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
-#
 db.hibernate.ddl.auto=${test.env.db.hibernate.ddl.auto}
diff --git a/src/test/profile/postgresql/olat.eclipse.properties b/src/test/profile/postgresql/olat.eclipse.properties
index 7a7fab9939b4c2740fc72bacdbae682bf21c33ee..691122e9e616cec565ac5bd31db021dd282c25c4 100644
--- a/src/test/profile/postgresql/olat.eclipse.properties
+++ b/src/test/profile/postgresql/olat.eclipse.properties
@@ -7,6 +7,10 @@
 
 defaultlang=de
 db.show_sql=false
+#force use of java.io.tmpDir for unit tests
+archive.dir=
+log.dir=
+folder.root=
 
 instance.id=2
 
diff --git a/src/test/profile/postgresql/olat.local.properties b/src/test/profile/postgresql/olat.local.properties
index 82850bc977cf95df0f30a5995f2452554290223f..8b5b81e4a252af13e1ebab2a4758f87fbe36914d 100644
--- a/src/test/profile/postgresql/olat.local.properties
+++ b/src/test/profile/postgresql/olat.local.properties
@@ -7,9 +7,11 @@
 
 defaultlang=de
 db.show_sql=false
+#force use of java.io.tmpDir for unit tests
 archive.dir=
 log.dir=
 folder.root=
+
 instance.id=${test.env.instance.id}
 
 generate.index.at.startup=false
@@ -40,15 +42,10 @@ smtp.host=testing
 #
 # if you like to run your tests against mysql just uncomment the following. Please do not commit it!
 #
-
 db.vendor=postgresql
-#
-#
 db.name=${test.env.db.name}
 db.user=${test.env.db.postgresql.user}
 db.pass=${test.env.db.postgresql.pass}
 db.host.port=${test.env.db.postgresql.host.port}
-#
 db.database.dialect=org.hibernate.dialect.PostgreSQLDialect
-#
 db.hibernate.ddl.auto=${test.env.db.hibernate.ddl.auto}