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

105 files changed, 114 insertions, 121 deletions

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