134 files changed, 668 insertions, 4 deletions

diff --git a/src/arm/test_arm_api_data.conf b/src/arm/test_arm_api_data.conf
index 29ef6e4a7..509dd658e 100644
--- a/src/arm/test_arm_api_data.conf
+++ b/src/arm/test_arm_api_data.conf
@@ -46,3 +46,8 @@ AUTOSTART = NO
 AUTOSTART = YES
 # DEBUG = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/chat/test_chat_data.conf b/src/chat/test_chat_data.conf
index 60a2f7d0b..74f9fca5f 100644
--- a/src/chat/test_chat_data.conf
+++ b/src/chat/test_chat_data.conf
@@ -44,3 +44,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/chat/test_chat_peer1.conf b/src/chat/test_chat_peer1.conf
index f76c5076c..bfe6ed7c1 100644
--- a/src/chat/test_chat_peer1.conf
+++ b/src/chat/test_chat_peer1.conf
@@ -83,3 +83,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/chat/test_chat_peer2.conf b/src/chat/test_chat_peer2.conf
index 9c57ecd4e..d3b550a18 100644
--- a/src/chat/test_chat_peer2.conf
+++ b/src/chat/test_chat_peer2.conf
@@ -84,3 +84,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/chat/test_chat_peer3.conf b/src/chat/test_chat_peer3.conf
index 8b307298d..90655aed9 100644
--- a/src/chat/test_chat_peer3.conf
+++ b/src/chat/test_chat_peer3.conf
@@ -84,3 +84,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/core/test_core_api_data.conf b/src/core/test_core_api_data.conf
index 5581c97f4..8a99fc61b 100644
--- a/src/core/test_core_api_data.conf
+++ b/src/core/test_core_api_data.conf
@@ -13,3 +13,8 @@ WEAKRANDOM = YES
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/core/test_core_api_peer1.conf b/src/core/test_core_api_peer1.conf
index 75196b1e7..e8a6ed2cf 100644
--- a/src/core/test_core_api_peer1.conf
+++ b/src/core/test_core_api_peer1.conf
@@ -77,3 +77,8 @@ AUTOSTART = NO
 
 [mesh]
 AUTOSTART = NO
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/core/test_core_api_peer2.conf b/src/core/test_core_api_peer2.conf
index b0012e7bc..4e6fe519f 100644
--- a/src/core/test_core_api_peer2.conf
+++ b/src/core/test_core_api_peer2.conf
@@ -77,3 +77,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/core/test_core_api_send_to_self.conf b/src/core/test_core_api_send_to_self.conf
index b3a8775b0..e01a8141a 100644
--- a/src/core/test_core_api_send_to_self.conf
+++ b/src/core/test_core_api_send_to_self.conf
@@ -62,3 +62,8 @@ UNIXPATH = /tmp/gnunet-service-core.sock
 # REJECT_FROM =
 # REJECT_FROM6 =
 # PREFIX =
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
index 94bd33565..bd23c4e74 100644
--- a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
+++ b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
@@ -79,3 +79,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
index 835297509..02cd22967 100644
--- a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
+++ b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
@@ -77,3 +77,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
index e49bc21cc..accdcb054 100644
--- a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
+++ b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
@@ -78,3 +78,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
index 4de735b39..ff9256337 100644
--- a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
+++ b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
@@ -77,3 +77,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/core/test_core_quota_asymmetric_send_limited_peer1.conf b/src/core/test_core_quota_asymmetric_send_limited_peer1.conf
index 3195ea5af..fd97964cb 100644
--- a/src/core/test_core_quota_asymmetric_send_limited_peer1.conf
+++ b/src/core/test_core_quota_asymmetric_send_limited_peer1.conf
@@ -78,3 +78,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/core/test_core_quota_asymmetric_send_limited_peer2.conf b/src/core/test_core_quota_asymmetric_send_limited_peer2.conf
index 260112b1f..d6f82a520 100644
--- a/src/core/test_core_quota_asymmetric_send_limited_peer2.conf
+++ b/src/core/test_core_quota_asymmetric_send_limited_peer2.conf
@@ -78,3 +78,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/core/test_core_quota_peer1.conf b/src/core/test_core_quota_peer1.conf
index 7b8d776b1..5d3f2042c 100644
--- a/src/core/test_core_quota_peer1.conf
+++ b/src/core/test_core_quota_peer1.conf
@@ -80,3 +80,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/core/test_core_quota_peer2.conf b/src/core/test_core_quota_peer2.conf
index 7784c25f9..b9f1cc136 100644
--- a/src/core/test_core_quota_peer2.conf
+++ b/src/core/test_core_quota_peer2.conf
@@ -79,3 +79,8 @@ AUTOSTART = NO
 
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/datacache/perf_datacache_data_mysql.conf b/src/datacache/perf_datacache_data_mysql.conf
index 5a5f97c63..ac80b64cc 100644
--- a/src/datacache/perf_datacache_data_mysql.conf
+++ b/src/datacache/perf_datacache_data_mysql.conf
@@ -9,4 +9,8 @@ DATABASE = gnunetcheck
 # USER =
 # PASSWORD =
 # HOST = 
