141 files changed, 701 insertions, 1 deletions

diff --git a/src/arm/test_arm_api_data.conf b/src/arm/test_arm_api_data.conf
index 509dd658e..7d56e65fc 100644
--- a/src/arm/test_arm_api_data.conf
+++ b/src/arm/test_arm_api_data.conf
@@ -51,3 +51,8 @@ AUTOSTART = YES
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/chat/test_chat_data.conf b/src/chat/test_chat_data.conf
index 74f9fca5f..3052a4f55 100644
--- a/src/chat/test_chat_data.conf
+++ b/src/chat/test_chat_data.conf
@@ -49,3 +49,8 @@ EXTERNAL_ADDRESS = 127.0.0.1
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/chat/test_chat_peer1.conf b/src/chat/test_chat_peer1.conf
index bfe6ed7c1..a89ebb808 100644
--- a/src/chat/test_chat_peer1.conf
+++ b/src/chat/test_chat_peer1.conf
@@ -88,3 +88,8 @@ EXTERNAL_ADDRESS = 127.0.0.1
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/chat/test_chat_peer2.conf b/src/chat/test_chat_peer2.conf
index d3b550a18..0fbac3ea8 100644
--- a/src/chat/test_chat_peer2.conf
+++ b/src/chat/test_chat_peer2.conf
@@ -89,3 +89,8 @@ EXTERNAL_ADDRESS = 127.0.0.1
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/chat/test_chat_peer3.conf b/src/chat/test_chat_peer3.conf
index 90655aed9..a39452323 100644
--- a/src/chat/test_chat_peer3.conf
+++ b/src/chat/test_chat_peer3.conf
@@ -89,3 +89,8 @@ EXTERNAL_ADDRESS = 127.0.0.1
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/core/test_core_api_data.conf b/src/core/test_core_api_data.conf
index 8a99fc61b..72f747dc8 100644
--- a/src/core/test_core_api_data.conf
+++ b/src/core/test_core_api_data.conf
@@ -18,3 +18,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/core/test_core_api_peer1.conf b/src/core/test_core_api_peer1.conf
index efdb81a67..11708be2e 100644
--- a/src/core/test_core_api_peer1.conf
+++ b/src/core/test_core_api_peer1.conf
@@ -81,3 +81,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/core/test_core_api_peer2.conf b/src/core/test_core_api_peer2.conf
index cba5dbcca..7d8178287 100644
--- a/src/core/test_core_api_peer2.conf
+++ b/src/core/test_core_api_peer2.conf
@@ -81,3 +81,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+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 e01a8141a..3eb66afad 100644
--- a/src/core/test_core_api_send_to_self.conf
+++ b/src/core/test_core_api_send_to_self.conf
@@ -67,3 +67,8 @@ UNIXPATH = /tmp/gnunet-service-core.sock
 AUTOSTART = NO
 
 
