8 files changed, 19 insertions, 3 deletions

diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index 0e34eb747..032416cd8 100644
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_api_data.conf
@@ -77,7 +77,8 @@ EXTERNAL_ADDRESS = 127.0.0.1
 [dns]
 AUTOSTART = NO
 
-
+[namestore]
+AUTOSTART = NO
 
 [nse]
 AUTOSTART = NO
diff --git a/src/dht/test_dht_line.conf b/src/dht/test_dht_line.conf
index 8bcb12c73..6be3559ef 100644
--- a/src/dht/test_dht_line.conf
+++ b/src/dht/test_dht_line.conf
@@ -80,6 +80,8 @@ DELETE_FILES = YES
 CONNECTION_LIMIT = 5
 #DATA_OUTPUT_FILE=data_output
 
+[namestore]
+AUTOSTART = NO
 
 [nse]
 WORKDELAY = 500 ms
diff --git a/src/dht/test_dht_multipeer_data.conf b/src/dht/test_dht_multipeer_data.conf
index ff876983c..f6982930d 100644
--- a/src/dht/test_dht_multipeer_data.conf
+++ b/src/dht/test_dht_multipeer_data.conf
@@ -120,7 +120,8 @@ USE_LOCALADDR = NO
 [dns]
 AUTOSTART = NO
 
-
+[namestore]
+AUTOSTART = NO
 
 [nse]
 AUTOSTART = NO
diff --git a/src/dht/test_dht_twopeer_data.conf b/src/dht/test_dht_twopeer_data.conf
index ba1e22b80..6e8b2bb3c 100644
--- a/src/dht/test_dht_twopeer_data.conf
+++ b/src/dht/test_dht_twopeer_data.conf
@@ -72,3 +72,5 @@ AUTOSTART = NO
 [fs]
 AUTOSTART = NO
 
+[namestore]
+AUTOSTART = NO
diff --git a/src/fs/test_fs_defaults.conf b/src/fs/test_fs_defaults.conf
index 2bc3d2686..fcb888c7a 100644
--- a/src/fs/test_fs_defaults.conf
+++ b/src/fs/test_fs_defaults.conf
@@ -85,3 +85,6 @@ AUTOSTART = NO
 
 [vpn]
 AUTOSTART = NO
+
+[namestore]
+AUTOSTART = NO
diff --git a/src/mesh/test_mesh.conf b/src/mesh/test_mesh.conf
index 3d955f09e..cac440016 100644
--- a/src/mesh/test_mesh.conf
+++ b/src/mesh/test_mesh.conf
@@ -67,3 +67,6 @@ AUTOSTART = NO
 
 [nse]
 AUTOSTART = NO
+
+[namestore]
+AUTOSTART = NO
diff --git a/src/testing/test_testing_defaults.conf b/src/testing/test_testing_defaults.conf
index 7b6c4c42d..762c9641b 100644
--- a/src/testing/test_testing_defaults.conf
+++ b/src/testing/test_testing_defaults.conf
@@ -70,3 +70,6 @@ AUTOSTART = NO
 
 [gns]
 AUTOSTART = NO
+
+[namestore]
+AUTOSTART = NO
\ No newline at end of file
diff --git a/src/topology/test_gnunet_daemon_topology_data.conf b/src/topology/test_gnunet_daemon_topology_data.conf
index 2bce10d3d..0be8cd45b 100644
--- a/src/topology/test_gnunet_daemon_topology_data.conf
+++ b/src/topology/test_gnunet_daemon_topology_data.conf
@@ -56,7 +56,8 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 [dns]
 AUTOSTART = NO
 
-
+[namestore]
+AUTOSTART = NO
 
 [nse]
 AUTOSTART = NO