1 files changed, 17 insertions, 17 deletions

diff --git a/src/cadet/test_cadet.conf b/src/cadet/test_cadet.conf
index b6e6c6ae3..5ad67fec2 100644
--- a/src/cadet/test_cadet.conf
+++ b/src/cadet/test_cadet.conf
@@ -59,7 +59,7 @@ BLUETOOTH_QUOTA_OUT = unlimited
 USE_EPHEMERAL_KEYS = NO
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-cadet/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-cadet/
 
 [peerinfo]
 NO_IO = YES
@@ -68,33 +68,33 @@ NO_IO = YES
 WORKBITS = 0
 
 [hostlist]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [fs]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [vpn]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [revocation]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [gns]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [namestore]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [namecache]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO
 
 [topology]
-FORCESTART = NO
-AUTOSTART = NO
+IMMEDIATE_START = NO
+START_ON_DEMAND = NO