+
+[nse]
+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 3ddf375b2..ee8f950f4 100644
--- a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
+++ b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
@@ -83,3 +83,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+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 5a52e202d..f9a038e80 100644
--- a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
+++ b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
@@ -81,3 +81,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+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 19b1e3b64..6fd36fab0 100644
--- a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
+++ b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
@@ -82,3 +82,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+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 a7389a80d..9ef0f7ccd 100644
--- a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
+++ b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
@@ -81,3 +81,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+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 5ed6ed87a..b11214c9e 100644
--- a/src/core/test_core_quota_asymmetric_send_limited_peer1.conf
+++ b/src/core/test_core_quota_asymmetric_send_limited_peer1.conf
@@ -82,3 +82,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+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 f900f04fb..60f8f849c 100644
--- a/src/core/test_core_quota_asymmetric_send_limited_peer2.conf
+++ b/src/core/test_core_quota_asymmetric_send_limited_peer2.conf
@@ -82,3 +82,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/core/test_core_quota_peer1.conf b/src/core/test_core_quota_peer1.conf
index 443b383aa..02eab8ef1 100644
--- a/src/core/test_core_quota_peer1.conf
+++ b/src/core/test_core_quota_peer1.conf
@@ -83,3 +83,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/core/test_core_quota_peer2.conf b/src/core/test_core_quota_peer2.conf
index b8d58f388..003a03e10 100644
--- a/src/core/test_core_quota_peer2.conf
+++ b/src/core/test_core_quota_peer2.conf
@@ -83,3 +83,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/datacache/perf_datacache_data_mysql.conf b/src/datacache/perf_datacache_data_mysql.conf
index ac80b64cc..1884fd3e8 100644
--- a/src/datacache/perf_datacache_data_mysql.conf
+++ b/src/datacache/perf_datacache_data_mysql.conf
@@ -14,3 +14,8 @@ DATABASE = gnunetcheck
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/datacache/perf_datacache_data_postgres.conf b/src/datacache/perf_datacache_data_postgres.conf
index e20fe7749..03a9999fb 100644
--- a/src/datacache/perf_datacache_data_postgres.conf
+++ b/src/datacache/perf_datacache_data_postgres.conf
@@ -10,3 +10,8 @@ CONFIG = dbname=gnunetcheck
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/datacache/perf_datacache_data_sqlite.conf b/src/datacache/perf_datacache_data_sqlite.conf
index 78680f001..4bc4333cc 100644
--- a/src/datacache/perf_datacache_data_sqlite.conf
+++ b/src/datacache/perf_datacache_data_sqlite.conf
@@ -7,3 +7,8 @@ DATABASE = sqlite
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/datacache/test_datacache_data_mysql.conf b/src/datacache/test_datacache_data_mysql.conf
index c8a75576e..68c7bbbcd 100644
--- a/src/datacache/test_datacache_data_mysql.conf
+++ b/src/datacache/test_datacache_data_mysql.conf
@@ -14,3 +14,8 @@ DATABASE = gnunetcheck
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/datacache/test_datacache_data_postgres.conf b/src/datacache/test_datacache_data_postgres.conf
index d230ce9ba..0be4188c1 100644
--- a/src/datacache/test_datacache_data_postgres.conf
+++ b/src/datacache/test_datacache_data_postgres.conf
@@ -10,3 +10,8 @@ CONFIG = dbname=gnunetcheck
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/datacache/test_datacache_data_sqlite.conf b/src/datacache/test_datacache_data_sqlite.conf
index d55d05de4..fc7313af2 100644
--- a/src/datacache/test_datacache_data_sqlite.conf
+++ b/src/datacache/test_datacache_data_sqlite.conf
@@ -7,3 +7,8 @@ DATABASE = sqlite
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/datastore/perf_plugin_datastore_data_mysql.conf b/src/datastore/perf_plugin_datastore_data_mysql.conf
index 30c9617d4..1a2b28500 100644
--- a/src/datastore/perf_plugin_datastore_data_mysql.conf
+++ b/src/datastore/perf_plugin_datastore_data_mysql.conf
@@ -37,3 +37,8 @@ DATABASE = gnunetcheck
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/datastore/perf_plugin_datastore_data_postgres.conf b/src/datastore/perf_plugin_datastore_data_postgres.conf
index 549b7679b..575701661 100644
--- a/src/datastore/perf_plugin_datastore_data_postgres.conf
+++ b/src/datastore/perf_plugin_datastore_data_postgres.conf
@@ -32,3 +32,8 @@ CONFIG = dbname=gnunetcheck
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/datastore/perf_plugin_datastore_data_sqlite.conf b/src/datastore/perf_plugin_datastore_data_sqlite.conf
index 6769df359..bf30818e7 100644
--- a/src/datastore/perf_plugin_datastore_data_sqlite.conf
+++ b/src/datastore/perf_plugin_datastore_data_sqlite.conf
@@ -30,3 +30,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/datastore/test_datastore_api_data_mysql.conf b/src/datastore/test_datastore_api_data_mysql.conf
index 024b7f8ce..ed2b32c62 100644
--- a/src/datastore/test_datastore_api_data_mysql.conf
+++ b/src/datastore/test_datastore_api_data_mysql.conf
@@ -60,3 +60,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/datastore/test_datastore_api_data_postgres.conf b/src/datastore/test_datastore_api_data_postgres.conf
index f9e7bbe0f..40a3a4ab5 100644
--- a/src/datastore/test_datastore_api_data_postgres.conf
+++ b/src/datastore/test_datastore_api_data_postgres.conf
@@ -55,3 +55,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/datastore/test_datastore_api_data_sqlite.conf b/src/datastore/test_datastore_api_data_sqlite.conf
index 58c7b9f23..0a4034d0f 100644
--- a/src/datastore/test_datastore_api_data_sqlite.conf
+++ b/src/datastore/test_datastore_api_data_sqlite.conf
@@ -51,3 +51,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/datastore/test_plugin_datastore_data_mysql.conf b/src/datastore/test_plugin_datastore_data_mysql.conf
index f79daade6..79da79545 100644
--- a/src/datastore/test_plugin_datastore_data_mysql.conf
+++ b/src/datastore/test_plugin_datastore_data_mysql.conf
@@ -37,3 +37,8 @@ DATABASE = gnunetcheck
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/datastore/test_plugin_datastore_data_postgres.conf b/src/datastore/test_plugin_datastore_data_postgres.conf
index d64c4429c..bc1f70986 100644
--- a/src/datastore/test_plugin_datastore_data_postgres.conf
+++ b/src/datastore/test_plugin_datastore_data_postgres.conf
@@ -32,3 +32,8 @@ CONFIG = dbname=gnunetcheck
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/datastore/test_plugin_datastore_data_sqlite.conf b/src/datastore/test_plugin_datastore_data_sqlite.conf
index bc3a1bc12..89cf836ff 100644
--- a/src/datastore/test_plugin_datastore_data_sqlite.conf
+++ b/src/datastore/test_plugin_datastore_data_sqlite.conf
@@ -30,3 +30,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index 6cb219127..c44be3500 100644
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_api_data.conf
@@ -76,3 +76,8 @@ EXTERNAL_ADDRESS = 127.0.0.1
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index e0e1e09eb..fc08be8c4 100644
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.conf
@@ -65,3 +65,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/dht/test_dht_multipeer_data.conf b/src/dht/test_dht_multipeer_data.conf
index 037ec19d9..cd20fdd20 100644
--- a/src/dht/test_dht_multipeer_data.conf
+++ b/src/dht/test_dht_multipeer_data.conf
@@ -110,3 +110,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/dht/test_dht_twopeer_data.conf b/src/dht/test_dht_twopeer_data.conf
index 3f1128847..23ea51a52 100644
--- a/src/dht/test_dht_twopeer_data.conf
+++ b/src/dht/test_dht_twopeer_data.conf
@@ -65,3 +65,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/dht/test_dhtlog_data.conf b/src/dht/test_dhtlog_data.conf
index 3ea98b640..cc3fbf72d 100644
--- a/src/dht/test_dhtlog_data.conf
+++ b/src/dht/test_dhtlog_data.conf
@@ -60,3 +60,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/dv/test_transport_dv_data.conf b/src/dv/test_transport_dv_data.conf
index 25d9c1d8a..1ac9b7b27 100644
--- a/src/dv/test_transport_dv_data.conf
+++ b/src/dv/test_transport_dv_data.conf
@@ -70,3 +70,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/fragmentation/test_fragmentation_data.conf b/src/fragmentation/test_fragmentation_data.conf
index e69de29bb..c236f689c 100644
--- a/src/fragmentation/test_fragmentation_data.conf
+++ b/src/fragmentation/test_fragmentation_data.conf
@@ -0,0 +1,5 @@
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf
index 67ffcde57..27fe736b7 100644
--- a/src/fs/fs_test_lib_data.conf
+++ b/src/fs/fs_test_lib_data.conf
@@ -89,3 +89,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_fs_data.conf b/src/fs/test_fs_data.conf
index ea2d39720..86abb732e 100644
--- a/src/fs/test_fs_data.conf
+++ b/src/fs/test_fs_data.conf
@@ -57,3 +57,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_fs_download_data.conf b/src/fs/test_fs_download_data.conf
index 8ede4662c..7509b5ef0 100644
--- a/src/fs/test_fs_download_data.conf
+++ b/src/fs/test_fs_download_data.conf
@@ -55,3 +55,8 @@ AUTOSTART = NO
 
 [dns]
 AUTOSTART = NO
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_fs_file_information_data.conf b/src/fs/test_fs_file_information_data.conf
index 95a112b23..f0585fe81 100644
--- a/src/fs/test_fs_file_information_data.conf
+++ b/src/fs/test_fs_file_information_data.conf
@@ -55,3 +55,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_fs_list_indexed_data.conf b/src/fs/test_fs_list_indexed_data.conf
index 85f2e930e..4d6ed7e26 100644
--- a/src/fs/test_fs_list_indexed_data.conf
+++ b/src/fs/test_fs_list_indexed_data.conf
@@ -56,3 +56,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_fs_namespace_data.conf b/src/fs/test_fs_namespace_data.conf
index 8a528eae4..50ea0dc20 100644
--- a/src/fs/test_fs_namespace_data.conf
+++ b/src/fs/test_fs_namespace_data.conf
@@ -58,3 +58,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_fs_publish_data.conf b/src/fs/test_fs_publish_data.conf
index a781ef4a9..404111152 100644
--- a/src/fs/test_fs_publish_data.conf
+++ b/src/fs/test_fs_publish_data.conf
@@ -56,3 +56,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_fs_search_data.conf b/src/fs/test_fs_search_data.conf
index 4c61bed19..89086152e 100644
--- a/src/fs/test_fs_search_data.conf
+++ b/src/fs/test_fs_search_data.conf
@@ -55,3 +55,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_fs_unindex_data.conf b/src/fs/test_fs_unindex_data.conf
index 2abc28456..a6cb4735c 100644
--- a/src/fs/test_fs_unindex_data.conf
+++ b/src/fs/test_fs_unindex_data.conf
@@ -55,3 +55,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_fs_uri_data.conf b/src/fs/test_fs_uri_data.conf
index e57c471f3..d86b99d0c 100644
--- a/src/fs/test_fs_uri_data.conf
+++ b/src/fs/test_fs_uri_data.conf
@@ -22,3 +22,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_gnunet_fs_idx_data.conf b/src/fs/test_gnunet_fs_idx_data.conf
index fa2de848b..f34a24c3f 100644
--- a/src/fs/test_gnunet_fs_idx_data.conf
+++ b/src/fs/test_gnunet_fs_idx_data.conf
@@ -57,3 +57,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_gnunet_fs_ns_data.conf b/src/fs/test_gnunet_fs_ns_data.conf
index c644fd50d..102f76c35 100644
--- a/src/fs/test_gnunet_fs_ns_data.conf
+++ b/src/fs/test_gnunet_fs_ns_data.conf
@@ -57,3 +57,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_gnunet_fs_psd_data.conf b/src/fs/test_gnunet_fs_psd_data.conf
index d521c0b9a..6c506b183 100644
--- a/src/fs/test_gnunet_fs_psd_data.conf
+++ b/src/fs/test_gnunet_fs_psd_data.conf
@@ -59,3 +59,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/fs/test_gnunet_fs_rec_data.conf b/src/fs/test_gnunet_fs_rec_data.conf
index 09b3585c1..7d5a98626 100644
--- a/src/fs/test_gnunet_fs_rec_data.conf
+++ b/src/fs/test_gnunet_fs_rec_data.conf
@@ -58,3 +58,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+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 b7e2ef28e..8ed7e2885 100644
--- a/src/fs/test_gnunet_service_fs_migration_data.conf
+++ b/src/fs/test_gnunet_service_fs_migration_data.conf
@@ -79,3 +79,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/hostlist/learning_data.conf b/src/hostlist/learning_data.conf
index cf4b97e13..8a37a8cd9 100644
--- a/src/hostlist/learning_data.conf
+++ b/src/hostlist/learning_data.conf
@@ -27,3 +27,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/hostlist/test_gnunet_daemon_hostlist.conf b/src/hostlist/test_gnunet_daemon_hostlist.conf
index 85f0a522c..fe05b4d65 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist.conf
@@ -56,3 +56,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_data.conf b/src/hostlist/test_gnunet_daemon_hostlist_data.conf
index c0f3d7c6a..507ea0805 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_data.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_data.conf
@@ -68,3 +68,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
index 5d0d297d6..dbc4367dc 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
@@ -73,3 +73,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
index d19c1e033..befce219b 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
@@ -70,3 +70,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/hostlist/test_learning_adv_peer.conf b/src/hostlist/test_learning_adv_peer.conf
index dae2d0edf..f0329d170 100644
--- a/src/hostlist/test_learning_adv_peer.conf
+++ b/src/hostlist/test_learning_adv_peer.conf
@@ -70,3 +70,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/hostlist/test_learning_learn_peer.conf b/src/hostlist/test_learning_learn_peer.conf
index 1f192707b..9f7e5d3da 100644
--- a/src/hostlist/test_learning_learn_peer.conf
+++ b/src/hostlist/test_learning_learn_peer.conf
@@ -70,3 +70,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/hostlist/test_learning_learn_peer2.conf b/src/hostlist/test_learning_learn_peer2.conf
index 8be0b3a4c..4d2f0d485 100644
--- a/src/hostlist/test_learning_learn_peer2.conf
+++ b/src/hostlist/test_learning_learn_peer2.conf
@@ -62,3 +62,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/mesh/test_mesh.conf b/src/mesh/test_mesh.conf
index 85f9affcb..94d464d54 100644
--- a/src/mesh/test_mesh.conf
+++ b/src/mesh/test_mesh.conf
@@ -62,3 +62,8 @@ SERVICEHOME = /tmp/test-mesh/
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/nat/test_nat_data.conf b/src/nat/test_nat_data.conf
index c312c69fb..83bcf8345 100644
--- a/src/nat/test_nat_data.conf
+++ b/src/nat/test_nat_data.conf
@@ -134,3 +134,8 @@ AUTOSTART = NO
 
 [mesh]
 AUTOSTART = NO
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/nat/test_nat_test_data.conf b/src/nat/test_nat_test_data.conf
index c5d9f161e..f153e1779 100644
--- a/src/nat/test_nat_test_data.conf
+++ b/src/nat/test_nat_test_data.conf
@@ -41,3 +41,8 @@ INTERNAL_ADDRESS = 127.0.0.1
 # Disable IPv6 support
 DISABLEV6 = YES
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf
index 8275d9152..5e05cf422 100644
--- a/src/nse/nse_profiler_test.conf
+++ b/src/nse/nse_profiler_test.conf
@@ -76,3 +76,6 @@ ROUND2 = 500
 ROUND3 = 1000
 WAIT_TIME = 800
 
