4 files changed, 7 insertions, 4 deletions

diff --git a/src/transport/template_cfg_peer1.conf b/src/transport/template_cfg_peer1.conf
index caab17154..b26f43bf4 100644
--- a/src/transport/template_cfg_peer1.conf
+++ b/src/transport/template_cfg_peer1.conf
@@ -1,6 +1,8 @@
 @INLINE@ test_transport_defaults.conf
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_RUNTIME_DIR = $GNUNET_TEST_HOME/runtime/
+GNUNET_USER_RUNTIME_DIR = $GNUNET_TEST_HOME/runtime/
 
 [nat]
 RETURN_LOCAL_ADDRESSES = YES
diff --git a/src/transport/template_cfg_peer2.conf b/src/transport/template_cfg_peer2.conf
index 45441ea9e..63c13c239 100644
--- a/src/transport/template_cfg_peer2.conf
+++ b/src/transport/template_cfg_peer2.conf
@@ -1,6 +1,8 @@
 @INLINE@ test_transport_defaults.conf
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_RUNTIME_DIR = $GNUNET_TEST_HOME/runtime/
+GNUNET_USER_RUNTIME_DIR = $GNUNET_TEST_HOME/runtime/
 
 [transport-tcp]
 PORT = 12100
diff --git a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
index e9b61028c..3d30f84ea 100644
--- a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
+++ b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
@@ -1,9 +1,7 @@
 @INLINE@ template_cfg_peer1.conf
+@INLINE@ ../../contrib/no_autostart_above_core.conf
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
 
 [transport]
 PLUGINS = tcp
-
-
-
diff --git a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
index afb412cd0..09781b2a5 100644
--- a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
+++ b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
@@ -1,7 +1,8 @@
 @INLINE@ template_cfg_peer2.conf
+@INLINE@ ../../contrib/no_autostart_above_core.conf
+
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
 
 [transport]
 PLUGINS = tcp
-