-# PORT = 
\ No newline at end of file
+# PORT = 
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/datacache/perf_datacache_data_postgres.conf b/src/datacache/perf_datacache_data_postgres.conf
index 0f46716f0..e20fe7749 100644
--- a/src/datacache/perf_datacache_data_postgres.conf
+++ b/src/datacache/perf_datacache_data_postgres.conf
@@ -5,3 +5,8 @@ DATABASE = postgres
 
 [datacache-postgres]
 CONFIG = dbname=gnunetcheck
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/datacache/perf_datacache_data_sqlite.conf b/src/datacache/perf_datacache_data_sqlite.conf
index 55e178d99..78680f001 100644
--- a/src/datacache/perf_datacache_data_sqlite.conf
+++ b/src/datacache/perf_datacache_data_sqlite.conf
@@ -2,3 +2,8 @@
 [perfcache]
 QUOTA = 500000
 DATABASE = sqlite
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/datacache/test_datacache_data_mysql.conf b/src/datacache/test_datacache_data_mysql.conf
index 3086497df..c8a75576e 100644
--- a/src/datacache/test_datacache_data_mysql.conf
+++ b/src/datacache/test_datacache_data_mysql.conf
@@ -9,4 +9,8 @@ DATABASE = gnunetcheck
 # USER =
 # PASSWORD =
 # HOST = 
-# PORT = 
\ No newline at end of file
+# PORT = 
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/datacache/test_datacache_data_postgres.conf b/src/datacache/test_datacache_data_postgres.conf
index eca2d5c54..d230ce9ba 100644
--- a/src/datacache/test_datacache_data_postgres.conf
+++ b/src/datacache/test_datacache_data_postgres.conf
@@ -5,3 +5,8 @@ DATABASE = postgres
 
 [datacache-postgres]
 CONFIG = dbname=gnunetcheck
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/datacache/test_datacache_data_sqlite.conf b/src/datacache/test_datacache_data_sqlite.conf
index 2e8606682..d55d05de4 100644
--- a/src/datacache/test_datacache_data_sqlite.conf
+++ b/src/datacache/test_datacache_data_sqlite.conf
@@ -2,3 +2,8 @@
 [testcache]
 QUOTA = 1000000
 DATABASE = sqlite
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/datastore/perf_plugin_datastore_data_mysql.conf b/src/datastore/perf_plugin_datastore_data_mysql.conf
index d436ea53d..30c9617d4 100644
--- a/src/datastore/perf_plugin_datastore_data_mysql.conf
+++ b/src/datastore/perf_plugin_datastore_data_mysql.conf
@@ -32,3 +32,8 @@ DATABASE = gnunetcheck
 # PASSWORD =
 # HOST = 
 # PORT = 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/datastore/perf_plugin_datastore_data_postgres.conf b/src/datastore/perf_plugin_datastore_data_postgres.conf
index b7cf174e9..549b7679b 100644
--- a/src/datastore/perf_plugin_datastore_data_postgres.conf
+++ b/src/datastore/perf_plugin_datastore_data_postgres.conf
@@ -27,3 +27,8 @@ AUTOSTART = NO
 
 [datastore-postgres]
 CONFIG = dbname=gnunetcheck
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/datastore/perf_plugin_datastore_data_sqlite.conf b/src/datastore/perf_plugin_datastore_data_sqlite.conf
index 90cf9f103..6769df359 100644
--- a/src/datastore/perf_plugin_datastore_data_sqlite.conf
+++ b/src/datastore/perf_plugin_datastore_data_sqlite.conf
@@ -25,3 +25,8 @@ DATABASE = sqlite
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/datastore/test_datastore_api_data_mysql.conf b/src/datastore/test_datastore_api_data_mysql.conf
index 652c1ff9f..024b7f8ce 100644
--- a/src/datastore/test_datastore_api_data_mysql.conf
+++ b/src/datastore/test_datastore_api_data_mysql.conf
@@ -55,3 +55,8 @@ AUTOSTART = NO
 
 [fs]
 AUTOSTART = NO
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/datastore/test_datastore_api_data_postgres.conf b/src/datastore/test_datastore_api_data_postgres.conf
index 8406a01e5..f9e7bbe0f 100644
--- a/src/datastore/test_datastore_api_data_postgres.conf
+++ b/src/datastore/test_datastore_api_data_postgres.conf
@@ -50,4 +50,8 @@ AUTOSTART = NO
 
 
 [fs]
-AUTOSTART = NO
\ No newline at end of file
+AUTOSTART = NO
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/datastore/test_datastore_api_data_sqlite.conf b/src/datastore/test_datastore_api_data_sqlite.conf
index 931572025..58c7b9f23 100644
--- a/src/datastore/test_datastore_api_data_sqlite.conf
+++ b/src/datastore/test_datastore_api_data_sqlite.conf
@@ -46,3 +46,8 @@ AUTOSTART = NO
 
 [fs]
 AUTOSTART = NO
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/datastore/test_plugin_datastore_data_mysql.conf b/src/datastore/test_plugin_datastore_data_mysql.conf
index 1e38bb0cf..f79daade6 100644
--- a/src/datastore/test_plugin_datastore_data_mysql.conf
+++ b/src/datastore/test_plugin_datastore_data_mysql.conf
@@ -32,3 +32,8 @@ DATABASE = gnunetcheck
 # PASSWORD =
 # HOST = 
 # PORT = 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/datastore/test_plugin_datastore_data_postgres.conf b/src/datastore/test_plugin_datastore_data_postgres.conf
