more work towards XDG spec (#3000) -- config file location

217 files changed, 305 insertions, 283 deletions

diff --git a/src/arm/test_arm_api_data.conf b/src/arm/test_arm_api_data.conf
index 1f1ac282f..d8354477e 100644
--- a/src/arm/test_arm_api_data.conf
+++ b/src/arm/test_arm_api_data.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-arm/
+GNUNET_TEST_HOME = /tmp/test-gnunetd-arm/
 
 [arm]
 PORT = 23354
diff --git a/src/ats/test_ats_api.conf b/src/ats/test_ats_api.conf
index 8a1b6a14f..9a0fa1e93 100644
--- a/src/ats/test_ats_api.conf
+++ b/src/ats/test_ats_api.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-ats-api-scheduling/
+GNUNET_TEST_HOME = /tmp/test-ats-api-scheduling/
 
 [arm]
 PORT = 12001
diff --git a/src/ats/test_ats_mlp.conf b/src/ats/test_ats_mlp.conf
index 05e444f09..d6c1541c8 100644
--- a/src/ats/test_ats_mlp.conf
+++ b/src/ats/test_ats_mlp.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-ats-api-scheduling/
+GNUNET_TEST_HOME = /tmp/test-ats-api-scheduling/
 
 [arm]
 PORT = 12001
diff --git a/src/core/test_core_api_peer1.conf b/src/core/test_core_api_peer1.conf
index 0c494c8ad..d461f9460 100644
--- a/src/core/test_core_api_peer1.conf
+++ b/src/core/test_core_api_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_core_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-peer-1/
+GNUNET_TEST_HOME = /tmp/test-gnunet-core-peer-1/
 
 [arm]
 PORT = 12460
diff --git a/src/core/test_core_api_peer2.conf b/src/core/test_core_api_peer2.conf
index a72989b4b..436846f5c 100644
--- a/src/core/test_core_api_peer2.conf
+++ b/src/core/test_core_api_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_core_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-peer-2/
+GNUNET_TEST_HOME = /tmp/test-gnunet-core-peer-2/
 
 [arm]
 PORT = 22460
diff --git a/src/core/test_core_api_send_to_self.conf b/src/core/test_core_api_send_to_self.conf
index 8df557226..971d68cd0 100644
--- a/src/core/test_core_api_send_to_self.conf
+++ b/src/core/test_core_api_send_to_self.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_core_defaults.conf
 [PATHS]
-SERVICEHOME = ~/.gnunet/
+GNUNET_TEST_HOME = ~/.gnunet/
 
 [arm]
 PORT = 2425 
diff --git a/src/core/test_core_defaults.conf b/src/core/test_core_defaults.conf
index df08d9619..b690ba151 100644
--- a/src/core/test_core_defaults.conf
+++ b/src/core/test_core_defaults.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-core/
+GNUNET_TEST_HOME = /tmp/test-gnunet-core/
 
 [arm]
 DEFAULTSERVICES = 
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 f5fc63579..ba0257d34 100644
--- a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
+++ b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_core_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/
+GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/
 
 [transport-tcp]
 PORT = 12488
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 95a2e6c4e..9f4527a2f 100644
--- a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
+++ b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_core_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/
+GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/
 
 
 [arm]
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 0ed10b706..268b8fc00 100644
--- a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
+++ b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_core_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-1/
+GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-1/
 
 [transport-tcp]
 PORT = 12488
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 119e6688a..721f5c268 100644
--- a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
+++ b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_core_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-2/
+GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-2/
 
 [arm]
 PORT = 22486
diff --git a/src/core/test_core_quota_peer1.conf b/src/core/test_core_quota_peer1.conf
index d8ae5189a..c62b4607c 100644
--- a/src/core/test_core_quota_peer1.conf
+++ b/src/core/test_core_quota_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_core_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-quota-sym-peer-1/
+GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-sym-peer-1/
 
 [transport-tcp]
 PORT = 12468
diff --git a/src/core/test_core_quota_peer2.conf b/src/core/test_core_quota_peer2.conf
index cf1870f88..452eef63e 100644
--- a/src/core/test_core_quota_peer2.conf
+++ b/src/core/test_core_quota_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_core_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-quota-sym-peer-2/
+GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-sym-peer-2/
 
 [arm]
 PORT = 22476
diff --git a/src/datastore/perf_plugin_datastore_data_heap.conf b/src/datastore/perf_plugin_datastore_data_heap.conf
index 7ee215c0a..6f9c701ba 100644
--- a/src/datastore/perf_plugin_datastore_data_heap.conf
+++ b/src/datastore/perf_plugin_datastore_data_heap.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/perf-gnunet-datastore-heap/
+GNUNET_TEST_HOME = /tmp/perf-gnunet-datastore-heap/
 
 
 [datastore]
diff --git a/src/datastore/perf_plugin_datastore_data_mysql.conf b/src/datastore/perf_plugin_datastore_data_mysql.conf
index 006b146af..9d7330462 100644
--- a/src/datastore/perf_plugin_datastore_data_mysql.conf
+++ b/src/datastore/perf_plugin_datastore_data_mysql.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/perf-gnunet-datastore-mysql/
+GNUNET_TEST_HOME = /tmp/perf-gnunet-datastore-mysql/
 
 [datastore]
 DATABASE = mysql
diff --git a/src/datastore/perf_plugin_datastore_data_postgres.conf b/src/datastore/perf_plugin_datastore_data_postgres.conf
index 052fa486e..ee7c180dc 100644
--- a/src/datastore/perf_plugin_datastore_data_postgres.conf
+++ b/src/datastore/perf_plugin_datastore_data_postgres.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/perf-gnunet-datastore-postgres/
+GNUNET_TEST_HOME = /tmp/perf-gnunet-datastore-postgres/
 
 [datastore]
 DATABASE = postgres
diff --git a/src/datastore/perf_plugin_datastore_data_sqlite.conf b/src/datastore/perf_plugin_datastore_data_sqlite.conf
index 5f97597d6..756b44c5c 100644
--- a/src/datastore/perf_plugin_datastore_data_sqlite.conf
+++ b/src/datastore/perf_plugin_datastore_data_sqlite.conf
@@ -1,4 +1,4 @@
 @INLINE@ test_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/perf-gnunet-datastore-sqlite/
+GNUNET_TEST_HOME = /tmp/perf-gnunet-datastore-sqlite/
 
diff --git a/src/datastore/test_datastore_api_data_heap.conf b/src/datastore/test_datastore_api_data_heap.conf
index 0e6994d5b..db571c12a 100644
--- a/src/datastore/test_datastore_api_data_heap.conf
+++ b/src/datastore/test_datastore_api_data_heap.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-datastore-heap/
+GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-heap/
 
 [TESTING]
 WEAKRANDOM = YES
diff --git a/src/datastore/test_datastore_api_data_mysql.conf b/src/datastore/test_datastore_api_data_mysql.conf
index 92967b976..38b9058f6 100644
--- a/src/datastore/test_datastore_api_data_mysql.conf
+++ b/src/datastore/test_datastore_api_data_mysql.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-datastore-mysql/
+GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-mysql/
 
 [TESTING]
 WEAKRANDOM = YES
diff --git a/src/datastore/test_datastore_api_data_postgres.conf b/src/datastore/test_datastore_api_data_postgres.conf
index a1a21689b..dbce6e4d0 100644
--- a/src/datastore/test_datastore_api_data_postgres.conf
+++ b/src/datastore/test_datastore_api_data_postgres.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-datastore-postgres/
+GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-postgres/
 
 [TESTING]
 WEAKRANDOM = YES
diff --git a/src/datastore/test_datastore_api_data_sqlite.conf b/src/datastore/test_datastore_api_data_sqlite.conf
index 953aef248..3104ed7df 100644
--- a/src/datastore/test_datastore_api_data_sqlite.conf
+++ b/src/datastore/test_datastore_api_data_sqlite.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-datastore-sqlite/
+GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-sqlite/
 
 [TESTING]
 WEAKRANDOM = YES
diff --git a/src/datastore/test_plugin_datastore_data_heap.conf b/src/datastore/test_plugin_datastore_data_heap.conf
index 6e352b95b..c91bff764 100644
--- a/src/datastore/test_plugin_datastore_data_heap.conf
+++ b/src/datastore/test_plugin_datastore_data_heap.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-datastore-plugin-heap/
+GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-plugin-heap/
 
 [datastore]
 DATABASE = heap
diff --git a/src/datastore/test_plugin_datastore_data_mysql.conf b/src/datastore/test_plugin_datastore_data_mysql.conf
index 845454b12..53a188997 100644
--- a/src/datastore/test_plugin_datastore_data_mysql.conf
+++ b/src/datastore/test_plugin_datastore_data_mysql.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-datastore-plugin-mysql/
+GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-plugin-mysql/
 
 [datastore]
 DATABASE = mysql
diff --git a/src/datastore/test_plugin_datastore_data_postgres.conf b/src/datastore/test_plugin_datastore_data_postgres.conf
index 8b8523d40..bebc97e85 100644
--- a/src/datastore/test_plugin_datastore_data_postgres.conf
+++ b/src/datastore/test_plugin_datastore_data_postgres.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-datastore-plugin-postgres/
+GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-plugin-postgres/
 
 [datastore]
 DATABASE = postgres
diff --git a/src/datastore/test_plugin_datastore_data_sqlite.conf b/src/datastore/test_plugin_datastore_data_sqlite.conf
index dcdea7dde..9680dff8e 100644
--- a/src/datastore/test_plugin_datastore_data_sqlite.conf
+++ b/src/datastore/test_plugin_datastore_data_sqlite.conf
@@ -1,4 +1,4 @@
 @INLINE@ test_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-datastore-plugin-sqlite/
+GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-plugin-sqlite/
 
diff --git a/src/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf
index 63a80c542..aaa46319c 100644
--- a/src/dht/test_dht_2dtorus.conf
+++ b/src/dht/test_dht_2dtorus.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test_dht_2dtorus/
+GNUNET_TEST_HOME = /tmp/test_dht_2dtorus/
 
 [arm]
 DEFAULTSERVICES = core dht
diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index 8529dce1e..30bf3534b 100644
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_api_data.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-dht-api/
+GNUNET_TEST_HOME = /tmp/test-dht-api/
 
 [fs]
 AUTOSTART = NO
diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index 8f2aa9f6e..43eac0956 100644
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.conf
@@ -40,7 +40,7 @@ PORT = 12368
 BINDTO = 127.0.0.1
 
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-dht-peer-1/
+GNUNET_TEST_HOME = /tmp/test-gnunetd-dht-peer-1/
 
 [nat]
 DISABLEV6 = YES
diff --git a/src/dht/test_dht_line.conf b/src/dht/test_dht_line.conf
index 1e2aa702d..f8646ca2b 100644
--- a/src/dht/test_dht_line.conf
+++ b/src/dht/test_dht_line.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test_dht_line/
+GNUNET_TEST_HOME = /tmp/test_dht_line/
 [dhtcache]
 QUOTA = 1 MB
 DATABASE = heap
diff --git a/src/dht/test_dht_monitor.conf b/src/dht/test_dht_monitor.conf
index 2b8ef5bde..7ba9f8381 100644
--- a/src/dht/test_dht_monitor.conf
+++ b/src/dht/test_dht_monitor.conf
@@ -22,7 +22,7 @@ DEFAULTSERVICES = dht core
 OVERLAY_TOPOLOGY = LINE
 
 [PATHS]
-SERVICEHOME = /tmp/test-dht-monitor/
+GNUNET_TEST_HOME = /tmp/test-dht-monitor/
 
 [nat]
 DISABLEV6 = YES
diff --git a/src/dht/test_dht_multipeer.conf b/src/dht/test_dht_multipeer.conf
index 1d8389a9e..f8abaec23 100644
--- a/src/dht/test_dht_multipeer.conf
+++ b/src/dht/test_dht_multipeer.conf
@@ -26,10 +26,10 @@ OVERLAY_TOPOLOGY = FROM_FILE
 OVERLAY_TOPOLOGY_FILE = test_dht_multipeer_topology.dat
 
 [gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-dht-multipeer/
+GNUNET_TEST_HOME = /tmp/test-dht-multipeer/
 
 [nat]
 DISABLEV6 = YES
diff --git a/src/dv/template_dv.conf b/src/dv/template_dv.conf
index 69f5ca4f2..723e4a1cf 100644
--- a/src/dv/template_dv.conf
+++ b/src/dv/template_dv.conf
@@ -34,7 +34,7 @@ OF84RAOAU2B1SOSEHJH6350MA0F7C98U55RI76LGIQOM7O33TFHPNUFB47CDBSCOLIINMVJ2U82445AB
 [transport-blacklist-93ARIS6Q347RPU9EFPS9LA00VPHQLG3RBLKEKTHV4D6UVGEAC75KIIBFB5U9KK9P9P1RU1CBPV4BSSDUTB2AL2N2LG9KSO9APQNLS0O]
 
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-dv-testing/
+GNUNET_TEST_HOME = /tmp/test-gnunet-dv-testing/
 
 [peerinfo]
 USE_INCLUDED_HELLOS = NO
diff --git a/src/experimentation/test_experimentation_clique.conf b/src/experimentation/test_experimentation_clique.conf
index bc6a34dcc..646753ef6 100644
--- a/src/experimentation/test_experimentation_clique.conf
+++ b/src/experimentation/test_experimentation_clique.conf
@@ -54,7 +54,7 @@ TIMEOUT = 300 s
 PORT = 12368
 
 [PATHS]
-SERVICEHOME = /tmp/test-experimentation/
+GNUNET_TEST_HOME = /tmp/test-experimentation/
 
 [dns]
 AUTOSTART = NO
diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf
index 89b89aa76..155c38269 100644
--- a/src/fs/fs_test_lib_data.conf
+++ b/src/fs/fs_test_lib_data.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_fs_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/gnunet-fs-test-lib/
+GNUNET_TEST_HOME = /tmp/gnunet-fs-test-lib/
 
 [ats]
 WAN_QUOTA_IN = 3932160
diff --git a/src/fs/perf_gnunet_service_fs_p2p.conf b/src/fs/perf_gnunet_service_fs_p2p.conf
index c9e472eee..7c93eee42 100644
--- a/src/fs/perf_gnunet_service_fs_p2p.conf
+++ b/src/fs/perf_gnunet_service_fs_p2p.conf
@@ -1,6 +1,6 @@
 @INLINE@ fs_test_lib_data.conf
 [PATHS]
-SERVICEHOME = /tmp/gnunet-fs-test-lib/
+GNUNET_TEST_HOME = /tmp/gnunet-fs-test-lib/
 
 [fs]
 GAUGER_HEAP = "2-peer 10 MB P2P download"
diff --git a/src/fs/test_fs_data.conf b/src/fs/test_fs_data.conf
index 40e85ad4c..a9e5e779c 100644
--- a/src/fs/test_fs_data.conf
+++ b/src/fs/test_fs_data.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_fs_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-data/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-data/
 
 [fs]
 ACTIVEMIGRATION = NO
diff --git a/src/fs/test_fs_defaults.conf b/src/fs/test_fs_defaults.conf
index 0f26895b6..2e980daab 100644
--- a/src/fs/test_fs_defaults.conf
+++ b/src/fs/test_fs_defaults.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-lib/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-lib/
 
 [resolver]
 PORT = 4364
diff --git a/src/fs/test_fs_download_data.conf b/src/fs/test_fs_download_data.conf
index 694926afc..cb0f8ede1 100644
--- a/src/fs/test_fs_download_data.conf
+++ b/src/fs/test_fs_download_data.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_fs_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-download/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-download/
 
 [download-test]
 # set to 'YES' to test non-anonymous download
diff --git a/src/fs/test_fs_download_indexed.conf b/src/fs/test_fs_download_indexed.conf
index 61954c137..153cb17b2 100644
--- a/src/fs/test_fs_download_indexed.conf
+++ b/src/fs/test_fs_download_indexed.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_fs_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-download/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-download/
 
 [download-test]
 # set to 'YES' to test non-anonymous download
diff --git a/src/fs/test_fs_download_mesh.conf b/src/fs/test_fs_download_mesh.conf
index 3ee0b4152..da61f5ce9 100644
--- a/src/fs/test_fs_download_mesh.conf
+++ b/src/fs/test_fs_download_mesh.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_fs_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-download/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-download/
 
 [download-test]
 # set to 'YES' to test non-anonymous download
diff --git a/src/fs/test_fs_file_information_data.conf b/src/fs/test_fs_file_information_data.conf
index ea43807b1..e053116c5 100644
--- a/src/fs/test_fs_file_information_data.conf
+++ b/src/fs/test_fs_file_information_data.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_fs_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-file-information/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-file-information/
 
 [transport]
 PLUGINS = 
diff --git a/src/fs/test_fs_list_indexed_data.conf b/src/fs/test_fs_list_indexed_data.conf
index 99d446680..c6e6af8f0 100644
--- a/src/fs/test_fs_list_indexed_data.conf
+++ b/src/fs/test_fs_list_indexed_data.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_fs_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-list-indexed/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-list-indexed/
 
 [transport]
 PLUGINS = 
diff --git a/src/fs/test_fs_namespace_data.conf b/src/fs/test_fs_namespace_data.conf
index 625eb2d51..0e6c3c947 100644
--- a/src/fs/test_fs_namespace_data.conf
+++ b/src/fs/test_fs_namespace_data.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_fs_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-namespace/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-namespace/
 
 [transport]
 PLUGINS = 
diff --git a/src/fs/test_fs_publish_data.conf b/src/fs/test_fs_publish_data.conf
index 14e69197b..2c87ea43e 100644
--- a/src/fs/test_fs_publish_data.conf
+++ b/src/fs/test_fs_publish_data.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_fs_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-publish/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-publish/
 
 [transport]
 PLUGINS = 
diff --git a/src/fs/test_fs_search_data.conf b/src/fs/test_fs_search_data.conf
index 812a7bfe2..88424189e 100644
--- a/src/fs/test_fs_search_data.conf
+++ b/src/fs/test_fs_search_data.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_fs_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-search/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-search/
 
 [transport]
 PLUGINS = 
diff --git a/src/fs/test_fs_unindex_data.conf b/src/fs/test_fs_unindex_data.conf
index fa28fbbbd..0bcc89df8 100644
--- a/src/fs/test_fs_unindex_data.conf
+++ b/src/fs/test_fs_unindex_data.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_fs_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-unindex/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-unindex/
 
 [transport]
 PLUGINS = 
diff --git a/src/fs/test_fs_uri_data.conf b/src/fs/test_fs_uri_data.conf
index abc5a73e9..5355fbc85 100644
--- a/src/fs/test_fs_uri_data.conf
+++ b/src/fs/test_fs_uri_data.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_fs_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-uri/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-uri/
 
 [arm]
 DEFAULTSERVICES = topology hostlist
diff --git a/src/fs/test_gnunet_fs_idx_data.conf b/src/fs/test_gnunet_fs_idx_data.conf
index 4394805e5..2038fd500 100644
--- a/src/fs/test_gnunet_fs_idx_data.conf
+++ b/src/fs/test_gnunet_fs_idx_data.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_fs_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-py-idx/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-py-idx/
 
 [transport]
 PLUGINS = 
diff --git a/src/fs/test_gnunet_fs_psd_data.conf b/src/fs/test_gnunet_fs_psd_data.conf
index e41f6bfe3..84e498603 100644
--- a/src/fs/test_gnunet_fs_psd_data.conf
+++ b/src/fs/test_gnunet_fs_psd_data.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_fs_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-py-psd/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-py-psd/
 
 [transport]
 PLUGINS = 
diff --git a/src/fs/test_gnunet_fs_rec_data.conf b/src/fs/test_gnunet_fs_rec_data.conf
index fcdcda96d..10af5cefd 100644
--- a/src/fs/test_gnunet_fs_rec_data.conf
+++ b/src/fs/test_gnunet_fs_rec_data.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_fs_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-py-rec/
+GNUNET_TEST_HOME = /tmp/gnunet-test-fs-py-rec/
 
 [transport]
 PLUGINS = 
diff --git a/src/fs/test_gnunet_service_fs_migration_data.conf b/src/fs/test_gnunet_service_fs_migration_data.conf
index 3d740e49a..b231c0d3e 100644
--- a/src/fs/test_gnunet_service_fs_migration_data.conf
+++ b/src/fs/test_gnunet_service_fs_migration_data.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_fs_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-service-fs-migration/
+GNUNET_TEST_HOME = /tmp/test-gnunet-service-fs-migration/
 
 [testbed]
 OVERLAY_TOPOLOGY = CLIQUE
diff --git a/src/gns/test_gns_defaults.conf b/src/gns/test_gns_defaults.conf
index 2652b98a3..769952cc8 100644
--- a/src/gns/test_gns_defaults.conf
+++ b/src/gns/test_gns_defaults.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-gns-testing/
+GNUNET_TEST_HOME = /tmp/test-gnunet-gns-testing/
 
 [dhtcache]
 DATABASE = heap
diff --git a/src/gns/test_gns_lookup.conf b/src/gns/test_gns_lookup.conf
index 94042a5e9..5d77e157a 100644
--- a/src/gns/test_gns_lookup.conf
+++ b/src/gns/test_gns_lookup.conf
@@ -9,7 +9,7 @@ PLUGINS =
 DEFAULTSERVICES = 
 
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-gns-peer-1/
+GNUNET_TEST_HOME = /tmp/test-gnunet-gns-peer-1/
 
 [gns]
 #PREFIX = valgrind --leak-check=full --track-origins=yes 
diff --git a/src/gns/test_gns_proxy.conf b/src/gns/test_gns_proxy.conf
index b098edb60..547e5580b 100644
--- a/src/gns/test_gns_proxy.conf
+++ b/src/gns/test_gns_proxy.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-gns-proxy/
+GNUNET_TEST_HOME = /tmp/gnunet-test-gns-proxy/
 
 [transport]
 PLUGINS = tcp
@@ -15,7 +15,7 @@ HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 
 [gns]
 AUTOSTART = YES
-ZONEKEY = $SERVICEHOME/.hostkey
+ZONEKEY = $GNUNET_TEST_HOME/.hostkey
 HIJACK_DNS = YES
 
 [gns-proxy]
diff --git a/src/gns/test_gns_simple_lookup.conf b/src/gns/test_gns_simple_lookup.conf
index c7f9f7132..5830c427b 100644
--- a/src/gns/test_gns_simple_lookup.conf
+++ b/src/gns/test_gns_simple_lookup.conf
@@ -42,7 +42,7 @@ PORT = 12368
 BINDTO = 127.0.0.1
 
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-gns-peer-1/
+GNUNET_TEST_HOME = /tmp/test-gnunetd-gns-peer-1/
 
 
 [nat]
@@ -67,7 +67,7 @@ PRIVATE_ZONE = private
 PRIVATE_ZONEKEY = zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey
 SHORTEN_ZONE = short
 SHORTEN_ZONEKEY = zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey
-#ZONEKEY =  $SERVICEHOME/gns/zonekey.zkey
+#ZONEKEY =  $GNUNET_TEST_HOME/gns/zonekey.zkey
 HIJACK_DNS = NO
 UNIXPATH = /tmp/gnunet-service-gns.sock
 AUTO_IMPORT_PKEY = YES
@@ -92,7 +92,7 @@ BINARY = gnunet-service-namestore
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 DATABASE = sqlite
-ZONEFILE_DIRECTORY = $SERVICEHOME
+ZONEFILE_DIRECTORY = $GNUNET_TEST_HOME
 
 [namestore-sqlite]
-FILENAME = $SERVICEHOME/sqlite-default.db
+FILENAME = $GNUNET_TEST_HOME/sqlite-default.db
diff --git a/src/hostlist/hostlist.conf b/src/hostlist/hostlist.conf
index 40e7c7f7e..3c1bfa563 100644
--- a/src/hostlist/hostlist.conf
+++ b/src/hostlist/hostlist.conf
@@ -1,14 +1,14 @@
 [hostlist]
 # port for hostlist http server
 HTTPPORT = 8080
-HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
+HOSTLISTFILE = $GNUNET_CONFIG_HOME/hostlist/learned.txt
 BINARY = gnunet-daemon-hostlist
 # consider having "-e" as default as well once implemented
 OPTIONS = -b
 SERVERS = http://v10.gnunet.org/hostlist
 # http://ioerror.gnunet.org:65535/
 # proxy for downloading hostlists
-HTTP-PROXY = 
+HTTP-PROXY =
 # bind hostlist http server to a specific IPv4 or IPv6
 # BINDTOIP =
 
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
index 0a345f6bf..377ba4a41 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_hostlist_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/
+GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-1/
 
 [transport-tcp]
 PORT = 12968
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
index c3833381a..547a9e2ff 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_hostlist_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/
+GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-2/
 
 [transport-tcp]
 PORT = 22968
diff --git a/src/hostlist/test_hostlist_defaults.conf b/src/hostlist/test_hostlist_defaults.conf
index a11097b8c..93308b4bd 100644
--- a/src/hostlist/test_hostlist_defaults.conf
+++ b/src/hostlist/test_hostlist_defaults.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-hostlist/
+GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist/
 
 [resolver]
 PORT = 12464
diff --git a/src/hostlist/test_learning_adv_peer.conf b/src/hostlist/test_learning_adv_peer.conf
index b08660a33..f65ba0ae5 100644
--- a/src/hostlist/test_learning_adv_peer.conf
+++ b/src/hostlist/test_learning_adv_peer.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_hostlist_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/
+GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-1/
 
 [transport-tcp]
 PORT = 22968
diff --git a/src/hostlist/test_learning_learn_peer.conf b/src/hostlist/test_learning_learn_peer.conf
index 95de70530..db1a397f3 100644
--- a/src/hostlist/test_learning_learn_peer.conf
+++ b/src/hostlist/test_learning_learn_peer.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_hostlist_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/
+GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-2/
 
 [transport-tcp]
 PORT = 12968
diff --git a/src/hostlist/test_learning_learn_peer2.conf b/src/hostlist/test_learning_learn_peer2.conf
index f70fbda5f..57cca3343 100644
--- a/src/hostlist/test_learning_learn_peer2.conf
+++ b/src/hostlist/test_learning_learn_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_hostlist_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-hostlist-peer-3/
+GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-3/
 
 [transport-tcp]
 PORT = 32968
diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf
index 40653542e..08b08762d 100644
--- a/src/integration-tests/confs/c_bootstrap_server.conf
+++ b/src/integration-tests/confs/c_bootstrap_server.conf
@@ -2,7 +2,7 @@
 
 
 [PATHS]
-SERVICEHOME = /tmp/c_bootstrap_server/
+GNUNET_TEST_HOME = /tmp/c_bootstrap_server/
 
 [PEER]
 PRIVATE_KEY = hostkeys/c_bootstrap_server
diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf
index cee8b98cc..5f42f22e1 100644
--- a/src/integration-tests/confs/c_nat_client.conf
+++ b/src/integration-tests/confs/c_nat_client.conf
@@ -50,7 +50,7 @@ UNIXPATH = /tmp/test-service-peerinfo-52
 PORT = 20067
 
 [PATHS]
-SERVICEHOME = /tmp/c_nat_client
+GNUNET_TEST_HOME = /tmp/c_nat_client
 
 [PEER]
 PRIVATE_KEY = hostkeys/c_nat_client
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
index f254bcdd8..87daeb41d 100644
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -1,7 +1,7 @@
 @INLINE@ confs/test_defaults.conf
 
 [PATHS]
-SERVICEHOME = /tmp/c_no_nat_client/
+GNUNET_TEST_HOME = /tmp/c_no_nat_client/
 
 [PEER]
 PRIVATE_KEY = hostkeys/c_no_nat_client
diff --git a/src/integration-tests/confs/c_no_nat_client_2.conf b/src/integration-tests/confs/c_no_nat_client_2.conf
index d399079e1..46f0ddd24 100644
--- a/src/integration-tests/confs/c_no_nat_client_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_2.conf
@@ -73,7 +73,7 @@ UNIXPATH = /tmp/test-service-statistics-30
 PORT = 20037
 
 [PATHS]
-SERVICEHOME = /tmp/c_no_nat_client_2/
+GNUNET_TEST_HOME = /tmp/c_no_nat_client_2/
 DEFAULTCONFIG = c_no_nat_client_2.conf
 
 [PEER]
diff --git a/src/integration-tests/confs/c_no_nat_client_http.conf b/src/integration-tests/confs/c_no_nat_client_http.conf
index d720b7ecd..67ed37ea6 100644
--- a/src/integration-tests/confs/c_no_nat_client_http.conf
+++ b/src/integration-tests/confs/c_no_nat_client_http.conf
@@ -74,7 +74,7 @@ UNIXPATH = /tmp/test-service-statistics-16
 PORT = 20019
 
 [PATHS]
-SERVICEHOME = /tmp/c_no_nat_client/
+GNUNET_TEST_HOME = /tmp/c_no_nat_client/
 DEFAULTCONFIG = c_no_nat_client_http.conf
 
 [template]
diff --git a/src/integration-tests/confs/c_no_nat_client_http_2.conf b/src/integration-tests/confs/c_no_nat_client_http_2.conf
index 0e4abd3d0..a581d7f02 100644
--- a/src/integration-tests/confs/c_no_nat_client_http_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_http_2.conf
@@ -76,7 +76,7 @@ UNIXPATH = /tmp/test-service-statistics-30
 PORT = 20037
 
 [PATHS]
-SERVICEHOME = /tmp/c_no_nat_client_2/
+GNUNET_TEST_HOME = /tmp/c_no_nat_client_2/
 DEFAULTCONFIG = c_no_nat_client_http_2.conf
 
 [template]
diff --git a/src/integration-tests/confs/c_no_nat_client_unix.conf b/src/integration-tests/confs/c_no_nat_client_unix.conf
index bd6208ed3..c1129b519 100644
--- a/src/integration-tests/confs/c_no_nat_client_unix.conf
+++ b/src/integration-tests/confs/c_no_nat_client_unix.conf
@@ -79,7 +79,7 @@ UNIXPATH = /tmp/test-service-statistics-16
 PORT = 20019
 
 [PATHS]
-SERVICEHOME = /tmp/c_no_nat_client/
+GNUNET_TEST_HOME = /tmp/c_no_nat_client/
 DEFAULTCONFIG = c_no_nat_client_unix.conf
 
 [template]
diff --git a/src/integration-tests/confs/c_no_nat_client_unix_2.conf b/src/integration-tests/confs/c_no_nat_client_unix_2.conf
index 724f4fb7e..f4d91d336 100644
--- a/src/integration-tests/confs/c_no_nat_client_unix_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_unix_2.conf
@@ -76,7 +76,7 @@ UNIXPATH = /tmp/test-service-statistics-30
 PORT = 20037
 
 [PATHS]
-SERVICEHOME = /tmp/c_no_nat_client_2/
+GNUNET_TEST_HOME = /tmp/c_no_nat_client_2/
 DEFAULTCONFIG = c_no_nat_client_unix_2.conf
 
 [template]
diff --git a/src/integration-tests/confs/c_normal_client_tcp.conf b/src/integration-tests/confs/c_normal_client_tcp.conf
index 204e7ffd2..ca8d684cc 100644
--- a/src/integration-tests/confs/c_normal_client_tcp.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp.conf
@@ -45,7 +45,7 @@ USE_INCLUDED_HELLOS = YES
 PORT = 20067
 
 [PATHS]
-SERVICEHOME = /tmp/c_normal_client
+GNUNET_TEST_HOME = /tmp/c_normal_client
 
 [nse]
 UNIXPATH = /tmp/test-service-nse-54
diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp.conf b/src/integration-tests/confs/c_normal_client_tcp_udp.conf
index 6abaf5917..5aaf8ee51 100644
--- a/src/integration-tests/confs/c_normal_client_tcp_udp.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp_udp.conf
@@ -49,7 +49,7 @@ USE_INCLUDED_HELLOS = YES
 PORT = 20067
 
 [PATHS]
-SERVICEHOME = /tmp/c_normal_client
+GNUNET_TEST_HOME = /tmp/c_normal_client
 
 [nse]
 UNIXPATH = /tmp/test-service-nse-54
diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf b/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
index 8b3b2b663..7b01fc9a3 100644
--- a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
@@ -52,7 +52,7 @@ USE_INCLUDED_HELLOS = YES
 PORT = 20067
 
 [PATHS]
-SERVICEHOME = /tmp/c_normal_client
+GNUNET_TEST_HOME = /tmp/c_normal_client
 
 [nse]
 UNIXPATH = /tmp/test-service-nse-54
diff --git a/src/integration-tests/confs/test_defaults.conf b/src/integration-tests/confs/test_defaults.conf
index 7da40e583..b1f3c33be 100644
--- a/src/integration-tests/confs/test_defaults.conf
+++ b/src/integration-tests/confs/test_defaults.conf
@@ -30,7 +30,7 @@ PORT = 20070
 [datastore]
 UNIX_MATCH_UID = YES
 QUOTA = 100 MB
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
+BLOOMFILTER = $GNUNET_TEST_HOME/fs/bloomfilter
 
 [dhtcache]
 DATABASE = sqlite
@@ -47,11 +47,11 @@ INTERNAL_ADDRESS = 127.0.0.1
 BINDTO = 127.0.0.1
 
 [fs]
-INDEXDB = $SERVICEHOME/idxinfo.lst
-IDENTITY_DIR = $SERVICEHOME/identities/
-STATE_DIR = $SERVICEHOME/persistence/
-UPDATE_DIR = $SERVICEHOME/updates/
-TRUST = $SERVICEHOME/data/credit/
+INDEXDB = $GNUNET_TEST_HOME/idxinfo.lst
+IDENTITY_DIR = $GNUNET_TEST_HOME/identities/
+STATE_DIR = $GNUNET_TEST_HOME/persistence/
+UPDATE_DIR = $GNUNET_TEST_HOME/updates/
+TRUST = $GNUNET_TEST_HOME/data/credit/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/mesh/test_mesh.conf b/src/mesh/test_mesh.conf
index 2bb87a828..7d04cd97d 100644
--- a/src/mesh/test_mesh.conf
+++ b/src/mesh/test_mesh.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-mesh/
+GNUNET_TEST_HOME = /tmp/test-mesh/
 
 [mesh]
 BINARY = gnunet-service-mesh-enc
diff --git a/src/mesh/test_mesh_drop.conf b/src/mesh/test_mesh_drop.conf
index fb6c52475..16d4f7637 100644
--- a/src/mesh/test_mesh_drop.conf
+++ b/src/mesh/test_mesh_drop.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-mesh/
+GNUNET_TEST_HOME = /tmp/test-mesh/
 
 [mesh]
 #BINARY = gnunet-service-mesh
diff --git a/src/namestore/test_namestore_api.conf b/src/namestore/test_namestore_api.conf
index 68f972e25..41670cdb1 100644
--- a/src/namestore/test_namestore_api.conf
+++ b/src/namestore/test_namestore_api.conf
@@ -8,7 +8,7 @@ AUTOSTART = YES
 DATABASE = sqlite
 
 [namestore-sqlite]
-FILENAME = $SERVICEHOME/namestore/sqlite_test.db
+FILENAME = $GNUNET_TEST_HOME/namestore/sqlite_test.db
 
 [namestore-postgres]
 CONFIG = connect_timeout=10; dbname=gnunetcheck
diff --git a/src/nat/test_nat_data.conf b/src/nat/test_nat_data.conf
index 03467d1e6..9722828ac 100644
--- a/src/nat/test_nat_data.conf
+++ b/src/nat/test_nat_data.conf
@@ -1,11 +1,11 @@
 [PATHS]
-SERVICEHOME = /tmp/nat-test
-# SERVICEHOME = /var/lib/gnunet/
+GNUNET_TEST_HOME = /tmp/nat-test
+# GNUNET_TEST_HOME = /var/lib/gnunet/
 # configuration file is assumed to be the default,
 # which is what we want by default...
 
 [gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
 
 [TESTING]
 WEAKRANDOM = NO
@@ -54,7 +54,7 @@ DEFAULTSERVICES = topology hostlist
 UNIXPATH = /tmp/gnunet-service-arm.sock
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
-# GLOBAL_POSTFIX = -l $SERVICEHOME/{}-logs
+# GLOBAL_POSTFIX = -l $GNUNET_TEST_HOME/{}-logs
 # GLOBAL_PREFIX =
 # USERNAME =
 # MAXBUF =
diff --git a/src/nat/test_nat_test_data.conf b/src/nat/test_nat_test_data.conf
index b30240c57..161af6c48 100644
--- a/src/nat/test_nat_test_data.conf
+++ b/src/nat/test_nat_test_data.conf
@@ -1,6 +1,6 @@
 [PATHS]
-SERVICEHOME = /tmp/nat-test
-# SERVICEHOME = /var/lib/gnunet/
+GNUNET_TEST_HOME = /tmp/nat-test
+# GNUNET_TEST_HOME = /var/lib/gnunet/
 # configuration file is assumed to be the default,
 # which is what we want by default...
 
diff --git a/src/nse/nse_infiniband.conf b/src/nse/nse_infiniband.conf
index aeda85a75..caf68396d 100644
--- a/src/nse/nse_infiniband.conf
+++ b/src/nse/nse_infiniband.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/nse-profiler/
+GNUNET_TEST_HOME = /tmp/nse-profiler/
 
 [testbed]
 AUTOSTART = NO
@@ -25,7 +25,7 @@ AUTOSTART = NO
 WORKDELAY = 60 s
 INTERVAL = 10 s
 WORKBITS = 0
-PROOFFILE = $SERVICEHOME/nse.proof
+PROOFFILE = $GNUNET_TEST_HOME/nse.proof
 HISTOGRAM_DIR = /home/totakura/nse/test/histograms
 
 [arm]
diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf
index db4f637dc..134fe64c4 100644
--- a/src/nse/nse_profiler_test.conf
+++ b/src/nse/nse_profiler_test.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/nse-profiler/
+GNUNET_TEST_HOME = /tmp/nse-profiler/
 
 [testbed]
 AUTOSTART = NO
@@ -23,7 +23,7 @@ AUTOSTART = NO
 WORKDELAY = 60 s
 INTERVAL = 10 s
 WORKBITS = 0
-PROOFFILE = $SERVICEHOME/nse.proof
+PROOFFILE = $GNUNET_TEST_HOME/nse.proof
 
 [arm]
 DEFAULTSERVICES = core nse
diff --git a/src/nse/test_nse.conf b/src/nse/test_nse.conf
index 5652fa4ea..d8cd2580b 100644
--- a/src/nse/test_nse.conf
+++ b/src/nse/test_nse.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-nse-multipeer/
+GNUNET_TEST_HOME = /tmp/test-nse-multipeer/
 
 [nse]
 PORT = 22353
@@ -8,14 +8,14 @@ BINARY = gnunet-service-nse
 #BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse
 #PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
 AUTOSTART = YES
-PROOFFILE = $SERVICEHOME/proof.nse
+PROOFFILE = $GNUNET_TEST_HOME/proof.nse
 # Overriding network settings for faster testing (do NOT use
 # these values in production just because they are here)
 WORKDELAY = 1 ms
 INTERVAL = 60 s
 WORKBITS = 1
 
-HISTOGRAM = $SERVICEHOME/nse-histogram
+HISTOGRAM = $GNUNET_TEST_HOME/nse-histogram
 
 
 [arm]
diff --git a/src/peerinfo-tool/test_gnunet_peerinfo_data.conf b/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
index a4c16ac16..eef151763 100644
--- a/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
+++ b/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-peerinfo/
+GNUNET_TEST_HOME = /tmp/gnunet-test-peerinfo/
 
 [gnunetd]
 #HOSTKEY = test_gnunet_peerinfo.hostkey
diff --git a/src/peerinfo/test_peerinfo_api_data.conf b/src/peerinfo/test_peerinfo_api_data.conf
index ddbd02b5e..e3b37b1ea 100644
--- a/src/peerinfo/test_peerinfo_api_data.conf
+++ b/src/peerinfo/test_peerinfo_api_data.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-peerinfo/
+GNUNET_TEST_HOME = /tmp/test-gnunet-peerinfo/
 
 [peerinfo]
 PORT = 22354
diff --git a/src/psycstore/test_psycstore.conf b/src/psycstore/test_psycstore.conf
index c524f2ae6..5a20273a2 100644
--- a/src/psycstore/test_psycstore.conf
+++ b/src/psycstore/test_psycstore.conf
@@ -11,4 +11,4 @@ UNIX_MATCH_GID = YES
 DATABASE = sqlite
 
 [psycstore-sqlite]
-FILENAME = $SERVICEHOME/psycstore/sqlite_test.db
+FILENAME = $GNUNET_TEST_HOME/psycstore/sqlite_test.db
diff --git a/src/pt/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf
index 269def876..60584948e 100644
--- a/src/pt/test_gns_vpn.conf
+++ b/src/pt/test_gns_vpn.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-gns-vpn/
+GNUNET_TEST_HOME = /tmp/gnunet-test-gns-vpn/
 
 [transport]
 PLUGINS = tcp
@@ -47,7 +47,7 @@ TTL = 3600000
 
 [gns]
 AUTOSTART = YES
-ZONEKEY = $SERVICEHOME/.hostkey
+ZONEKEY = $GNUNET_TEST_HOME/.hostkey
 HIJACK_DNS = YES
 
 [namestore]
diff --git a/src/pt/test_gnunet_vpn.conf b/src/pt/test_gnunet_vpn.conf
index c0cdd5b51..38f479775 100644
--- a/src/pt/test_gnunet_vpn.conf
+++ b/src/pt/test_gnunet_vpn.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-vpn/
+GNUNET_TEST_HOME = /tmp/gnunet-test-vpn/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/regex/test_regex_api_data.conf b/src/regex/test_regex_api_data.conf
index 87935261c..4977d3b19 100644
--- a/src/regex/test_regex_api_data.conf
+++ b/src/regex/test_regex_api_data.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-regex-api/
+GNUNET_TEST_HOME = /tmp/test-regex-api/
 
 [fs]
 AUTOSTART = NO
diff --git a/src/set/test_set.conf b/src/set/test_set.conf
index 0eeb1cb72..2b8f11fd7 100644
--- a/src/set/test_set.conf
+++ b/src/set/test_set.conf
@@ -1,6 +1,6 @@
 # @INLINE@ test_set_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-set/
+GNUNET_TEST_HOME = /tmp/test-gnunet-set/
 
 [set]
 AUTOSTART = YES
diff --git a/src/statistics/test_statistics_api_data.conf b/src/statistics/test_statistics_api_data.conf
index 1ef8f95b3..c0ea8630d 100644
--- a/src/statistics/test_statistics_api_data.conf
+++ b/src/statistics/test_statistics_api_data.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-statistics/
+GNUNET_TEST_HOME = /tmp/test-gnunet-statistics/
 
 [statistics]
 PORT = 22353
@@ -7,7 +7,7 @@ UNIXPATH = /tmp/test-statistics-service-statistics.unix
 
 [arm]
 PORT = 22354
-DEFAULTSERVICES = 
+DEFAULTSERVICES =
 UNIXPATH = /tmp/test-statistics-service-arm.unix
 
 [fs]
diff --git a/src/testbed/test_testbed_api.conf b/src/testbed/test_testbed_api.conf
index 4be0c74da..beaf78eee 100644
--- a/src/testbed/test_testbed_api.conf
+++ b/src/testbed/test_testbed_api.conf
@@ -47,10 +47,10 @@ TIMEOUT = 300 s
 PORT = 12368
 
 [gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
 
 [dns]
 AUTOSTART = NO
diff --git a/src/testbed/test_testbed_api_barriers.conf.in b/src/testbed/test_testbed_api_barriers.conf.in
index 8255ba152..5fbfd0b8d 100644
--- a/src/testbed/test_testbed_api_barriers.conf.in
+++ b/src/testbed/test_testbed_api_barriers.conf.in
@@ -53,7 +53,7 @@ TIMEOUT = 300 s
 PORT = 12368
 
 [PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
 
 [dns]
 AUTOSTART = NO
diff --git a/src/testbed/test_testbed_api_statistics.conf b/src/testbed/test_testbed_api_statistics.conf
index 6ab91d260..f6bfa2c9e 100644
--- a/src/testbed/test_testbed_api_statistics.conf
+++ b/src/testbed/test_testbed_api_statistics.conf
@@ -57,10 +57,10 @@ USE_PROGRESSBARS = YES
 PEERGROUP_TIMEOUT = 2400 s
 
 [gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
 
 [dns]
 AUTOSTART = NO
diff --git a/src/testbed/test_testbed_api_test_timeout.conf b/src/testbed/test_testbed_api_test_timeout.conf
index 6a59353c8..e31cc3e29 100644
--- a/src/testbed/test_testbed_api_test_timeout.conf
+++ b/src/testbed/test_testbed_api_test_timeout.conf
@@ -56,10 +56,10 @@ USE_PROGRESSBARS = YES
 PEERGROUP_TIMEOUT = 2400 s
 
 [gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
 
 [dns]
 AUTOSTART = NO
diff --git a/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf b/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
index 3dcc66ae3..3b27a36ac 100644
--- a/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
@@ -56,10 +56,10 @@ USE_PROGRESSBARS = YES
 PEERGROUP_TIMEOUT = 2400 s
 
 [gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
 
 [dns]
 AUTOSTART = NO
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyclique.conf b/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
index 0dbf1dcc9..a7e8c8d9b 100644
--- a/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
@@ -56,10 +56,10 @@ USE_PROGRESSBARS = YES
 PEERGROUP_TIMEOUT = 2400 s
 
 [gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
 
 [dns]
 AUTOSTART = NO
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf b/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
index 82b0f5de4..91f09d0e9 100644
--- a/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
@@ -49,10 +49,10 @@ TIMEOUT = 300 s
 PORT = 12368
 
 [gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
 
 [dns]
 AUTOSTART = NO
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyline.conf b/src/testbed/test_testbed_api_testbed_run_topologyline.conf
index 5ecca7de7..d4d76b35f 100644
--- a/src/testbed/test_testbed_api_testbed_run_topologyline.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyline.conf
@@ -56,10 +56,10 @@ USE_PROGRESSBARS = YES
 PEERGROUP_TIMEOUT = 2400 s
 
 [gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
 
 [dns]
 AUTOSTART = NO
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf b/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
index 15e9e0fb4..d5d41e63e 100644
--- a/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
@@ -56,10 +56,10 @@ USE_PROGRESSBARS = YES
 PEERGROUP_TIMEOUT = 2400 s
 
 [gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
 
 [dns]
 AUTOSTART = NO
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyring.conf b/src/testbed/test_testbed_api_testbed_run_topologyring.conf
index b6a1e285a..2dadd254f 100644
--- a/src/testbed/test_testbed_api_testbed_run_topologyring.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyring.conf
@@ -56,10 +56,10 @@ USE_PROGRESSBARS = YES
 PEERGROUP_TIMEOUT = 2400 s
 
 [gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
 
 [dns]
 AUTOSTART = NO
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf b/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf
index cdd89f293..d96cd7202 100644
--- a/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf
@@ -58,10 +58,10 @@ USE_PROGRESSBARS = YES
 PEERGROUP_TIMEOUT = 2400 s
 
 [gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
 
 [dns]
 AUTOSTART = NO
diff --git a/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf b/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf
index a0a715129..1a4ed46da 100644
--- a/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf
@@ -56,10 +56,10 @@ USE_PROGRESSBARS = YES
 PEERGROUP_TIMEOUT = 2400 s
 
 [gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
 
 [dns]
 AUTOSTART = NO
diff --git a/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf b/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
index 029f62157..57f52e65e 100644
--- a/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
@@ -56,10 +56,10 @@ USE_PROGRESSBARS = YES
 PEERGROUP_TIMEOUT = 2400 s
 
 [gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = /tmp/test-testbed/
 
 [dns]
 AUTOSTART = NO
diff --git a/src/testbed/test_testbed_logger_api.conf b/src/testbed/test_testbed_logger_api.conf
index 82bffc31d..1aaf7df4c 100644
--- a/src/testbed/test_testbed_logger_api.conf
+++ b/src/testbed/test_testbed_logger_api.conf
@@ -1,3 +1,3 @@
 [testbed-logger]
 UNIXPATH=/tmp/testbed-logger.sock
-DIR=$SERVICEHOME/data
\ No newline at end of file
+DIR=$GNUNET_TEST_HOME/data
\ No newline at end of file
diff --git a/src/testing/test_testing_defaults.conf b/src/testing/test_testing_defaults.conf
index 1a58a311f..b6e4ccdab 100644
--- a/src/testing/test_testing_defaults.conf
+++ b/src/testing/test_testing_defaults.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
+GNUNET_TEST_HOME = /tmp/test-gnunet-testing/
 
 [resolver]
 PORT = 2564
diff --git a/src/testing/test_testing_sharedservices.conf b/src/testing/test_testing_sharedservices.conf
index 393b1e518..c7014065f 100644
--- a/src/testing/test_testing_sharedservices.conf
+++ b/src/testing/test_testing_sharedservices.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
+GNUNET_TEST_HOME = /tmp/test-gnunet-testing/
 
 [testbed-logger]
 PORT = 15000
diff --git a/src/topology/test_gnunet_daemon_topology_data.conf b/src/topology/test_gnunet_daemon_topology_data.conf
index 2adddeb7b..79f12e5e1 100644
--- a/src/topology/test_gnunet_daemon_topology_data.conf
+++ b/src/topology/test_gnunet_daemon_topology_data.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-topology/
+GNUNET_TEST_HOME = /tmp/test-gnunet-topology/
 
 [resolver]
 PORT = 2664
diff --git a/src/topology/topology.conf b/src/topology/topology.conf
index 278445352..5e72d57ce 100644
--- a/src/topology/topology.conf
+++ b/src/topology/topology.conf
@@ -2,7 +2,5 @@
 MINIMUM-FRIENDS = 0
 FRIENDS-ONLY = NO
 TARGET-CONNECTION-COUNT = 16
-FRIENDS = $SERVICEHOME/friends
+FRIENDS = $GNUNET_CONFIG_HOME/topology/friends.txt
 BINARY = gnunet-daemon-topology
-
-
diff --git a/src/transport/template_cfg_peer1.conf b/src/transport/template_cfg_peer1.conf
index dcea0d342..d66ab1906 100644
--- a/src/transport/template_cfg_peer1.conf
+++ b/src/transport/template_cfg_peer1.conf
@@ -1,9 +1,6 @@
 @INLINE@ test_transport_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
 
 [nat]
 RETURN_LOCAL_ADDRESSES = YES
diff --git a/src/transport/template_cfg_peer2.conf b/src/transport/template_cfg_peer2.conf
index a1773a37b..a4b2f2b91 100644
--- a/src/transport/template_cfg_peer2.conf
+++ b/src/transport/template_cfg_peer2.conf
@@ -1,9 +1,6 @@
 @INLINE@ test_transport_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
 
 [nat]
 RETURN_LOCAL_ADDRESSES = YES
@@ -35,8 +32,7 @@ UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 [peerinfo]
 PORT = 12011
 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
-TRUST = $SERVICEHOME/data/credit/
-USE_INCLUDED_HELLOS = NO 
+USE_INCLUDED_HELLOS = NO
 
 [transport]
 #PREFIX = valgrind --leak-check=full
diff --git a/src/transport/test_plugin_transport_data.conf b/src/transport/test_plugin_transport_data.conf
index 189238c08..885fed8d7 100644
--- a/src/transport/test_plugin_transport_data.conf
+++ b/src/transport/test_plugin_transport_data.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_transport_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-plugin-transport/
+GNUNET_TEST_HOME = /tmp/test-gnunetd-plugin-transport/
 
 [transport-tcp]
 PORT = 2400
diff --git a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf
index 77d06bee4..f20b62b85 100644
--- a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-bluetooth-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/
 
 [transport-bluetooth]
 INTERFACE = hci0
diff --git a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf
index f5941fdae..fe2535d9f 100644
--- a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-bluetooth-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/
 
 [transport-bluetooth]
 INTERFACE = hci1
diff --git a/src/transport/test_quota_compliance_bluetooth_peer1.conf b/src/transport/test_quota_compliance_bluetooth_peer1.conf
index 77d06bee4..f20b62b85 100644
--- a/src/transport/test_quota_compliance_bluetooth_peer1.conf
+++ b/src/transport/test_quota_compliance_bluetooth_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-bluetooth-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/
 
 [transport-bluetooth]
 INTERFACE = hci0
diff --git a/src/transport/test_quota_compliance_bluetooth_peer2.conf b/src/transport/test_quota_compliance_bluetooth_peer2.conf
index f5941fdae..fe2535d9f 100644
--- a/src/transport/test_quota_compliance_bluetooth_peer2.conf
+++ b/src/transport/test_quota_compliance_bluetooth_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-bluetooth-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/
 
 [transport-bluetooth]
 INTERFACE = hci1
diff --git a/src/transport/test_quota_compliance_data.conf b/src/transport/test_quota_compliance_data.conf
index b0fb0e059..576d2fc0f 100644
--- a/src/transport/test_quota_compliance_data.conf
+++ b/src/transport/test_quota_compliance_data.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_transport_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-plugin-transport/
+GNUNET_TEST_HOME = /tmp/test-gnunetd-plugin-transport/
 
 [transport-tcp]
 PORT = 2368
diff --git a/src/transport/test_quota_compliance_http_asymmetric_peer1.conf b/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
index 885bcba3d..98d1db1cb 100644
--- a/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer1
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1
 
 [transport-http_client]
 
diff --git a/src/transport/test_quota_compliance_http_asymmetric_peer2.conf b/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
index 33f8be543..953915cf6 100644
--- a/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer2
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2
 
 [transport-http_server]
 PORT = 3010
diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf
index 885bcba3d..98d1db1cb 100644
--- a/src/transport/test_quota_compliance_http_peer1.conf
+++ b/src/transport/test_quota_compliance_http_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer1
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1
 
 [transport-http_client]
 
diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf
index 33f8be543..953915cf6 100644
--- a/src/transport/test_quota_compliance_http_peer2.conf
+++ b/src/transport/test_quota_compliance_http_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer2
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2
 
 [transport-http_server]
 PORT = 3010
diff --git a/src/transport/test_quota_compliance_https_asymmetric_peer1.conf b/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
index 271bbe056..9493fdee2 100644
--- a/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer1/
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/
 
 [transport-https_client]
 
diff --git a/src/transport/test_quota_compliance_https_asymmetric_peer2.conf b/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
index 8e07ff337..eefc24f1d 100644
--- a/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer2
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2
 
 [transport-https_server]
 PORT = 3001
diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf
index 271bbe056..9493fdee2 100644
--- a/src/transport/test_quota_compliance_https_peer1.conf
+++ b/src/transport/test_quota_compliance_https_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer1/
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/
 
 [transport-https_client]
 
diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf
index 8e07ff337..eefc24f1d 100644
--- a/src/transport/test_quota_compliance_https_peer2.conf
+++ b/src/transport/test_quota_compliance_https_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer2
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2
 
 [transport-https_server]
 PORT = 3001
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
index b7eb28757..51804917c 100644
--- a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/quota-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/quota-tcp-p1/
 
 [transport-tcp]
 PORT = 4094
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
index cc949df30..a31459db0 100644
--- a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/quota-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/quota-tcp-p2/
 
 [transport-tcp]
 PORT = 12015
diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf
index b7eb28757..51804917c 100644
--- a/src/transport/test_quota_compliance_tcp_peer1.conf
+++ b/src/transport/test_quota_compliance_tcp_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/quota-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/quota-tcp-p1/
 
 [transport-tcp]
 PORT = 4094
diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf
index 67f171ec9..0e477e7c6 100644
--- a/src/transport/test_quota_compliance_tcp_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
 
 [transport-tcp]
 PORT = 12015
diff --git a/src/transport/test_quota_compliance_udp_peer1.conf b/src/transport/test_quota_compliance_udp_peer1.conf
index 0d49d4ef8..8130083b1 100644
--- a/src/transport/test_quota_compliance_udp_peer1.conf
+++ b/src/transport/test_quota_compliance_udp_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer1/
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/
 
 [transport-udp]
 PORT = 4368
diff --git a/src/transport/test_quota_compliance_udp_peer2.conf b/src/transport/test_quota_compliance_udp_peer2.conf
index 3c57fe5d6..835ad8ff0 100644
--- a/src/transport/test_quota_compliance_udp_peer2.conf
+++ b/src/transport/test_quota_compliance_udp_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer2
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2
 
 [transport-udp]
 PORT = 3368
diff --git a/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf b/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
index 1e4afcebc..2282bcb57 100644
--- a/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer1/
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/
 
 [arm]
 PORT = 4087
diff --git a/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf b/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
index f732e98ae..339d5d7c6 100644
--- a/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer2
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2
 
 [arm]
 PORT = 3087
diff --git a/src/transport/test_quota_compliance_unix_peer1.conf b/src/transport/test_quota_compliance_unix_peer1.conf
index bde78468c..38dfb4fe7 100644
--- a/src/transport/test_quota_compliance_unix_peer1.conf
+++ b/src/transport/test_quota_compliance_unix_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer1/
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/
 
 [transport-unix]
 PORT = 12120
diff --git a/src/transport/test_quota_compliance_unix_peer2.conf b/src/transport/test_quota_compliance_unix_peer2.conf
index 0b803ccbc..c9dc6126b 100644
--- a/src/transport/test_quota_compliance_unix_peer2.conf
+++ b/src/transport/test_quota_compliance_unix_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer2
+GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2
 
 [transport-unix]
 PORT = 12136
diff --git a/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf b/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf
index e81a3f9f1..d49a06b78 100644
--- a/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-wlan-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p1/
 
 [transport-wlan]
 TESTMODE = 1
diff --git a/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf b/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf
index bd5387667..137dd37ec 100644
--- a/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-wlan-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p2/
 
 [transport-wlan]
 INTERFACE = mon1
diff --git a/src/transport/test_quota_compliance_wlan_peer1.conf b/src/transport/test_quota_compliance_wlan_peer1.conf
index e81a3f9f1..d49a06b78 100644
--- a/src/transport/test_quota_compliance_wlan_peer1.conf
+++ b/src/transport/test_quota_compliance_wlan_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-wlan-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p1/
 
 [transport-wlan]
 TESTMODE = 1
diff --git a/src/transport/test_quota_compliance_wlan_peer2.conf b/src/transport/test_quota_compliance_wlan_peer2.conf
index bd5387667..137dd37ec 100644
--- a/src/transport/test_quota_compliance_wlan_peer2.conf
+++ b/src/transport/test_quota_compliance_wlan_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-wlan-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p2/
 
 [transport-wlan]
 INTERFACE = mon1
diff --git a/src/transport/test_transport_api_bidirectional_connect_peer1.conf b/src/transport/test_transport_api_bidirectional_connect_peer1.conf
index ba6afbe6e..88a4f54f6 100644
--- a/src/transport/test_transport_api_bidirectional_connect_peer1.conf
+++ b/src/transport/test_transport_api_bidirectional_connect_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
 
 [arm]
 PORT = 12000
diff --git a/src/transport/test_transport_api_bidirectional_connect_peer2.conf b/src/transport/test_transport_api_bidirectional_connect_peer2.conf
index 4aeee7c7d..7d6ddec3e 100644
--- a/src/transport/test_transport_api_bidirectional_connect_peer2.conf
+++ b/src/transport/test_transport_api_bidirectional_connect_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
 
 [arm]
 PORT = 12010
diff --git a/src/transport/test_transport_api_bluetooth_peer1.conf b/src/transport/test_transport_api_bluetooth_peer1.conf
index baf84a21b..ccc9cec58 100644
--- a/src/transport/test_transport_api_bluetooth_peer1.conf
+++ b/src/transport/test_transport_api_bluetooth_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-bluetooth-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/
 
 [transport-bluetooth]
 INTERFACE = hci0
diff --git a/src/transport/test_transport_api_bluetooth_peer2.conf b/src/transport/test_transport_api_bluetooth_peer2.conf
index 99836a732..5250cfdee 100644
--- a/src/transport/test_transport_api_bluetooth_peer2.conf
+++ b/src/transport/test_transport_api_bluetooth_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-bluetooth-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/
 
 [transport-bluetooth]
 INTERFACE = hci1
diff --git a/src/transport/test_transport_api_disconnect_tcp_peer1.conf b/src/transport/test_transport_api_disconnect_tcp_peer1.conf
index 5f1d693a8..0de45c8cf 100644
--- a/src/transport/test_transport_api_disconnect_tcp_peer1.conf
+++ b/src/transport/test_transport_api_disconnect_tcp_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
 
 [transport-tcp]
 PORT = 12000
diff --git a/src/transport/test_transport_api_disconnect_tcp_peer2.conf b/src/transport/test_transport_api_disconnect_tcp_peer2.conf
index 67f171ec9..0e477e7c6 100644
--- a/src/transport/test_transport_api_disconnect_tcp_peer2.conf
+++ b/src/transport/test_transport_api_disconnect_tcp_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
 
 [transport-tcp]
 PORT = 12015
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf
index 3c1b41d06..c65c38f94 100644
--- a/src/transport/test_transport_api_http_peer1.conf
+++ b/src/transport/test_transport_api_http_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-http-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/
 
 [transport-http_client]
 
diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf
index f348bf404..04e51fe93 100644
--- a/src/transport/test_transport_api_http_peer2.conf
+++ b/src/transport/test_transport_api_http_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-http-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-http-p2/
 
 [transport-http_server]
 PORT = 12090
diff --git a/src/transport/test_transport_api_http_reverse_peer1.conf b/src/transport/test_transport_api_http_reverse_peer1.conf
index 93d8bd34b..2bdc3dbd5 100644
--- a/src/transport/test_transport_api_http_reverse_peer1.conf
+++ b/src/transport/test_transport_api_http_reverse_peer1.conf
@@ -1,6 +1,6 @@
 INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-http-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/
 
 
 [transport-http_client]
diff --git a/src/transport/test_transport_api_http_reverse_peer2.conf b/src/transport/test_transport_api_http_reverse_peer2.conf
index b73921f94..b38b5e56d 100644
--- a/src/transport/test_transport_api_http_reverse_peer2.conf
+++ b/src/transport/test_transport_api_http_reverse_peer2.conf
@@ -1,6 +1,6 @@
 INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-http-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-http-p2/
 
 
 [transport-http_client]
diff --git a/src/transport/test_transport_api_https_peer1.conf b/src/transport/test_transport_api_https_peer1.conf
index 48302a640..4e0cac452 100644
--- a/src/transport/test_transport_api_https_peer1.conf
+++ b/src/transport/test_transport_api_https_peer1.conf
@@ -1,11 +1,11 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-https-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-https-p1/
 
 [transport-https_client]
 PORT = 12100
-KEY_FILE = $SERVICEHOME/https_key_p1.key
-CERT_FILE = $SERVICEHOME/https_cert_p1.crt
+KEY_FILE = $GNUNET_TEST_HOME/https_key_p1.key
+CERT_FILE = $GNUNET_TEST_HOME/https_cert_p1.crt
 
 [arm]
 PORT = 12105
diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf
index 89bef2b20..443717ebd 100644
--- a/src/transport/test_transport_api_https_peer2.conf
+++ b/src/transport/test_transport_api_https_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-https-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-https-p2/
 
 [transport-https_server]
 EXTERNAL_HOSTNAME = localhost/test
@@ -11,8 +11,8 @@ EXTERNAL_HOSTNAME_USE_PORT = YES
 # Does the external hostname use the same port?
 USE_IPv6 = YES
 #BINDTO = 127.0.0.1
-KEY_FILE = $SERVICEHOME/https_key_p2.key
-CERT_FILE = $SERVICEHOME/https_cert_p2.crt
+KEY_FILE = $GNUNET_TEST_HOME/https_key_p2.key
+CERT_FILE = $GNUNET_TEST_HOME/https_cert_p2.crt
 
 [arm]
 PORT = 12115
diff --git a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
index dceeccb9f..004893a99 100644
--- a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
+++ b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
 
 [transport-tcp]
 PORT = 12000
diff --git a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
index caaddded2..121566e0b 100644
--- a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
+++ b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
 
 [transport-tcp]
 PORT = 0
diff --git a/src/transport/test_transport_api_manipulation_cfg_peer1.conf b/src/transport/test_transport_api_manipulation_cfg_peer1.conf
index df5d4c368..786256777 100644
--- a/src/transport/test_transport_api_manipulation_cfg_peer1.conf
+++ b/src/transport/test_transport_api_manipulation_cfg_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
 
 [transport-tcp]
 PORT = 12000
diff --git a/src/transport/test_transport_api_manipulation_cfg_peer2.conf b/src/transport/test_transport_api_manipulation_cfg_peer2.conf
index 1e16f7838..6985bf172 100644
--- a/src/transport/test_transport_api_manipulation_cfg_peer2.conf
+++ b/src/transport/test_transport_api_manipulation_cfg_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
 
 [transport-tcp]
 PORT = 12015
diff --git a/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf b/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf
index db662826b..ed11174f0 100644
--- a/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf
+++ b/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
 
 [transport-tcp]
 PORT = 12000
diff --git a/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf b/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf
index 67f171ec9..0e477e7c6 100644
--- a/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf
+++ b/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
 
 [transport-tcp]
 PORT = 12015
diff --git a/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf b/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf
index db662826b..ed11174f0 100644
--- a/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf
+++ b/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
 
 [transport-tcp]
 PORT = 12000
diff --git a/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf b/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf
index 67f171ec9..0e477e7c6 100644
--- a/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf
+++ b/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
 
 [transport-tcp]
 PORT = 12015
diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf
index 61b0f5644..5105324f4 100644
--- a/src/transport/test_transport_api_multi_peer1.conf
+++ b/src/transport/test_transport_api_multi_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-multi-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-multi-p1/
 
 [transport-tcp]
 PORT = 12140
diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf
index c660c3c41..54ab6b8fd 100644
--- a/src/transport/test_transport_api_multi_peer2.conf
+++ b/src/transport/test_transport_api_multi_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-multi-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-multi-p2/
 
 [nat]
 ALLOW_NAT = NO
diff --git a/src/transport/test_transport_api_reliability_bluetooth_peer1.conf b/src/transport/test_transport_api_reliability_bluetooth_peer1.conf
index 77d06bee4..f20b62b85 100644
--- a/src/transport/test_transport_api_reliability_bluetooth_peer1.conf
+++ b/src/transport/test_transport_api_reliability_bluetooth_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-bluetooth-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/
 
 [transport-bluetooth]
 INTERFACE = hci0
diff --git a/src/transport/test_transport_api_reliability_bluetooth_peer2.conf b/src/transport/test_transport_api_reliability_bluetooth_peer2.conf
index f5941fdae..fe2535d9f 100644
--- a/src/transport/test_transport_api_reliability_bluetooth_peer2.conf
+++ b/src/transport/test_transport_api_reliability_bluetooth_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-bluetooth-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/
 
 [transport-bluetooth]
 INTERFACE = hci1
diff --git a/src/transport/test_transport_api_reliability_http_peer1.conf b/src/transport/test_transport_api_reliability_http_peer1.conf
index ea5de0bc9..1e493aaba 100644
--- a/src/transport/test_transport_api_reliability_http_peer1.conf
+++ b/src/transport/test_transport_api_reliability_http_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-http-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/
 
 [transport-http_client]
 
diff --git a/src/transport/test_transport_api_reliability_http_peer2.conf b/src/transport/test_transport_api_reliability_http_peer2.conf
index 083cd4dd8..4f7bbaf28 100644
--- a/src/transport/test_transport_api_reliability_http_peer2.conf
+++ b/src/transport/test_transport_api_reliability_http_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-http-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-http-p2/
 
 [transport-http_server]
 PORT = 12090
diff --git a/src/transport/test_transport_api_reliability_https_peer1.conf b/src/transport/test_transport_api_reliability_https_peer1.conf
index d5e88261a..6f20604e2 100644
--- a/src/transport/test_transport_api_reliability_https_peer1.conf
+++ b/src/transport/test_transport_api_reliability_https_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-https-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-https-p1/
 
 [transport-https_client]
 
diff --git a/src/transport/test_transport_api_reliability_https_peer2.conf b/src/transport/test_transport_api_reliability_https_peer2.conf
index 5cc0d245a..82e5cc01d 100644
--- a/src/transport/test_transport_api_reliability_https_peer2.conf
+++ b/src/transport/test_transport_api_reliability_https_peer2.conf
@@ -1,11 +1,11 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-https-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-https-p2/
 
 [transport-https_server]
 PORT = 12310
-KEY_FILE = $SERVICEHOME/https_key_p2.key
-CERT_FILE = $SERVICEHOME/https_cert_p2.crt
+KEY_FILE = $GNUNET_TEST_HOME/https_key_p2.key
+CERT_FILE = $GNUNET_TEST_HOME/https_cert_p2.crt
 
 [arm]
 PORT = 12315
diff --git a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
index 9490d405c..d248984d6 100644
--- a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-reliability-tcp-nat-p1/
 
 [nat]
 BEHIND_NAT = YES
diff --git a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
index b59916b7f..bb221e891 100644
--- a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
+++ b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-reliability-tcp-nat-p2/
 
 [nat]
 DISABLEV6 = YES
diff --git a/src/transport/test_transport_api_reliability_tcp_peer1.conf b/src/transport/test_transport_api_reliability_tcp_peer1.conf
index 5f1d693a8..0de45c8cf 100644
--- a/src/transport/test_transport_api_reliability_tcp_peer1.conf
+++ b/src/transport/test_transport_api_reliability_tcp_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
 
 [transport-tcp]
 PORT = 12000
diff --git a/src/transport/test_transport_api_reliability_tcp_peer2.conf b/src/transport/test_transport_api_reliability_tcp_peer2.conf
index 181aab3de..0e1667b89 100644
--- a/src/transport/test_transport_api_reliability_tcp_peer2.conf
+++ b/src/transport/test_transport_api_reliability_tcp_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
 
 [transport-tcp]
 PORT = 12015
diff --git a/src/transport/test_transport_api_reliability_wlan_peer1.conf b/src/transport/test_transport_api_reliability_wlan_peer1.conf
index e81a3f9f1..d49a06b78 100644
--- a/src/transport/test_transport_api_reliability_wlan_peer1.conf
+++ b/src/transport/test_transport_api_reliability_wlan_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-wlan-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p1/
 
 [transport-wlan]
 TESTMODE = 1
diff --git a/src/transport/test_transport_api_reliability_wlan_peer2.conf b/src/transport/test_transport_api_reliability_wlan_peer2.conf
index bd5387667..137dd37ec 100644
--- a/src/transport/test_transport_api_reliability_wlan_peer2.conf
+++ b/src/transport/test_transport_api_reliability_wlan_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-wlan-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p2/
 
 [transport-wlan]
 INTERFACE = mon1
diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf
index 8e33f273d..d50bac543 100644
--- a/src/transport/test_transport_api_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-nat-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-nat-p1/
 
 [nat]
 BEHIND_NAT = YES
diff --git a/src/transport/test_transport_api_tcp_nat_peer2.conf b/src/transport/test_transport_api_tcp_nat_peer2.conf
index f8b8b013e..395bbadc6 100644
--- a/src/transport/test_transport_api_tcp_nat_peer2.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-nat-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-nat-p2/
 
 [nat]
 DISABLEV6 = YES
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf
index db662826b..ed11174f0 100644
--- a/src/transport/test_transport_api_tcp_peer1.conf
+++ b/src/transport/test_transport_api_tcp_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
 
 [transport-tcp]
 PORT = 12000
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf
index 67f171ec9..0e477e7c6 100644
--- a/src/transport/test_transport_api_tcp_peer2.conf
+++ b/src/transport/test_transport_api_tcp_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
 
 [transport-tcp]
 PORT = 12015
diff --git a/src/transport/test_transport_api_timeout_http_peer1.conf b/src/transport/test_transport_api_timeout_http_peer1.conf
index 665527b3e..9af0c22fa 100644
--- a/src/transport/test_transport_api_timeout_http_peer1.conf
+++ b/src/transport/test_transport_api_timeout_http_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-http-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/
 
 [nat]
 
diff --git a/src/transport/test_transport_api_timeout_http_peer2.conf b/src/transport/test_transport_api_timeout_http_peer2.conf
index 1fdc94788..e572dbe7f 100644
--- a/src/transport/test_transport_api_timeout_http_peer2.conf
+++ b/src/transport/test_transport_api_timeout_http_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-http-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-http-p2/
 
 [nat]
 
diff --git a/src/transport/test_transport_api_timeout_https_peer1.conf b/src/transport/test_transport_api_timeout_https_peer1.conf
index fda69ae5c..674014afa 100644
--- a/src/transport/test_transport_api_timeout_https_peer1.conf
+++ b/src/transport/test_transport_api_timeout_https_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-https-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-https-p1/
 
 [transport-https_client]
 
diff --git a/src/transport/test_transport_api_timeout_https_peer2.conf b/src/transport/test_transport_api_timeout_https_peer2.conf
index ca54e1718..2891cf665 100644
--- a/src/transport/test_transport_api_timeout_https_peer2.conf
+++ b/src/transport/test_transport_api_timeout_https_peer2.conf
@@ -1,11 +1,11 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-https-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-https-p2/
 
 [transport-https_server]
 PORT = 12110
-KEY_FILE = $SERVICEHOME/https_key_p2.key
-CERT_FILE = $SERVICEHOME/https_cert_p2.crt
+KEY_FILE = $GNUNET_TEST_HOME/https_key_p2.key
+CERT_FILE = $GNUNET_TEST_HOME/https_cert_p2.crt
 
 [arm]
 PORT = 12115
diff --git a/src/transport/test_transport_api_timeout_tcp_peer1.conf b/src/transport/test_transport_api_timeout_tcp_peer1.conf
index dceeccb9f..004893a99 100644
--- a/src/transport/test_transport_api_timeout_tcp_peer1.conf
+++ b/src/transport/test_transport_api_timeout_tcp_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
 
 [transport-tcp]
 PORT = 12000
diff --git a/src/transport/test_transport_api_timeout_tcp_peer2.conf b/src/transport/test_transport_api_timeout_tcp_peer2.conf
index f89c3a3f7..4e1e9791a 100644
--- a/src/transport/test_transport_api_timeout_tcp_peer2.conf
+++ b/src/transport/test_transport_api_timeout_tcp_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
 
 [nat]
 ALLOW_NAT = NO
diff --git a/src/transport/test_transport_api_timeout_udp_peer1.conf b/src/transport/test_transport_api_timeout_udp_peer1.conf
index 7c3e33ad0..71e85bdc7 100644
--- a/src/transport/test_transport_api_timeout_udp_peer1.conf
+++ b/src/transport/test_transport_api_timeout_udp_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-udp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p1/
 
 [transport-udp]
 PORT = 12040
diff --git a/src/transport/test_transport_api_timeout_udp_peer2.conf b/src/transport/test_transport_api_timeout_udp_peer2.conf
index 9b79c3b54..c545ec7fa 100644
--- a/src/transport/test_transport_api_timeout_udp_peer2.conf
+++ b/src/transport/test_transport_api_timeout_udp_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-udp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p2/
 
 [transport-udp]
 PORT = 12050
diff --git a/src/transport/test_transport_api_timeout_unix_peer1.conf b/src/transport/test_transport_api_timeout_unix_peer1.conf
index 5d0235f73..34e6ae945 100644
--- a/src/transport/test_transport_api_timeout_unix_peer1.conf
+++ b/src/transport/test_transport_api_timeout_unix_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-unix-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p1/
 
 [arm]
 PORT = 12125
diff --git a/src/transport/test_transport_api_timeout_unix_peer2.conf b/src/transport/test_transport_api_timeout_unix_peer2.conf
index 255c7e246..d0a5c0953 100644
--- a/src/transport/test_transport_api_timeout_unix_peer2.conf
+++ b/src/transport/test_transport_api_timeout_unix_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-unix-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p2/
 
 [arm]
 PORT = 12135
diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf
index e406883e4..89e5e8d3e 100644
--- a/src/transport/test_transport_api_udp_nat_peer1.conf
+++ b/src/transport/test_transport_api_udp_nat_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-udp-nat-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-udp-nat-p1/
 
 [nat]
 BEHIND_NAT = YES
diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf
index 43ed3a91b..9f31cfa21 100644
--- a/src/transport/test_transport_api_udp_nat_peer2.conf
+++ b/src/transport/test_transport_api_udp_nat_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-udp-nat-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-udp-nat-p2/
 
 [nat]
 ALLOW_NAT = YES
diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf
index 62d201e77..046cd86ca 100644
--- a/src/transport/test_transport_api_udp_peer1.conf
+++ b/src/transport/test_transport_api_udp_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-udp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p1/
 
 [transport-udp]
 PORT = 0
diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf
index a2d5fb515..5def1dfee 100644
--- a/src/transport/test_transport_api_udp_peer2.conf
+++ b/src/transport/test_transport_api_udp_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-udp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p2/
 
 [transport-udp]
 PORT = 12050
diff --git a/src/transport/test_transport_api_unix_peer1.conf b/src/transport/test_transport_api_unix_peer1.conf
index 5d0235f73..34e6ae945 100644
--- a/src/transport/test_transport_api_unix_peer1.conf
+++ b/src/transport/test_transport_api_unix_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-unix-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p1/
 
 [arm]
 PORT = 12125
diff --git a/src/transport/test_transport_api_unix_peer2.conf b/src/transport/test_transport_api_unix_peer2.conf
index 255c7e246..d0a5c0953 100644
--- a/src/transport/test_transport_api_unix_peer2.conf
+++ b/src/transport/test_transport_api_unix_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-unix-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p2/
 
 [arm]
 PORT = 12135
diff --git a/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf b/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf
index 77d06bee4..f20b62b85 100644
--- a/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf
+++ b/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-bluetooth-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/
 
 [transport-bluetooth]
 INTERFACE = hci0
diff --git a/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf b/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf
index f5941fdae..fe2535d9f 100644
--- a/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf
+++ b/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-bluetooth-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/
 
 [transport-bluetooth]
 INTERFACE = hci1
diff --git a/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf b/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
index a4fd104ed..7fe9a0810 100644
--- a/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
+++ b/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-udp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p1/
 
 [transport-udp]
 PORT = 12040
diff --git a/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf b/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
index 755e65dce..83ecb9eb2 100644
--- a/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
+++ b/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-udp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p2/
 
 [transport-udp]
 PORT = 12050
diff --git a/src/transport/test_transport_api_unreliability_udp_peer1.conf b/src/transport/test_transport_api_unreliability_udp_peer1.conf
index b9669bf65..17c644b0b 100644
--- a/src/transport/test_transport_api_unreliability_udp_peer1.conf
+++ b/src/transport/test_transport_api_unreliability_udp_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-udp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p1/
 
 [transport-udp]
 PORT = 12040
diff --git a/src/transport/test_transport_api_unreliability_udp_peer2.conf b/src/transport/test_transport_api_unreliability_udp_peer2.conf
index 46ad0177d..220866861 100644
--- a/src/transport/test_transport_api_unreliability_udp_peer2.conf
+++ b/src/transport/test_transport_api_unreliability_udp_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-udp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p2/
 
 [transport-udp]
 PORT = 12050
diff --git a/src/transport/test_transport_api_unreliability_unix_peer1.conf b/src/transport/test_transport_api_unreliability_unix_peer1.conf
index 5d0235f73..34e6ae945 100644
--- a/src/transport/test_transport_api_unreliability_unix_peer1.conf
+++ b/src/transport/test_transport_api_unreliability_unix_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-unix-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p1/
 
 [arm]
 PORT = 12125
diff --git a/src/transport/test_transport_api_unreliability_unix_peer2.conf b/src/transport/test_transport_api_unreliability_unix_peer2.conf
index c9dab48d7..fd8a29cff 100644
--- a/src/transport/test_transport_api_unreliability_unix_peer2.conf
+++ b/src/transport/test_transport_api_unreliability_unix_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-unix-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p2/
 
 [arm]
 PORT = 12135
diff --git a/src/transport/test_transport_api_unreliability_wlan_peer1.conf b/src/transport/test_transport_api_unreliability_wlan_peer1.conf
index e81a3f9f1..d49a06b78 100644
--- a/src/transport/test_transport_api_unreliability_wlan_peer1.conf
+++ b/src/transport/test_transport_api_unreliability_wlan_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-wlan-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p1/
 
 [transport-wlan]
 TESTMODE = 1
diff --git a/src/transport/test_transport_api_unreliability_wlan_peer2.conf b/src/transport/test_transport_api_unreliability_wlan_peer2.conf
index bd5387667..137dd37ec 100644
--- a/src/transport/test_transport_api_unreliability_wlan_peer2.conf
+++ b/src/transport/test_transport_api_unreliability_wlan_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-wlan-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p2/
 
 [transport-wlan]
 INTERFACE = mon1
diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf
index 3f12ce505..68b507ad9 100644
--- a/src/transport/test_transport_api_wlan_peer1.conf
+++ b/src/transport/test_transport_api_wlan_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-wlan-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p1/
 
 [transport-wlan]
 INTERFACE = mon0
diff --git a/src/transport/test_transport_api_wlan_peer2.conf b/src/transport/test_transport_api_wlan_peer2.conf
index 451a2a666..7f18dbfb0 100644
--- a/src/transport/test_transport_api_wlan_peer2.conf
+++ b/src/transport/test_transport_api_wlan_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-wlan-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p2/
 
 [transport-wlan]
 INTERFACE = mon1
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
index 1bbaacb41..a11c6536a 100644
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
+++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
 
 [transport-tcp]
 PORT = 12000
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
index 0c2906b1f..0cf3c6c4a 100644
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
+++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
 
 [transport-tcp]
 PORT = 12000
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
index 9f112de42..be699a6c3 100644
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
+++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
 
 [transport-tcp]
 PORT = 12000
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf
index fcc35e6a7..1aefad0d9 100644
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf
+++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
 
 [transport-tcp]
 PORT = 12015
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
index 730b5df43..e0cbad2b9 100644
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
+++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
 
 [transport-tcp]
 PORT = 12015
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
index b552ef588..590b96d13 100644
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
+++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
 
 [transport-tcp]
 PORT = 12015
diff --git a/src/transport/test_transport_blacklisting_cfg_peer1.conf b/src/transport/test_transport_blacklisting_cfg_peer1.conf
index db662826b..ed11174f0 100644
--- a/src/transport/test_transport_blacklisting_cfg_peer1.conf
+++ b/src/transport/test_transport_blacklisting_cfg_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
 
 [transport-tcp]
 PORT = 12000
diff --git a/src/transport/test_transport_blacklisting_cfg_peer2.conf b/src/transport/test_transport_blacklisting_cfg_peer2.conf
index 181aab3de..0e1667b89 100644
--- a/src/transport/test_transport_blacklisting_cfg_peer2.conf
+++ b/src/transport/test_transport_blacklisting_cfg_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
 
 [transport-tcp]
 PORT = 12015
diff --git a/src/transport/test_transport_defaults.conf b/src/transport/test_transport_defaults.conf
index 48814b761..d34b60dbc 100644
--- a/src/transport/test_transport_defaults.conf
+++ b/src/transport/test_transport_defaults.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-transport-api/
+GNUNET_TEST_HOME = /tmp/test-transport-api/
 
 [transport-tcp]
 TIMEOUT = 300 s
diff --git a/src/util/program.c b/src/util/program.c
index aae58db49..73003891e 100644
--- a/src/util/program.c
+++ b/src/util/program.c
@@ -145,6 +145,8 @@ GNUNET_PROGRAM_run2 (int argc, char *const *argv, const char *binaryName,
 #endif
   char *loglev;
   char *logfile;
+  char *cfg_fn;
+  const char *xdg;
   int ret;
   unsigned int cnt;
   unsigned long long skew_offset;
@@ -195,7 +197,6 @@ GNUNET_PROGRAM_run2 (int argc, char *const *argv, const char *binaryName,
   cc.task = task;
   cc.task_cls = task_cls;
   cc.cfg = cfg = GNUNET_CONFIGURATION_create ();
-
   /* prepare */
 #if ENABLE_NLS
   setlocale (LC_ALL, "");
@@ -223,7 +224,15 @@ GNUNET_PROGRAM_run2 (int argc, char *const *argv, const char *binaryName,
   qsort (allopts, cnt, sizeof (struct GNUNET_GETOPT_CommandLineOption),
          &cmd_sorter);
   loglev = NULL;
-  cc.cfgfile = GNUNET_strdup (GNUNET_DEFAULT_USER_CONFIG_FILE);
+  xdg = getenv ("XDG_CONFIG_HOME");
+  if (NULL != xdg)
+    GNUNET_asprintf (&cfg_fn,
+                     "%s%s%s",
+                     xdg,
+                     DIR_SEPARATOR_STR,
+                     "gnunet.config");
+  else
+    cfg_fn = GNUNET_strdup (GNUNET_DEFAULT_USER_CONFIG_FILE);
   lpfx = GNUNET_strdup (binaryName);
   if (NULL != (spc = strstr (lpfx, " ")))
     *spc = '\0';
@@ -239,13 +248,15 @@ GNUNET_PROGRAM_run2 (int argc, char *const *argv, const char *binaryName,
     GNUNET_free (lpfx);
     return (ret == GNUNET_SYSERR) ? GNUNET_SYSERR : GNUNET_OK;
   }
+  if (NULL == cc.cfgfile)
+    cc.cfgfile = GNUNET_strdup (cfg_fn);
   if (GNUNET_YES ==
       GNUNET_DISK_file_test (cc.cfgfile))
     (void) GNUNET_CONFIGURATION_load (cfg, cc.cfgfile);
   else
   {
     (void) GNUNET_CONFIGURATION_load (cfg, NULL);
-    if (0 != strcmp (cc.cfgfile, GNUNET_DEFAULT_USER_CONFIG_FILE))
+    if (0 != strcmp (cc.cfgfile, cfg_fn))
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   _("Could not access configuration file `%s'\n"),
                   cc.cfgfile);
@@ -276,7 +287,8 @@ GNUNET_PROGRAM_run2 (int argc, char *const *argv, const char *binaryName,
   /* clean up */
   GNUNET_SPEEDUP_stop_ ();
   GNUNET_CONFIGURATION_destroy (cfg);
-  GNUNET_free_non_null (cc.cfgfile);
+  GNUNET_free (cc.cfgfile);
+  GNUNET_free (cfg_fn);
   GNUNET_free_non_null (loglev);
   GNUNET_free_non_null (logfile);
   return GNUNET_OK;
@@ -292,8 +304,8 @@ GNUNET_PROGRAM_run2 (int argc, char *const *argv, const char *binaryName,
  * @param binaryHelp help text for the program
  * @param options command line options
  * @param task main function to run
- * @param task_cls closure for task
- * @return GNUNET_SYSERR on error, GNUNET_OK on success
+ * @param task_cls closure for @a task
+ * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
  */
 int
 GNUNET_PROGRAM_run (int argc, char *const *argv, const char *binaryName,
diff --git a/src/util/service.c b/src/util/service.c
index d8ca5eba6..9190e0b13 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -1716,8 +1716,8 @@ pid_file_delete (struct GNUNET_SERVICE_Context *sctx)
  * @param service_name our service name
  * @param options service options
  * @param task main task of the service
- * @param task_cls closure for task
- * @return GNUNET_SYSERR on error, GNUNET_OK
+ * @param task_cls closure for @a task
+ * @return #GNUNET_SYSERR on error, #GNUNET_OK
  *         if we shutdown nicely
  */
 int
@@ -1730,6 +1730,7 @@ GNUNET_SERVICE_run (int argc, char *const *argv, const char *service_name,
   int err;
   int ret;
   char *cfg_fn;
+  char *opt_cfg_fn;
   char *loglev;
   char *logfile;
   int do_daemonize;
@@ -1739,9 +1740,10 @@ GNUNET_SERVICE_run (int argc, char *const *argv, const char *service_name,
   long long clock_offset;
   struct GNUNET_SERVICE_Context sctx;
   struct GNUNET_CONFIGURATION_Handle *cfg;
+  const char *xdg;
 
   struct GNUNET_GETOPT_CommandLineOption service_options[] = {
-    GNUNET_GETOPT_OPTION_CFG_FILE (&cfg_fn),
+    GNUNET_GETOPT_OPTION_CFG_FILE (&opt_cfg_fn),
     {'d', "daemonize", NULL,
      gettext_noop ("do daemonize (detach from terminal)"), 0,
      GNUNET_GETOPT_set_one, &do_daemonize},
@@ -1755,7 +1757,16 @@ GNUNET_SERVICE_run (int argc, char *const *argv, const char *service_name,
   do_daemonize = 0;
   logfile = NULL;
   loglev = NULL;
-  cfg_fn = GNUNET_strdup (GNUNET_DEFAULT_USER_CONFIG_FILE);
+  opt_cfg_fn = NULL;
+  xdg = getenv ("XDG_CONFIG_HOME");
+  if (NULL != xdg)
+    GNUNET_asprintf (&cfg_fn,
+                     "%s%s%s",
+                     xdg,
+                     DIR_SEPARATOR_STR,
+                     "gnunet.config");
+  else
+    cfg_fn = GNUNET_strdup (GNUNET_DEFAULT_USER_CONFIG_FILE);
   memset (&sctx, 0, sizeof (sctx));
   sctx.options = options;
   sctx.ready_confirm_fd = -1;
@@ -1777,16 +1788,18 @@ GNUNET_SERVICE_run (int argc, char *const *argv, const char *service_name,
   }
   if (GNUNET_OK != GNUNET_log_setup (service_name, loglev, logfile))
     HANDLE_ERROR;
+  if (NULL == opt_cfg_fn)
+    opt_cfg_fn = GNUNET_strdup (cfg_fn);
   if (GNUNET_YES ==
-      GNUNET_DISK_file_test (cfg_fn))
-    (void) GNUNET_CONFIGURATION_load (cfg, cfg_fn);
+      GNUNET_DISK_file_test (opt_cfg_fn))
+    (void) GNUNET_CONFIGURATION_load (cfg, opt_cfg_fn);
   else
   {
     (void) GNUNET_CONFIGURATION_load (cfg, NULL);
-    if (0 != strcmp (cfg_fn, GNUNET_DEFAULT_USER_CONFIG_FILE))
+    if (0 != strcmp (opt_cfg_fn, cfg_fn))
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   _("Could not access configuration file `%s'\n"),
-                  cfg_fn);
+                  opt_cfg_fn);
   }
   if (GNUNET_OK != setup_service (&sctx))
     goto shutdown;
@@ -1795,7 +1808,9 @@ GNUNET_SERVICE_run (int argc, char *const *argv, const char *service_name,
   if (GNUNET_OK != set_user_id (&sctx))
     goto shutdown;
   LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Service `%s' runs with configuration from `%s'\n", service_name, cfg_fn);
+       "Service `%s' runs with configuration from `%s'\n",
+       service_name,
+       opt_cfg_fn);
   if ((GNUNET_OK ==
        GNUNET_CONFIGURATION_get_value_number (sctx.cfg, "TESTING",
                                               "SKEW_OFFSET", &skew_offset)) &&
@@ -1853,6 +1868,7 @@ shutdown:
   GNUNET_free_non_null (logfile);
   GNUNET_free_non_null (loglev);
   GNUNET_free (cfg_fn);
+  GNUNET_free (opt_cfg_fn);
   GNUNET_free_non_null (sctx.v4_denied);
   GNUNET_free_non_null (sctx.v6_denied);
   GNUNET_free_non_null (sctx.v4_allowed);
diff --git a/src/util/test_resolver_api_data.conf b/src/util/test_resolver_api_data.conf
index 3e264ebb7..42b36d66a 100644
--- a/src/util/test_resolver_api_data.conf
+++ b/src/util/test_resolver_api_data.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-statistics/
+GNUNET_TEST_HOME = /tmp/test-gnunetd-statistics/
 
 [resolver]
 PORT = 22354
diff --git a/src/util/util.conf b/src/util/util.conf
index b7f9deb04..7a4d3c704 100644
--- a/src/util/util.conf
+++ b/src/util/util.conf
@@ -5,7 +5,10 @@
 # defaults with the syntax "${VAR:-default}".  Here, "default" can again
 # be a $-expression.
 #
-GNUNET_HOME = $HOME
+# We usually want $HOME for $GNUNET_HOME, but we allow testcases to
+# easily override this by setting $GNUNET_TEST_HOME.
+#
+GNUNET_HOME = ${GNUNET_TEST_HOME:-$HOME}
 
 # see XDG Base Directory Specification at
 # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
@@ -24,8 +27,8 @@ GNUNET_CACHE_HOME = ${XDG_CACHE_HOME:-$GNUNET_HOME/.cache/}gnunet/
 GNUNET_RUNTIME_DIR = ${XDG_RUNTIME_DIR:-${TMPDIR:-${TMP:-/tmp}}}gnunet/
 
 # Legacy option...
-SERVICEHOME = ~/.gnunet/
-# SERVICEHOME = /var/lib/gnunet/
+GNUNET_TEST_HOME = ~/.gnunet/
+# GNUNET_TEST_HOME = /var/lib/gnunet/
 
 # DEFAULTCONFIG = /etc/gnunet.conf
 # If 'DEFAULTCONFIG' is not defined, the current