1 files changed, 7 insertions, 7 deletions

diff --git a/src/testbed/test_testbed_api_template.conf b/src/testbed/test_testbed_api_template.conf
index 48926389b..381c1bd85 100644
--- a/src/testbed/test_testbed_api_template.conf
+++ b/src/testbed/test_testbed_api_template.conf
@@ -1,8 +1,8 @@
-@INLINE@ ../../contrib/no_forcestart.conf
-@INLINE@ ../../contrib/no_autostart_above_core.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
 
 [testbed]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 12113
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
@@ -18,11 +18,11 @@ PLUGINS = udp
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 # Transport requires resolver when connecting to a peer, so enable it
 [resolver]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [ats]
 WAN_QUOTA_OUT = 3932160
@@ -30,13 +30,13 @@ WAN_QUOTA_IN = 3932160
 
 [core]
 USE_EPHEMERAL_KEYS = NO
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [transport-udp]
 TIMEOUT = 300 s
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-testbed/
 
 [nat]
 RETURN_LOCAL_ADDRESSES = YES