index 1604165a9..d64c4429c 100644
--- a/src/datastore/test_plugin_datastore_data_postgres.conf
+++ b/src/datastore/test_plugin_datastore_data_postgres.conf
@@ -27,3 +27,8 @@ AUTOSTART = NO
 
 [datastore-postgres]
 CONFIG = dbname=gnunetcheck
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/datastore/test_plugin_datastore_data_sqlite.conf b/src/datastore/test_plugin_datastore_data_sqlite.conf
index 5eb1d1341..bc3a1bc12 100644
--- a/src/datastore/test_plugin_datastore_data_sqlite.conf
+++ b/src/datastore/test_plugin_datastore_data_sqlite.conf
@@ -25,3 +25,8 @@ DATABASE = sqlite
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index 50e46caaf..6cb219127 100644
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_api_data.conf
@@ -71,3 +71,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index 0312df913..bb3c43d0d 100644
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.conf
@@ -60,3 +60,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/dht/test_dht_multipeer_data.conf b/src/dht/test_dht_multipeer_data.conf
index a3247e6bf..2b749f195 100644
--- a/src/dht/test_dht_multipeer_data.conf
+++ b/src/dht/test_dht_multipeer_data.conf
@@ -105,3 +105,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/dht/test_dht_twopeer_data.conf b/src/dht/test_dht_twopeer_data.conf
index 044245a87..68268bc43 100644
--- a/src/dht/test_dht_twopeer_data.conf
+++ b/src/dht/test_dht_twopeer_data.conf
@@ -60,3 +60,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/dht/test_dhtlog_data.conf b/src/dht/test_dhtlog_data.conf
index ab108b5dc..3fd228cd6 100644
--- a/src/dht/test_dhtlog_data.conf
+++ b/src/dht/test_dhtlog_data.conf
@@ -55,3 +55,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/dv/test_transport_dv_data.conf b/src/dv/test_transport_dv_data.conf
index 7e28d2d93..912b2bb87 100644
--- a/src/dv/test_transport_dv_data.conf
+++ b/src/dv/test_transport_dv_data.conf
@@ -67,3 +67,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf
index e9ffdd123..3442da354 100644
--- a/src/fs/fs_test_lib_data.conf
+++ b/src/fs/fs_test_lib_data.conf
@@ -84,3 +84,8 @@ DATABASE=sqlite
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_fs_data.conf b/src/fs/test_fs_data.conf
index 0f75d17c0..ea2d39720 100644
--- a/src/fs/test_fs_data.conf
+++ b/src/fs/test_fs_data.conf
@@ -52,3 +52,8 @@ DATABASE=sqlite
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_fs_download_data.conf b/src/fs/test_fs_download_data.conf
index d4e4ce348..528642749 100644
--- a/src/fs/test_fs_download_data.conf
+++ b/src/fs/test_fs_download_data.conf
@@ -54,3 +54,8 @@ DATABASE=sqlite
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_fs_file_information_data.conf b/src/fs/test_fs_file_information_data.conf
index e7fa57a96..95a112b23 100644
--- a/src/fs/test_fs_file_information_data.conf
+++ b/src/fs/test_fs_file_information_data.conf
@@ -50,3 +50,8 @@ DATABASE=sqlite
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_fs_list_indexed_data.conf b/src/fs/test_fs_list_indexed_data.conf
index 4de71a86a..85f2e930e 100644
--- a/src/fs/test_fs_list_indexed_data.conf
+++ b/src/fs/test_fs_list_indexed_data.conf
@@ -51,3 +51,8 @@ DATABASE=sqlite
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_fs_namespace_data.conf b/src/fs/test_fs_namespace_data.conf
index e84944ea5..8a528eae4 100644
--- a/src/fs/test_fs_namespace_data.conf
+++ b/src/fs/test_fs_namespace_data.conf
@@ -53,3 +53,8 @@ DATABASE=sqlite
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_fs_publish_data.conf b/src/fs/test_fs_publish_data.conf
index d34777725..a781ef4a9 100644
--- a/src/fs/test_fs_publish_data.conf
+++ b/src/fs/test_fs_publish_data.conf
@@ -51,3 +51,8 @@ DATABASE=sqlite
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_fs_search_data.conf b/src/fs/test_fs_search_data.conf
index 2b7d614fb..4c61bed19 100644
--- a/src/fs/test_fs_search_data.conf
+++ b/src/fs/test_fs_search_data.conf
@@ -50,3 +50,8 @@ DATABASE=sqlite
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_fs_unindex_data.conf b/src/fs/test_fs_unindex_data.conf
index f45888dfc..2abc28456 100644
--- a/src/fs/test_fs_unindex_data.conf
+++ b/src/fs/test_fs_unindex_data.conf
@@ -50,3 +50,8 @@ DATABASE=sqlite
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_fs_uri_data.conf b/src/fs/test_fs_uri_data.conf
index 3295a198b..e57c471f3 100644
--- a/src/fs/test_fs_uri_data.conf
+++ b/src/fs/test_fs_uri_data.conf
@@ -17,3 +17,8 @@ DATABASE=sqlite
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_gnunet_fs_idx_data.conf b/src/fs/test_gnunet_fs_idx_data.conf
index 69e5dd3dd..fa2de848b 100644
--- a/src/fs/test_gnunet_fs_idx_data.conf
+++ b/src/fs/test_gnunet_fs_idx_data.conf
@@ -52,3 +52,8 @@ DATABASE=sqlite
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_gnunet_fs_ns_data.conf b/src/fs/test_gnunet_fs_ns_data.conf
index 382d6d88c..c644fd50d 100644
--- a/src/fs/test_gnunet_fs_ns_data.conf
+++ b/src/fs/test_gnunet_fs_ns_data.conf
@@ -52,3 +52,8 @@ DATABASE=sqlite
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_gnunet_fs_psd_data.conf b/src/fs/test_gnunet_fs_psd_data.conf
index 6dd0af1c2..d521c0b9a 100644
--- a/src/fs/test_gnunet_fs_psd_data.conf
+++ b/src/fs/test_gnunet_fs_psd_data.conf
@@ -54,3 +54,8 @@ DATABASE=sqlite
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_gnunet_fs_rec_data.conf b/src/fs/test_gnunet_fs_rec_data.conf
index 1304e20b9..09b3585c1 100644
--- a/src/fs/test_gnunet_fs_rec_data.conf
+++ b/src/fs/test_gnunet_fs_rec_data.conf
@@ -53,3 +53,8 @@ DATABASE=sqlite
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_gnunet_service_fs_migration_data.conf b/src/fs/test_gnunet_service_fs_migration_data.conf
index 9c12fcdf9..98e8a88d6 100644
--- a/src/fs/test_gnunet_service_fs_migration_data.conf
+++ b/src/fs/test_gnunet_service_fs_migration_data.conf
@@ -76,3 +76,8 @@ DATABASE=sqlite
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/hostlist/learning_data.conf b/src/hostlist/learning_data.conf
index 4c872b03b..cf4b97e13 100644
--- a/src/hostlist/learning_data.conf
+++ b/src/hostlist/learning_data.conf
@@ -22,3 +22,8 @@ WEAKRANDOM = YES
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/hostlist/test_gnunet_daemon_hostlist.conf b/src/hostlist/test_gnunet_daemon_hostlist.conf
index a371a0a8d..85f0a522c 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist.conf
@@ -51,3 +51,8 @@ HTTPPORT = 12471
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_data.conf b/src/hostlist/test_gnunet_daemon_hostlist_data.conf
index b7cf7b1ac..c0f3d7c6a 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_data.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_data.conf
@@ -63,3 +63,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
index 109e69214..5d0d297d6 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
@@ -68,3 +68,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
index fdedf6e38..d19c1e033 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
@@ -65,3 +65,8 @@ AUTOSTART = NO[mesh]
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/hostlist/test_learning_adv_peer.conf b/src/hostlist/test_learning_adv_peer.conf
index cc9e8154c..dae2d0edf 100644
--- a/src/hostlist/test_learning_adv_peer.conf
+++ b/src/hostlist/test_learning_adv_peer.conf
@@ -65,3 +65,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/hostlist/test_learning_learn_peer.conf b/src/hostlist/test_learning_learn_peer.conf
index a147b88be..1f192707b 100644
--- a/src/hostlist/test_learning_learn_peer.conf
+++ b/src/hostlist/test_learning_learn_peer.conf
@@ -65,3 +65,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/hostlist/test_learning_learn_peer2.conf b/src/hostlist/test_learning_learn_peer2.conf
index b281802ca..8be0b3a4c 100644
--- a/src/hostlist/test_learning_learn_peer2.conf
+++ b/src/hostlist/test_learning_learn_peer2.conf
@@ -57,3 +57,8 @@ HOSTLISTFILE = hostlists_learn_peer2.file
 AUTOSTART = NO
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/mesh/test_mesh.conf b/src/mesh/test_mesh.conf
index bd8f199c8..85f9affcb 100644
--- a/src/mesh/test_mesh.conf
+++ b/src/mesh/test_mesh.conf
@@ -57,3 +57,8 @@ HOSTKEY = $SERVICEHOME/.hostkey
 [PATHS]
 DEFAULTCONFIG = test_mesh.conf
 SERVICEHOME = /tmp/test-mesh/
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/monkey/test_gnunet_monkey_data.conf b/src/monkey/test_gnunet_monkey_data.conf
index fc9153b1a..9ae1d6772 100644
--- a/src/monkey/test_gnunet_monkey_data.conf
+++ b/src/monkey/test_gnunet_monkey_data.conf
@@ -36,3 +36,8 @@ AUTOSTART = NO
 AUTOSTART = YES
 # DEBUG = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/nat/test-nat.conf b/src/nat/test-nat.conf