+
+
+
diff --git a/src/nse/test_nse.conf b/src/nse/test_nse.conf
index 1492f1a00..6a87e1bb7 100644
--- a/src/nse/test_nse.conf
+++ b/src/nse/test_nse.conf
@@ -53,3 +53,6 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 MAX_CONCURRENT_SSH = 20
 USE_PROGRESSBARS = YES
 PEERGROUP_TIMEOUT = 1000
+
+
+
diff --git a/src/peerinfo-tool/test_gnunet_peerinfo_data.conf b/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
index ca6108623..86fcf5add 100644
--- a/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
+++ b/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
@@ -24,3 +24,8 @@ PORT = 24357
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/peerinfo/test_peerinfo_api_data.conf b/src/peerinfo/test_peerinfo_api_data.conf
index 1b2efd400..6caa1e46b 100644
--- a/src/peerinfo/test_peerinfo_api_data.conf
+++ b/src/peerinfo/test_peerinfo_api_data.conf
@@ -9,3 +9,8 @@ DEBUG = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/statistics/test_statistics_api_data.conf b/src/statistics/test_statistics_api_data.conf
index 76303e969..9ccb770a3 100644
--- a/src/statistics/test_statistics_api_data.conf
+++ b/src/statistics/test_statistics_api_data.conf
@@ -36,3 +36,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_connect_peer1.conf b/src/testing/test_testing_connect_peer1.conf
index 2c8dfe91f..58c364ace 100644
--- a/src/testing/test_testing_connect_peer1.conf
+++ b/src/testing/test_testing_connect_peer1.conf
@@ -70,3 +70,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_connect_peer2.conf b/src/testing/test_testing_connect_peer2.conf
index 0938cfe29..5f1823d1c 100644
--- a/src/testing/test_testing_connect_peer2.conf
+++ b/src/testing/test_testing_connect_peer2.conf
@@ -70,3 +70,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data.conf b/src/testing/test_testing_data.conf
index a8018585f..0c548c11a 100644
--- a/src/testing/test_testing_data.conf
+++ b/src/testing/test_testing_data.conf
@@ -57,3 +57,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data_remote.conf b/src/testing/test_testing_data_remote.conf
index ce9d57858..ea1c00065 100644
--- a/src/testing/test_testing_data_remote.conf
+++ b/src/testing/test_testing_data_remote.conf
@@ -52,3 +52,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+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 df579e2a9..3725448b7 100644
--- a/src/testing/test_testing_data_topology_2d_torus.conf
+++ b/src/testing/test_testing_data_topology_2d_torus.conf
@@ -52,3 +52,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data_topology_blacklist.conf b/src/testing/test_testing_data_topology_blacklist.conf
index ade33fd5b..c9154afe3 100644
--- a/src/testing/test_testing_data_topology_blacklist.conf
+++ b/src/testing/test_testing_data_topology_blacklist.conf
@@ -65,3 +65,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data_topology_churn.conf b/src/testing/test_testing_data_topology_churn.conf
index ddd76a04d..7aae48750 100644
--- a/src/testing/test_testing_data_topology_churn.conf
+++ b/src/testing/test_testing_data_topology_churn.conf
@@ -60,3 +60,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data_topology_clique.conf b/src/testing/test_testing_data_topology_clique.conf
index 092caf985..3781643eb 100644
--- a/src/testing/test_testing_data_topology_clique.conf
+++ b/src/testing/test_testing_data_topology_clique.conf
@@ -67,3 +67,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+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 842ab29d5..ff3ebc2a4 100644
--- a/src/testing/test_testing_data_topology_clique_dfs.conf
+++ b/src/testing/test_testing_data_topology_clique_dfs.conf
@@ -64,3 +64,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+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 ddf9157ee..410d0afde 100644
--- a/src/testing/test_testing_data_topology_clique_minimum.conf
+++ b/src/testing/test_testing_data_topology_clique_minimum.conf
@@ -64,3 +64,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+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 bc1f7c02d..d3b459e29 100644
--- a/src/testing/test_testing_data_topology_clique_random.conf
+++ b/src/testing/test_testing_data_topology_clique_random.conf
@@ -66,3 +66,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+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 b714fab2b..78eeb6e6e 100644
--- a/src/testing/test_testing_data_topology_erdos_renyi.conf
+++ b/src/testing/test_testing_data_topology_erdos_renyi.conf
@@ -52,3 +52,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data_topology_internat.conf b/src/testing/test_testing_data_topology_internat.conf
index addf1abab..412399bf4 100644
--- a/src/testing/test_testing_data_topology_internat.conf
+++ b/src/testing/test_testing_data_topology_internat.conf
@@ -52,3 +52,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data_topology_none.conf b/src/testing/test_testing_data_topology_none.conf
index a9e97806a..0811c3b12 100644
--- a/src/testing/test_testing_data_topology_none.conf
+++ b/src/testing/test_testing_data_topology_none.conf
@@ -69,3 +69,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data_topology_ring.conf b/src/testing/test_testing_data_topology_ring.conf
index 8ebd4c295..c0632b84a 100644
--- a/src/testing/test_testing_data_topology_ring.conf
+++ b/src/testing/test_testing_data_topology_ring.conf
@@ -52,3 +52,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+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 0212cc773..079872758 100644
--- a/src/testing/test_testing_data_topology_scale_free.conf
+++ b/src/testing/test_testing_data_topology_scale_free.conf
@@ -62,3 +62,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+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 49a6fab78..2d4249da9 100644
--- a/src/testing/test_testing_data_topology_small_world_ring.conf
+++ b/src/testing/test_testing_data_topology_small_world_ring.conf
@@ -52,3 +52,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+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 5580cf961..444abf610 100644
--- a/src/testing/test_testing_data_topology_small_world_torus.conf
+++ b/src/testing/test_testing_data_topology_small_world_torus.conf
@@ -52,3 +52,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_data_topology_stability.conf b/src/testing/test_testing_data_topology_stability.conf
index 44719ddd7..efe5d6879 100644
--- a/src/testing/test_testing_data_topology_stability.conf
+++ b/src/testing/test_testing_data_topology_stability.conf
@@ -66,3 +66,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/testing/test_testing_peergroup_data.conf b/src/testing/test_testing_peergroup_data.conf
index 3fae75a98..3fc828e6c 100644
--- a/src/testing/test_testing_peergroup_data.conf
+++ b/src/testing/test_testing_peergroup_data.conf
@@ -69,3 +69,8 @@ USE_LOCALADDR = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/topology/test_gnunet_daemon_topology_data.conf b/src/topology/test_gnunet_daemon_topology_data.conf
index 1575b2524..2bce10d3d 100644
--- a/src/topology/test_gnunet_daemon_topology_data.conf
+++ b/src/topology/test_gnunet_daemon_topology_data.conf
@@ -57,3 +57,8 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/template_cfg_peer1.conf b/src/transport/template_cfg_peer1.conf
index 4db080cda..36c148f98 100644
--- a/src/transport/template_cfg_peer1.conf
+++ b/src/transport/template_cfg_peer1.conf
@@ -119,3 +119,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/template_cfg_peer2.conf b/src/transport/template_cfg_peer2.conf
index 7589a966e..c862a3556 100644
--- a/src/transport/template_cfg_peer2.conf
+++ b/src/transport/template_cfg_peer2.conf
@@ -119,3 +119,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_plugin_transport_data.conf b/src/transport/test_plugin_transport_data.conf
index 3c3326c96..329749314 100644
--- a/src/transport/test_plugin_transport_data.conf
+++ b/src/transport/test_plugin_transport_data.conf
@@ -34,3 +34,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_plugin_transport_data_http.conf b/src/transport/test_plugin_transport_data_http.conf
index d118a8880..68b526cc8 100644
--- a/src/transport/test_plugin_transport_data_http.conf
+++ b/src/transport/test_plugin_transport_data_http.conf
@@ -61,4 +61,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 [dns]
-AUTOSTART = NO
\ No newline at end of file
+AUTOSTART = NO
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_plugin_transport_data_udp.conf b/src/transport/test_plugin_transport_data_udp.conf
index 629b93e73..173addc7f 100644
--- a/src/transport/test_plugin_transport_data_udp.conf
+++ b/src/transport/test_plugin_transport_data_udp.conf
@@ -33,3 +33,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_quota_compliance_data.conf b/src/transport/test_quota_compliance_data.conf
index 9b0f7e3e1..885138076 100644
--- a/src/transport/test_quota_compliance_data.conf
+++ b/src/transport/test_quota_compliance_data.conf
@@ -34,3 +34,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf
index 85cd22a4f..8d8229857 100644
--- a/src/transport/test_quota_compliance_http_peer1.conf
+++ b/src/transport/test_quota_compliance_http_peer1.conf
@@ -113,3 +113,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf
index ab3773e3d..9b3dc9694 100644
--- a/src/transport/test_quota_compliance_http_peer2.conf
+++ b/src/transport/test_quota_compliance_http_peer2.conf
@@ -114,3 +114,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf
index dc6d6a21a..1e6844462 100644
--- a/src/transport/test_quota_compliance_https_peer1.conf
+++ b/src/transport/test_quota_compliance_https_peer1.conf
@@ -119,3 +119,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf
index 665281841..a27e8ccf9 100644
--- a/src/transport/test_quota_compliance_https_peer2.conf
+++ b/src/transport/test_quota_compliance_https_peer2.conf
@@ -121,3 +121,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf
index a71201fae..c09d11211 100644
--- a/src/transport/test_quota_compliance_tcp_peer1.conf
+++ b/src/transport/test_quota_compliance_tcp_peer1.conf
@@ -120,3 +120,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf
index 8854ca1f7..b79ed1f30 100644
--- a/src/transport/test_quota_compliance_tcp_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_peer2.conf
@@ -122,3 +122,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_quota_compliance_udp_peer1.conf b/src/transport/test_quota_compliance_udp_peer1.conf
index c30c3b3fb..f62cceb2f 100644
--- a/src/transport/test_quota_compliance_udp_peer1.conf
+++ b/src/transport/test_quota_compliance_udp_peer1.conf
@@ -113,3 +113,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_quota_compliance_udp_peer2.conf b/src/transport/test_quota_compliance_udp_peer2.conf
index 88ddd67b2..b06ac66f0 100644
--- a/src/transport/test_quota_compliance_udp_peer2.conf
+++ b/src/transport/test_quota_compliance_udp_peer2.conf
@@ -113,3 +113,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_quota_compliance_unix_peer1.conf b/src/transport/test_quota_compliance_unix_peer1.conf
index 58463bcd9..a85c2643b 100644
--- a/src/transport/test_quota_compliance_unix_peer1.conf
+++ b/src/transport/test_quota_compliance_unix_peer1.conf
@@ -109,3 +109,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_quota_compliance_unix_peer2.conf b/src/transport/test_quota_compliance_unix_peer2.conf
index 4e0262c82..7f84b9087 100644
--- a/src/transport/test_quota_compliance_unix_peer2.conf
+++ b/src/transport/test_quota_compliance_unix_peer2.conf
@@ -107,3 +107,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_data.conf b/src/transport/test_transport_api_data.conf
index 613fd1fdb..a4c253e28 100644
--- a/src/transport/test_transport_api_data.conf
+++ b/src/transport/test_transport_api_data.conf
@@ -107,3 +107,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf
index d9ab3c5e0..9366b4ef4 100644
--- a/src/transport/test_transport_api_http_peer1.conf
+++ b/src/transport/test_transport_api_http_peer1.conf
@@ -115,3 +115,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf
index a4b7b8bf0..b3d21578a 100644
--- a/src/transport/test_transport_api_http_peer2.conf
+++ b/src/transport/test_transport_api_http_peer2.conf
@@ -115,3 +115,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_https_peer1.conf b/src/transport/test_transport_api_https_peer1.conf
index 89baab8d2..719d9dd20 100644
--- a/src/transport/test_transport_api_https_peer1.conf
+++ b/src/transport/test_transport_api_https_peer1.conf
@@ -119,3 +119,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf
index e510b20f4..82206003a 100644
--- a/src/transport/test_transport_api_https_peer2.conf
+++ b/src/transport/test_transport_api_https_peer2.conf
@@ -121,3 +121,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf
index 0c101cbce..a3e315001 100644
--- a/src/transport/test_transport_api_multi_peer1.conf
+++ b/src/transport/test_transport_api_multi_peer1.conf
@@ -145,3 +145,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf
index fcfc1db03..222f165f0 100644
--- a/src/transport/test_transport_api_multi_peer2.conf
+++ b/src/transport/test_transport_api_multi_peer2.conf
@@ -147,3 +147,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_multiaddress_tcp_peer1.conf b/src/transport/test_transport_api_multiaddress_tcp_peer1.conf
index 987fc019b..2172a5e01 100644
--- a/src/transport/test_transport_api_multiaddress_tcp_peer1.conf
+++ b/src/transport/test_transport_api_multiaddress_tcp_peer1.conf
@@ -16,3 +16,8 @@ DEBUG = NO
 #PREFIX = valgrind --leak-check=full
 
 @INLINE@ template_cfg_peer1.conf
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_multiaddress_tcp_peer2.conf b/src/transport/test_transport_api_multiaddress_tcp_peer2.conf
index 170cde65a..f166790a8 100644
--- a/src/transport/test_transport_api_multiaddress_tcp_peer2.conf
+++ b/src/transport/test_transport_api_multiaddress_tcp_peer2.conf
@@ -16,3 +16,8 @@ DEBUG = NO
 #PREFIX = valgrind --leak-check=full
 
 @INLINE@ template_cfg_peer2.conf
