1 files changed, 6 insertions, 13 deletions

diff --git a/src/namestore/test_namestore_api.conf b/src/namestore/test_namestore_api.conf
index 29ff90b5d..3e75c2ded 100644
--- a/src/namestore/test_namestore_api.conf
+++ b/src/namestore/test_namestore_api.conf
@@ -1,26 +1,19 @@
-@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
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-namestore/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-namestore/
 
 [namestore]
 DATABASE = sqlite
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [namecache]
 DATABASE = sqlite
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [identity]
-AUTOSTART = YES
-
-[namestore-sqlite]
-FILENAME = $GNUNET_TEST_HOME/namestore/sqlite_test.db
-
-[namestore-postgres]
-CONFIG = connect_timeout=10; dbname=gnunetcheck
-TEMPORARY_TABLE = YES
+START_ON_DEMAND = YES
 
 [nse]
 WORKBITS = 0