index 9c74535ef..311eb3c15 100644
--- a/src/nat/test-nat.conf
+++ b/src/nat/test-nat.conf
@@ -348,3 +348,8 @@ QUOTA = 1024000
 
 [block]
 PLUGINS = fs dht test
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/peerinfo-tool/test_gnunet_peerinfo_data.conf b/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
index 648a33bcb..ca6108623 100644
--- a/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
+++ b/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
@@ -19,3 +19,8 @@ PORT = 24356
 
 [transport-tcp]
 PORT = 24357
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/peerinfo/test_peerinfo_api_data.conf b/src/peerinfo/test_peerinfo_api_data.conf
index 998df571a..1b2efd400 100644
--- a/src/peerinfo/test_peerinfo_api_data.conf
+++ b/src/peerinfo/test_peerinfo_api_data.conf
@@ -4,3 +4,8 @@ SERVICEHOME = /tmp/test-gnunet-peerinfo/
 [peerinfo]
 PORT = 22354
 DEBUG = NO
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/statistics/test_statistics_api_data.conf b/src/statistics/test_statistics_api_data.conf
index 794d143ba..76303e969 100644
--- a/src/statistics/test_statistics_api_data.conf
+++ b/src/statistics/test_statistics_api_data.conf
@@ -31,3 +31,8 @@ AUTOSTART = NO
 [peerinfo]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_connect_peer1.conf b/src/testing/test_testing_connect_peer1.conf