+
+[nse]
+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 9c66918cf..b497f585d 100644
--- a/src/transport/test_transport_api_rel_http_peer1.conf
+++ b/src/transport/test_transport_api_rel_http_peer1.conf
@@ -116,3 +116,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+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 ffcb68105..192d9d8ae 100644
--- a/src/transport/test_transport_api_rel_http_peer2.conf
+++ b/src/transport/test_transport_api_rel_http_peer2.conf
@@ -117,3 +117,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+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 d3298bdc7..c54c3a784 100644
--- a/src/transport/test_transport_api_rel_https_peer1.conf
+++ b/src/transport/test_transport_api_rel_https_peer1.conf
@@ -117,3 +117,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+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 713422a4b..8ab1cfcf4 100644
--- a/src/transport/test_transport_api_rel_https_peer2.conf
+++ b/src/transport/test_transport_api_rel_https_peer2.conf
@@ -120,3 +120,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+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 0162fdd21..935d96780 100644
--- a/src/transport/test_transport_api_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer1.conf
@@ -118,3 +118,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+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 a157effe8..3040a0f8f 100644
--- a/src/transport/test_transport_api_tcp_nat_peer2.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer2.conf
@@ -119,3 +119,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf
index 4db080cda..36c148f98 100644
--- a/src/transport/test_transport_api_tcp_peer1.conf
+++ b/src/transport/test_transport_api_tcp_peer1.conf
@@ -119,3 +119,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf
index 7589a966e..c862a3556 100644
--- a/src/transport/test_transport_api_tcp_peer2.conf
+++ b/src/transport/test_transport_api_tcp_peer2.conf
@@ -119,3 +119,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+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 12e1bafb5..36a6056e9 100644
--- a/src/transport/test_transport_api_udp_nat_peer1.conf
+++ b/src/transport/test_transport_api_udp_nat_peer1.conf
@@ -116,3 +116,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+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 3d2063854..a5ef89ae5 100644
--- a/src/transport/test_transport_api_udp_nat_peer2.conf
+++ b/src/transport/test_transport_api_udp_nat_peer2.conf
@@ -116,3 +116,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf
index 7c6d8c4a1..d6dc381b5 100644
--- a/src/transport/test_transport_api_udp_peer1.conf
+++ b/src/transport/test_transport_api_udp_peer1.conf
@@ -117,3 +117,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf
index e267b100c..c4dfde28c 100644
--- a/src/transport/test_transport_api_udp_peer2.conf
+++ b/src/transport/test_transport_api_udp_peer2.conf
@@ -113,3 +113,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_unix_peer1.conf b/src/transport/test_transport_api_unix_peer1.conf
index b896bafa5..f98e3b290 100644
--- a/src/transport/test_transport_api_unix_peer1.conf
+++ b/src/transport/test_transport_api_unix_peer1.conf
@@ -110,3 +110,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_unix_peer2.conf b/src/transport/test_transport_api_unix_peer2.conf
index fd5f5fa47..3714981b9 100644
--- a/src/transport/test_transport_api_unix_peer2.conf
+++ b/src/transport/test_transport_api_unix_peer2.conf
@@ -109,3 +109,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf
index 97b859792..2bcaa6cd8 100644
--- a/src/transport/test_transport_api_wlan_peer1.conf
+++ b/src/transport/test_transport_api_wlan_peer1.conf
@@ -114,3 +114,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_api_wlan_peer2.conf b/src/transport/test_transport_api_wlan_peer2.conf
index 85f5f70d5..3230f898c 100644
--- a/src/transport/test_transport_api_wlan_peer2.conf
+++ b/src/transport/test_transport_api_wlan_peer2.conf
@@ -113,3 +113,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_ats_1addr.conf b/src/transport/test_transport_ats_1addr.conf
index c60a73a94..480ccf0f3 100644
--- a/src/transport/test_transport_ats_1addr.conf
+++ b/src/transport/test_transport_ats_1addr.conf
@@ -74,3 +74,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_ats_2addr.conf b/src/transport/test_transport_ats_2addr.conf
index 91478ff43..264a6b566 100644
--- a/src/transport/test_transport_ats_2addr.conf
+++ b/src/transport/test_transport_ats_2addr.conf
@@ -75,3 +75,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/transport/test_transport_ats_4addr.conf b/src/transport/test_transport_ats_4addr.conf
index d7301124a..d71ad2b14 100644
--- a/src/transport/test_transport_ats_4addr.conf
+++ b/src/transport/test_transport_ats_4addr.conf
@@ -79,3 +79,8 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/util/test_configuration_data.conf b/src/util/test_configuration_data.conf
index e44df6c48..5fb0818a3 100644
--- a/src/util/test_configuration_data.conf
+++ b/src/util/test_configuration_data.conf
@@ -33,3 +33,8 @@ WEAKRANDOM = YES
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/util/test_program_data.conf b/src/util/test_program_data.conf
index 42e49f3fb..4af68f07e 100644
--- a/src/util/test_program_data.conf
+++ b/src/util/test_program_data.conf
@@ -3,3 +3,8 @@
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/util/test_pseudonym_data.conf b/src/util/test_pseudonym_data.conf
index 8188eb7b6..87ac6b908 100644
--- a/src/util/test_pseudonym_data.conf
+++ b/src/util/test_pseudonym_data.conf
@@ -11,3 +11,8 @@ WEAKRANDOM = YES
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/util/test_resolver_api_data.conf b/src/util/test_resolver_api_data.conf
index f776c0bcd..ae92dc38b 100644
--- a/src/util/test_resolver_api_data.conf
+++ b/src/util/test_resolver_api_data.conf
@@ -10,3 +10,8 @@ DEBUG = YES
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/util/test_service_data.conf b/src/util/test_service_data.conf
index b426f7e2e..4424a7bff 100644
--- a/src/util/test_service_data.conf
+++ b/src/util/test_service_data.conf
@@ -30,3 +30,8 @@ HOSTNAME=localhost
 AUTOSTART = NO
 
 
+
+[nse]
+AUTOSTART = NO
+
+
diff --git a/src/vpn/test-conf.conf b/src/vpn/test-conf.conf
index bd3bf68d5..39446b53c 100644
--- a/src/vpn/test-conf.conf
+++ b/src/vpn/test-conf.conf
@@ -268,3 +268,8 @@ PLUGINS = fs dns
 
 
 
+
+[nse]
+AUTOSTART = NO
+
+