index fec00cbe7..7a2886d4b 100644
--- a/src/testing/test_testing_connect_peer1.conf
+++ b/src/testing/test_testing_connect_peer1.conf
@@ -65,3 +65,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_connect_peer2.conf b/src/testing/test_testing_connect_peer2.conf
index 4b63d4721..8826c1d6a 100644
--- a/src/testing/test_testing_connect_peer2.conf
+++ b/src/testing/test_testing_connect_peer2.conf
@@ -67,3 +67,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data.conf b/src/testing/test_testing_data.conf
index e9a443a1c..c51cceea2 100644
--- a/src/testing/test_testing_data.conf
+++ b/src/testing/test_testing_data.conf
@@ -52,3 +52,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data_remote.conf b/src/testing/test_testing_data_remote.conf
index 703081764..2b6f4ef28 100644
--- a/src/testing/test_testing_data_remote.conf
+++ b/src/testing/test_testing_data_remote.conf
@@ -49,3 +49,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data_topology_2d_torus.conf b/src/testing/test_testing_data_topology_2d_torus.conf
index 66b35c7fc..5607385c6 100644
--- a/src/testing/test_testing_data_topology_2d_torus.conf
+++ b/src/testing/test_testing_data_topology_2d_torus.conf
@@ -49,3 +49,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data_topology_blacklist.conf b/src/testing/test_testing_data_topology_blacklist.conf
index bd50557c9..43bbbdc39 100644
--- a/src/testing/test_testing_data_topology_blacklist.conf
+++ b/src/testing/test_testing_data_topology_blacklist.conf
@@ -62,3 +62,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data_topology_churn.conf b/src/testing/test_testing_data_topology_churn.conf
index 449c0d82b..b212778bd 100644
--- a/src/testing/test_testing_data_topology_churn.conf
+++ b/src/testing/test_testing_data_topology_churn.conf
@@ -57,3 +57,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data_topology_clique.conf b/src/testing/test_testing_data_topology_clique.conf
index 0bd569b6a..14dac2473 100644
--- a/src/testing/test_testing_data_topology_clique.conf
+++ b/src/testing/test_testing_data_topology_clique.conf
@@ -64,3 +64,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data_topology_clique_dfs.conf b/src/testing/test_testing_data_topology_clique_dfs.conf
index 0b8bd83d8..a1a62d07f 100644
--- a/src/testing/test_testing_data_topology_clique_dfs.conf
+++ b/src/testing/test_testing_data_topology_clique_dfs.conf
@@ -61,3 +61,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data_topology_clique_minimum.conf b/src/testing/test_testing_data_topology_clique_minimum.conf
index 69e287dcc..e2e741329 100644
--- a/src/testing/test_testing_data_topology_clique_minimum.conf
+++ b/src/testing/test_testing_data_topology_clique_minimum.conf
@@ -61,3 +61,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data_topology_clique_random.conf b/src/testing/test_testing_data_topology_clique_random.conf
index f992adc8a..b7d4668dc 100644
--- a/src/testing/test_testing_data_topology_clique_random.conf
+++ b/src/testing/test_testing_data_topology_clique_random.conf
@@ -63,3 +63,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data_topology_erdos_renyi.conf b/src/testing/test_testing_data_topology_erdos_renyi.conf
index 9ceb0c31a..6685e1ff0 100644
--- a/src/testing/test_testing_data_topology_erdos_renyi.conf
+++ b/src/testing/test_testing_data_topology_erdos_renyi.conf
@@ -49,3 +49,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data_topology_internat.conf b/src/testing/test_testing_data_topology_internat.conf
index 2bfa20917..d764ee02e 100644
--- a/src/testing/test_testing_data_topology_internat.conf
+++ b/src/testing/test_testing_data_topology_internat.conf
@@ -49,3 +49,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data_topology_none.conf b/src/testing/test_testing_data_topology_none.conf
index 0991a1d7d..bef097ddd 100644
--- a/src/testing/test_testing_data_topology_none.conf
+++ b/src/testing/test_testing_data_topology_none.conf
@@ -66,3 +66,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data_topology_ring.conf b/src/testing/test_testing_data_topology_ring.conf
index d590d3b49..3ac345b34 100644
--- a/src/testing/test_testing_data_topology_ring.conf
+++ b/src/testing/test_testing_data_topology_ring.conf
@@ -49,3 +49,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data_topology_scale_free.conf b/src/testing/test_testing_data_topology_scale_free.conf
index f3acfa6b0..c44fdadad 100644
--- a/src/testing/test_testing_data_topology_scale_free.conf
+++ b/src/testing/test_testing_data_topology_scale_free.conf
@@ -59,3 +59,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data_topology_small_world_ring.conf b/src/testing/test_testing_data_topology_small_world_ring.conf
index 24a3b7517..5e78d18d6 100644
--- a/src/testing/test_testing_data_topology_small_world_ring.conf
+++ b/src/testing/test_testing_data_topology_small_world_ring.conf
@@ -49,3 +49,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data_topology_small_world_torus.conf b/src/testing/test_testing_data_topology_small_world_torus.conf
index c6c2dc6a3..5171a1e34 100644
--- a/src/testing/test_testing_data_topology_small_world_torus.conf
+++ b/src/testing/test_testing_data_topology_small_world_torus.conf
@@ -49,3 +49,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data_topology_stability.conf b/src/testing/test_testing_data_topology_stability.conf
index bef645a25..a92392b16 100644
--- a/src/testing/test_testing_data_topology_stability.conf
+++ b/src/testing/test_testing_data_topology_stability.conf
@@ -63,3 +63,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_peergroup_data.conf b/src/testing/test_testing_peergroup_data.conf
index 9db8f9ede..29c32e1a1 100644
--- a/src/testing/test_testing_peergroup_data.conf
+++ b/src/testing/test_testing_peergroup_data.conf
@@ -66,3 +66,8 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/topology/test_gnunet_daemon_topology_data.conf b/src/topology/test_gnunet_daemon_topology_data.conf
index 3108929ee..586c1eaff 100644
--- a/src/topology/test_gnunet_daemon_topology_data.conf
+++ b/src/topology/test_gnunet_daemon_topology_data.conf
@@ -51,3 +51,8 @@ AUTOSTART = NO
 [testing]
 WEAKRANDOM = YES
 HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_plugin_transport_data.conf b/src/transport/test_plugin_transport_data.conf
index 260b220ea..3c3326c96 100644
--- a/src/transport/test_plugin_transport_data.conf
+++ b/src/transport/test_plugin_transport_data.conf
@@ -29,3 +29,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_plugin_transport_data_http.conf b/src/transport/test_plugin_transport_data_http.conf
index bd5f71b29..d618f33eb 100644
--- a/src/transport/test_plugin_transport_data_http.conf
+++ b/src/transport/test_plugin_transport_data_http.conf
@@ -59,3 +59,8 @@ AUTOSTART = NO
 
 [mesh]
 AUTOSTART = NO
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_plugin_transport_data_udp.conf b/src/transport/test_plugin_transport_data_udp.conf
index 66111bda2..629b93e73 100644
--- a/src/transport/test_plugin_transport_data_udp.conf
+++ b/src/transport/test_plugin_transport_data_udp.conf
@@ -28,3 +28,8 @@ AUTOSTART = NO
 
 [mesh]
 AUTOSTART = NO
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_quota_compliance_data.conf b/src/transport/test_quota_compliance_data.conf
index d3538e45a..9b0f7e3e1 100644
--- a/src/transport/test_quota_compliance_data.conf
+++ b/src/transport/test_quota_compliance_data.conf
@@ -29,3 +29,8 @@ AUTOSTART = NO
 
 [mesh]
 AUTOSTART = NO
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf
index b05fdab1a..13875a0e8 100644
--- a/src/transport/test_quota_compliance_http_peer1.conf
+++ b/src/transport/test_quota_compliance_http_peer1.conf
@@ -108,3 +108,8 @@ AUTOSTART = NO
 
 [mesh]
 AUTOSTART = NO
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf
index 2f9637ecc..ab3773e3d 100644
--- a/src/transport/test_quota_compliance_http_peer2.conf
+++ b/src/transport/test_quota_compliance_http_peer2.conf
@@ -109,3 +109,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf
index a34629e99..dc6d6a21a 100644
--- a/src/transport/test_quota_compliance_https_peer1.conf
+++ b/src/transport/test_quota_compliance_https_peer1.conf
@@ -114,3 +114,8 @@ AUTOSTART = NO
 
 [mesh]
 AUTOSTART = NO
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf
index 095f828f9..665281841 100644
--- a/src/transport/test_quota_compliance_https_peer2.conf
+++ b/src/transport/test_quota_compliance_https_peer2.conf
@@ -116,3 +116,8 @@ AUTOSTART = NO
 
 [mesh]
 AUTOSTART = NO
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf
index 56c2ebfb8..de0a4ca7c 100644
--- a/src/transport/test_quota_compliance_tcp_peer1.conf
+++ b/src/transport/test_quota_compliance_tcp_peer1.conf
@@ -115,4 +115,8 @@ HOSTKEY = $SERVICEHOME/.hostkey
 AUTOSTART = NO
 
 [mesh]
-AUTOSTART = NO
\ No newline at end of file
+AUTOSTART = NO
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf
index 8a68be79c..8854ca1f7 100644
--- a/src/transport/test_quota_compliance_tcp_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_peer2.conf
@@ -117,3 +117,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_quota_compliance_udp_peer1.conf b/src/transport/test_quota_compliance_udp_peer1.conf
index 4f0520a52..7882708a1 100644
--- a/src/transport/test_quota_compliance_udp_peer1.conf
+++ b/src/transport/test_quota_compliance_udp_peer1.conf
@@ -108,3 +108,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_quota_compliance_udp_peer2.conf b/src/transport/test_quota_compliance_udp_peer2.conf
index b49cf9538..6676cdeaf 100644
--- a/src/transport/test_quota_compliance_udp_peer2.conf
+++ b/src/transport/test_quota_compliance_udp_peer2.conf
@@ -107,3 +107,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_quota_compliance_unix_peer1.conf b/src/transport/test_quota_compliance_unix_peer1.conf
index cd42ea838..58463bcd9 100644
--- a/src/transport/test_quota_compliance_unix_peer1.conf
+++ b/src/transport/test_quota_compliance_unix_peer1.conf
@@ -104,3 +104,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_quota_compliance_unix_peer2.conf b/src/transport/test_quota_compliance_unix_peer2.conf
index 7f113df25..4e0262c82 100644
--- a/src/transport/test_quota_compliance_unix_peer2.conf
+++ b/src/transport/test_quota_compliance_unix_peer2.conf
@@ -102,3 +102,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_data.conf b/src/transport/test_transport_api_data.conf
index f306e4b0c..613fd1fdb 100644
--- a/src/transport/test_transport_api_data.conf
+++ b/src/transport/test_transport_api_data.conf
@@ -102,3 +102,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf
index b888ebdc2..e4e972c8c 100644
--- a/src/transport/test_transport_api_http_peer1.conf
+++ b/src/transport/test_transport_api_http_peer1.conf
@@ -124,3 +124,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf
index f2d1cafc2..a8833c7a4 100644
--- a/src/transport/test_transport_api_http_peer2.conf
+++ b/src/transport/test_transport_api_http_peer2.conf
@@ -129,3 +129,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_https_peer1.conf b/src/transport/test_transport_api_https_peer1.conf
index a5872390a..a2decb6fb 100644
--- a/src/transport/test_transport_api_https_peer1.conf
+++ b/src/transport/test_transport_api_https_peer1.conf
@@ -140,3 +140,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf
index e790a8d84..07495835c 100644
--- a/src/transport/test_transport_api_https_peer2.conf
+++ b/src/transport/test_transport_api_https_peer2.conf
@@ -134,3 +134,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf
index 106ffc4cd..959388391 100644
--- a/src/transport/test_transport_api_multi_peer1.conf
+++ b/src/transport/test_transport_api_multi_peer1.conf
@@ -141,3 +141,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf
index 0453b4929..ca7a505c9 100644
--- a/src/transport/test_transport_api_multi_peer2.conf
+++ b/src/transport/test_transport_api_multi_peer2.conf
@@ -153,3 +153,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_rel_http_peer1.conf b/src/transport/test_transport_api_rel_http_peer1.conf
index bb258fe0b..fac0accc5 100644
--- a/src/transport/test_transport_api_rel_http_peer1.conf
+++ b/src/transport/test_transport_api_rel_http_peer1.conf
@@ -127,3 +127,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_rel_http_peer2.conf b/src/transport/test_transport_api_rel_http_peer2.conf
index 2e13f657b..8f7640f21 100644
--- a/src/transport/test_transport_api_rel_http_peer2.conf
+++ b/src/transport/test_transport_api_rel_http_peer2.conf
@@ -133,3 +133,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_rel_https_peer1.conf b/src/transport/test_transport_api_rel_https_peer1.conf
index 9da64e114..676a8a0dd 100644
--- a/src/transport/test_transport_api_rel_https_peer1.conf
+++ b/src/transport/test_transport_api_rel_https_peer1.conf
@@ -130,3 +130,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_rel_https_peer2.conf b/src/transport/test_transport_api_rel_https_peer2.conf
index 16b51951e..ba7a39454 100644
--- a/src/transport/test_transport_api_rel_https_peer2.conf
+++ b/src/transport/test_transport_api_rel_https_peer2.conf
@@ -135,3 +135,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf
index bd48b5872..2afe41210 100644
--- a/src/transport/test_transport_api_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer1.conf
@@ -130,3 +130,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_tcp_nat_peer2.conf b/src/transport/test_transport_api_tcp_nat_peer2.conf
index bdc5db6ea..b8e0906e2 100644
--- a/src/transport/test_transport_api_tcp_nat_peer2.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer2.conf
@@ -116,3 +116,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf
index a808df104..c4a27ea98 100644
--- a/src/transport/test_transport_api_tcp_peer1.conf
+++ b/src/transport/test_transport_api_tcp_peer1.conf
@@ -116,3 +116,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf
index b663bb0f2..000e4c6fd 100644
--- a/src/transport/test_transport_api_tcp_peer2.conf
+++ b/src/transport/test_transport_api_tcp_peer2.conf
@@ -117,3 +117,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf
index ca2ee63ad..0dead9a63 100644
--- a/src/transport/test_transport_api_udp_nat_peer1.conf
+++ b/src/transport/test_transport_api_udp_nat_peer1.conf
@@ -117,3 +117,8 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf
index d702dc46d..c291e9e5a 100644
--- a/src/transport/test_transport_api_udp_nat_peer2.conf
+++ b/src/transport/test_transport_api_udp_nat_peer2.conf
@@ -129,3 +129,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf
index e5a9e4213..dab597fbd 100644
--- a/src/transport/test_transport_api_udp_peer1.conf
+++ b/src/transport/test_transport_api_udp_peer1.conf
@@ -116,3 +116,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf
index ddf1ac976..2bdeaa6fb 100644
--- a/src/transport/test_transport_api_udp_peer2.conf
+++ b/src/transport/test_transport_api_udp_peer2.conf
@@ -124,3 +124,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_unix_peer1.conf b/src/transport/test_transport_api_unix_peer1.conf
index b3ccddf9c..04d198d62 100644
--- a/src/transport/test_transport_api_unix_peer1.conf
+++ b/src/transport/test_transport_api_unix_peer1.conf
@@ -109,3 +109,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_unix_peer2.conf b/src/transport/test_transport_api_unix_peer2.conf
index 9deac9cd8..50623fd93 100644
--- a/src/transport/test_transport_api_unix_peer2.conf
+++ b/src/transport/test_transport_api_unix_peer2.conf
@@ -108,3 +108,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf
index af5d6580b..d6dfc049c 100644
--- a/src/transport/test_transport_api_wlan_peer1.conf
+++ b/src/transport/test_transport_api_wlan_peer1.conf
@@ -109,3 +109,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_wlan_peer2.conf b/src/transport/test_transport_api_wlan_peer2.conf
index fc7e295f1..450c5a808 100644
--- a/src/transport/test_transport_api_wlan_peer2.conf
+++ b/src/transport/test_transport_api_wlan_peer2.conf
@@ -109,3 +109,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_ats_1addr.conf b/src/transport/test_transport_ats_1addr.conf
index b85b09173..c60a73a94 100644
--- a/src/transport/test_transport_ats_1addr.conf
+++ b/src/transport/test_transport_ats_1addr.conf
@@ -69,3 +69,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_ats_2addr.conf b/src/transport/test_transport_ats_2addr.conf
index 9ec447c8a..91478ff43 100644
--- a/src/transport/test_transport_ats_2addr.conf
+++ b/src/transport/test_transport_ats_2addr.conf
@@ -70,3 +70,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_ats_4addr.conf b/src/transport/test_transport_ats_4addr.conf
index 31456a029..644224ded 100644
--- a/src/transport/test_transport_ats_4addr.conf
+++ b/src/transport/test_transport_ats_4addr.conf
@@ -74,3 +74,8 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/util/test_configuration_data.conf b/src/util/test_configuration_data.conf
index 52b6b8220..e44df6c48 100644
--- a/src/util/test_configuration_data.conf
+++ b/src/util/test_configuration_data.conf
@@ -28,3 +28,8 @@ test = "/Hello /File\ Name /World"
 WEAKRANDOM = YES
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/util/test_program_data.conf b/src/util/test_program_data.conf
index e69de29bb..42e49f3fb 100644
--- a/src/util/test_program_data.conf
+++ b/src/util/test_program_data.conf
@@ -0,0 +1,5 @@
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/util/test_pseudonym_data.conf b/src/util/test_pseudonym_data.conf
index fd2048586..8188eb7b6 100644
--- a/src/util/test_pseudonym_data.conf
+++ b/src/util/test_pseudonym_data.conf
@@ -6,3 +6,8 @@ HOME = "/tmp/gnunet-pseudonym-test"
 WEAKRANDOM = YES
 
 
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/util/test_resolver_api_data.conf b/src/util/test_resolver_api_data.conf
index d7a9be758..dde65683a 100644
--- a/src/util/test_resolver_api_data.conf
+++ b/src/util/test_resolver_api_data.conf
@@ -4,3 +4,8 @@ SERVICEHOME = /tmp/test-gnunetd-statistics/
 [resolver]
 PORT = 22354
 HOSTNAME = localhost
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/util/test_service_data.conf b/src/util/test_service_data.conf
index cff43ccb0..b426f7e2e 100644
--- a/src/util/test_service_data.conf
+++ b/src/util/test_service_data.conf
@@ -25,3 +25,8 @@ HOSTNAME=::1
 
 [resolver]
 HOSTNAME=localhost
+
+[dns]
+AUTOSTART = NO
+
+
diff --git a/src/vpn/test-conf.conf b/src/vpn/test-conf.conf
index bac52349c..bd3bf68d5 100644
--- a/src/vpn/test-conf.conf
+++ b/src/vpn/test-conf.conf
@@ -265,3 +265,6 @@ DEBUG = YES
 
 [block]
 PLUGINS = fs dns
+
+
+