gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [gnunet] branch master updated: Switch to $GNUNET_TMP in al


From: gnunet
Subject: [GNUnet-SVN] [gnunet] branch master updated: Switch to $GNUNET_TMP in all configuration files.
Date: Sun, 06 May 2018 21:03:18 +0200

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 9fbda6db6 Switch to $GNUNET_TMP in all configuration files.
     new f13af7e72 Merge branch 'master' of gnunet.org:gnunet
9fbda6db6 is described below

commit 9fbda6db66bf8dc074de6c8792f369801e4e5999
Author: Nils Gillmann <address@hidden>
AuthorDate: Sun May 6 19:00:22 2018 +0000

    Switch to $GNUNET_TMP in all configuration files.
    
    Signed-off-by: Nils Gillmann <address@hidden>
---
 contrib/experiments/nse/infiniband.conf                             | 6 +++---
 contrib/testbed_configs/regex_profiler_infiniband.conf              | 2 +-
 contrib/testbed_configs/testbed_cluster.conf                        | 4 ++--
 contrib/testbed_configs/testbed_infiniband.conf                     | 4 ++--
 contrib/testbed_configs/testbed_supermuc.conf                       | 4 ++--
 src/arm/test_arm_api_data.conf                                      | 2 +-
 src/ats/test_ats_api.conf                                           | 2 +-
 src/ats/test_ats_api_delayed.conf                                   | 2 +-
 src/ats/test_ats_api_mlp.conf                                       | 2 +-
 src/ats/test_ats_api_proportional.conf                              | 2 +-
 src/ats/test_ats_api_ril.conf                                       | 2 +-
 src/ats/test_ats_mlp.conf                                           | 2 +-
 src/cadet/test_cadet.conf                                           | 2 +-
 src/consensus/test_consensus.conf                                   | 2 +-
 src/core/test_core_api_peer1.conf                                   | 2 +-
 src/core/test_core_api_peer2.conf                                   | 2 +-
 src/core/test_core_defaults.conf                                    | 2 +-
 src/core/test_core_quota_asymmetric_recv_limited_peer1.conf         | 2 +-
 src/core/test_core_quota_asymmetric_recv_limited_peer2.conf         | 2 +-
 src/core/test_core_quota_asymmetric_send_limit_peer1.conf           | 2 +-
 src/core/test_core_quota_asymmetric_send_limit_peer2.conf           | 2 +-
 src/core/test_core_quota_peer1.conf                                 | 2 +-
 src/core/test_core_quota_peer2.conf                                 | 2 +-
 src/credential/test_credential_defaults.conf                        | 2 +-
 src/credential/test_credential_lookup.conf                          | 6 +++---
 src/datastore/perf_plugin_datastore_data_heap.conf                  | 2 +-
 src/datastore/perf_plugin_datastore_data_mysql.conf                 | 2 +-
 src/datastore/perf_plugin_datastore_data_postgres.conf              | 2 +-
 src/datastore/perf_plugin_datastore_data_sqlite.conf                | 2 +-
 src/datastore/test_datastore_api_data_heap.conf                     | 2 +-
 src/datastore/test_datastore_api_data_mysql.conf                    | 2 +-
 src/datastore/test_datastore_api_data_postgres.conf                 | 2 +-
 src/datastore/test_datastore_api_data_sqlite.conf                   | 2 +-
 src/datastore/test_plugin_datastore_data_heap.conf                  | 2 +-
 src/datastore/test_plugin_datastore_data_mysql.conf                 | 2 +-
 src/datastore/test_plugin_datastore_data_postgres.conf              | 2 +-
 src/datastore/test_plugin_datastore_data_sqlite.conf                | 2 +-
 src/dht/test_dht_2dtorus.conf                                       | 2 +-
 src/dht/test_dht_api_data.conf                                      | 2 +-
 src/dht/test_dht_api_peer1.conf                                     | 2 +-
 src/dht/test_dht_line.conf                                          | 2 +-
 src/dht/test_dht_monitor.conf                                       | 2 +-
 src/dht/test_dht_multipeer.conf                                     | 2 +-
 src/dht/test_dht_tools.conf                                         | 2 +-
 src/dv/template_dv.conf                                             | 2 +-
 src/fs/fs_test_lib_data.conf                                        | 2 +-
 src/fs/perf_gnunet_service_fs_p2p.conf                              | 2 +-
 src/fs/test_fs_data.conf                                            | 2 +-
 src/fs/test_fs_defaults.conf                                        | 2 +-
 src/fs/test_fs_download_data.conf                                   | 2 +-
 src/fs/test_fs_download_indexed.conf                                | 2 +-
 src/fs/test_fs_file_information_data.conf                           | 2 +-
 src/fs/test_fs_list_indexed_data.conf                               | 2 +-
 src/fs/test_fs_namespace_data.conf                                  | 2 +-
 src/fs/test_fs_publish_data.conf                                    | 2 +-
 src/fs/test_fs_search_data.conf                                     | 2 +-
 src/fs/test_fs_unindex_data.conf                                    | 2 +-
 src/fs/test_gnunet_fs_idx_data.conf                                 | 2 +-
 src/fs/test_gnunet_fs_psd_data.conf                                 | 2 +-
 src/fs/test_gnunet_fs_rec_data.conf                                 | 2 +-
 src/fs/test_gnunet_service_fs_migration_data.conf                   | 2 +-
 src/gns/test_gns_defaults.conf                                      | 2 +-
 src/gns/test_gns_lookup.conf                                        | 2 +-
 src/gns/test_gns_nick_shorten.conf                                  | 2 +-
 src/gns/test_gns_proxy.conf                                         | 2 +-
 src/gns/test_gns_simple_lookup.conf                                 | 2 +-
 src/hostlist/test_gnunet_daemon_hostlist_peer1.conf                 | 2 +-
 src/hostlist/test_gnunet_daemon_hostlist_peer2.conf                 | 2 +-
 src/hostlist/test_hostlist_defaults.conf                            | 2 +-
 src/hostlist/test_learning_adv_peer.conf                            | 2 +-
 src/hostlist/test_learning_learn_peer.conf                          | 2 +-
 src/hostlist/test_learning_learn_peer2.conf                         | 2 +-
 src/identity-provider/test_idp.conf                                 | 6 +++---
 src/identity-provider/test_idp_defaults.conf                        | 2 +-
 src/identity/test_identity.conf                                     | 4 ++--
 src/integration-tests/confs/c_bootstrap_server.conf                 | 2 +-
 src/integration-tests/confs/c_nat_client.conf                       | 2 +-
 src/integration-tests/confs/c_no_nat_client.conf                    | 2 +-
 src/integration-tests/confs/c_no_nat_client_2.conf                  | 2 +-
 src/namecache/test_namecache_api.conf                               | 2 +-
 src/namecache/test_plugin_namecache_flat.conf                       | 2 +-
 src/namecache/test_plugin_namecache_sqlite.conf                     | 2 +-
 src/namestore/test_namestore_api.conf                               | 2 +-
 src/namestore/test_plugin_namestore_flat.conf                       | 2 +-
 src/namestore/test_plugin_namestore_sqlite.conf                     | 2 +-
 src/nat/test_nat_data.conf                                          | 2 +-
 src/nat/test_nat_test_data.conf                                     | 2 +-
 src/nat/test_stun.conf                                              | 2 +-
 src/nse/nse_infiniband.conf                                         | 2 +-
 src/nse/nse_profiler_test.conf                                      | 2 +-
 src/nse/test_nse.conf                                               | 2 +-
 src/peerinfo-tool/test_gnunet_peerinfo_data.conf                    | 2 +-
 src/peerinfo/test_peerinfo_api_data.conf                            | 2 +-
 src/peerstore/test_peerstore_api_data.conf                          | 4 ++--
 src/peerstore/test_plugin_peerstore_flat.conf                       | 2 +-
 src/peerstore/test_plugin_peerstore_sqlite.conf                     | 2 +-
 src/psycstore/test_plugin_psycstore_sqlite.conf                     | 2 +-
 src/psycstore/test_psycstore.conf                                   | 2 +-
 src/pt/test_gns_vpn.conf                                            | 2 +-
 src/pt/test_gnunet_vpn.conf                                         | 2 +-
 src/regex/test_regex_api_data.conf                                  | 2 +-
 src/revocation/test_revocation.conf                                 | 4 ++--
 src/rps/test_rps.conf                                               | 2 +-
 src/scalarproduct/test_scalarproduct.conf                           | 2 +-
 src/set/test_set.conf                                               | 2 +-
 src/social/test_social.conf                                         | 2 +-
 src/statistics/test_statistics_api_data.conf                        | 2 +-
 src/testbed-logger/test_testbed_logger_api.conf                     | 4 ++--
 src/testbed-logger/testbed-logger.conf.in                           | 2 +-
 src/testbed/test_testbed_api_barriers.conf.in                       | 2 +-
 src/testbed/test_testbed_api_template.conf                          | 2 +-
 src/testing/test_testing_defaults.conf                              | 2 +-
 src/testing/test_testing_sharedservices.conf                        | 4 ++--
 src/topology/test_gnunet_daemon_topology_data.conf                  | 2 +-
 src/transport/perf_http_peer1.conf                                  | 2 +-
 src/transport/perf_http_peer2.conf                                  | 2 +-
 src/transport/perf_https_peer1.conf                                 | 2 +-
 src/transport/perf_https_peer2.conf                                 | 2 +-
 src/transport/perf_tcp_peer1.conf                                   | 2 +-
 src/transport/perf_tcp_peer2.conf                                   | 2 +-
 src/transport/perf_udp_peer1.conf                                   | 2 +-
 src/transport/perf_udp_peer2.conf                                   | 2 +-
 src/transport/perf_unix_peer1.conf                                  | 2 +-
 src/transport/perf_unix_peer2.conf                                  | 2 +-
 src/transport/template_cfg_peer1.conf                               | 2 +-
 src/transport/template_cfg_peer2.conf                               | 2 +-
 src/transport/test_plugin_transport_data.conf                       | 2 +-
 src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf | 2 +-
 src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf | 2 +-
 src/transport/test_quota_compliance_bluetooth_peer1.conf            | 2 +-
 src/transport/test_quota_compliance_bluetooth_peer2.conf            | 2 +-
 src/transport/test_quota_compliance_data.conf                       | 2 +-
 src/transport/test_quota_compliance_http_asymmetric_peer1.conf      | 2 +-
 src/transport/test_quota_compliance_http_asymmetric_peer2.conf      | 2 +-
 src/transport/test_quota_compliance_http_peer1.conf                 | 2 +-
 src/transport/test_quota_compliance_http_peer2.conf                 | 2 +-
 src/transport/test_quota_compliance_https_asymmetric_peer1.conf     | 2 +-
 src/transport/test_quota_compliance_https_asymmetric_peer2.conf     | 2 +-
 src/transport/test_quota_compliance_https_peer1.conf                | 2 +-
 src/transport/test_quota_compliance_https_peer2.conf                | 2 +-
 src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf       | 2 +-
 src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf       | 2 +-
 src/transport/test_quota_compliance_tcp_peer1.conf                  | 2 +-
 src/transport/test_quota_compliance_tcp_peer2.conf                  | 2 +-
 src/transport/test_quota_compliance_udp_peer1.conf                  | 2 +-
 src/transport/test_quota_compliance_udp_peer2.conf                  | 2 +-
 src/transport/test_quota_compliance_unix_asymmetric_peer1.conf      | 2 +-
 src/transport/test_quota_compliance_unix_asymmetric_peer2.conf      | 2 +-
 src/transport/test_quota_compliance_unix_peer1.conf                 | 2 +-
 src/transport/test_quota_compliance_unix_peer2.conf                 | 2 +-
 src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf      | 2 +-
 src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf      | 2 +-
 src/transport/test_quota_compliance_wlan_peer1.conf                 | 2 +-
 src/transport/test_quota_compliance_wlan_peer2.conf                 | 2 +-
 src/transport/test_transport_address_switch_http_peer1.conf         | 2 +-
 src/transport/test_transport_address_switch_http_peer2.conf         | 2 +-
 src/transport/test_transport_address_switch_https_peer1.conf        | 2 +-
 src/transport/test_transport_address_switch_https_peer2.conf        | 2 +-
 src/transport/test_transport_address_switch_tcp_peer1.conf          | 2 +-
 src/transport/test_transport_address_switch_tcp_peer2.conf          | 2 +-
 src/transport/test_transport_address_switch_udp_peer1.conf          | 2 +-
 src/transport/test_transport_address_switch_udp_peer2.conf          | 2 +-
 src/transport/test_transport_api_blacklisting_tcp_peer1.conf        | 2 +-
 src/transport/test_transport_api_blacklisting_tcp_peer2.conf        | 2 +-
 src/transport/test_transport_api_bluetooth_peer1.conf               | 2 +-
 src/transport/test_transport_api_bluetooth_peer2.conf               | 2 +-
 src/transport/test_transport_api_disconnect_tcp_peer1.conf          | 2 +-
 src/transport/test_transport_api_disconnect_tcp_peer2.conf          | 2 +-
 src/transport/test_transport_api_http_peer1.conf                    | 2 +-
 src/transport/test_transport_api_http_peer2.conf                    | 2 +-
 src/transport/test_transport_api_http_reverse_peer1.conf            | 2 +-
 src/transport/test_transport_api_http_reverse_peer2.conf            | 2 +-
 src/transport/test_transport_api_https_peer1.conf                   | 2 +-
 src/transport/test_transport_api_https_peer2.conf                   | 2 +-
 src/transport/test_transport_api_limited_sockets_tcp_peer1.conf     | 2 +-
 src/transport/test_transport_api_limited_sockets_tcp_peer2.conf     | 2 +-
 src/transport/test_transport_api_manipulation_cfg_peer1.conf        | 2 +-
 src/transport/test_transport_api_manipulation_cfg_peer2.conf        | 2 +-
 src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf   | 2 +-
 src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf   | 2 +-
 src/transport/test_transport_api_manipulation_send_tcp_peer1.conf   | 2 +-
 src/transport/test_transport_api_manipulation_send_tcp_peer2.conf   | 2 +-
 src/transport/test_transport_api_monitor_peers_peer1.conf           | 2 +-
 src/transport/test_transport_api_monitor_peers_peer2.conf           | 2 +-
 src/transport/test_transport_api_monitor_validation_peer1.conf      | 2 +-
 src/transport/test_transport_api_monitor_validation_peer2.conf      | 2 +-
 src/transport/test_transport_api_multi_peer1.conf                   | 2 +-
 src/transport/test_transport_api_multi_peer2.conf                   | 2 +-
 src/transport/test_transport_api_reliability_bluetooth_peer1.conf   | 2 +-
 src/transport/test_transport_api_reliability_bluetooth_peer2.conf   | 2 +-
 src/transport/test_transport_api_reliability_http_peer1.conf        | 2 +-
 src/transport/test_transport_api_reliability_http_peer2.conf        | 2 +-
 src/transport/test_transport_api_reliability_http_xhr_peer1.conf    | 2 +-
 src/transport/test_transport_api_reliability_http_xhr_peer2.conf    | 2 +-
 src/transport/test_transport_api_reliability_https_peer1.conf       | 2 +-
 src/transport/test_transport_api_reliability_https_peer2.conf       | 2 +-
 src/transport/test_transport_api_reliability_https_xhr_peer1.conf   | 2 +-
 src/transport/test_transport_api_reliability_https_xhr_peer2.conf   | 2 +-
 src/transport/test_transport_api_reliability_tcp_nat_peer1.conf     | 2 +-
 src/transport/test_transport_api_reliability_tcp_nat_peer2.conf     | 2 +-
 src/transport/test_transport_api_reliability_tcp_peer1.conf         | 2 +-
 src/transport/test_transport_api_reliability_tcp_peer2.conf         | 2 +-
 src/transport/test_transport_api_reliability_udp_peer1.conf         | 2 +-
 src/transport/test_transport_api_reliability_udp_peer2.conf         | 2 +-
 src/transport/test_transport_api_reliability_unix_peer1.conf        | 2 +-
 src/transport/test_transport_api_reliability_unix_peer2.conf        | 2 +-
 src/transport/test_transport_api_reliability_wlan_peer1.conf        | 2 +-
 src/transport/test_transport_api_reliability_wlan_peer2.conf        | 2 +-
 src/transport/test_transport_api_restart_1peer_peer1.conf           | 2 +-
 src/transport/test_transport_api_restart_1peer_peer2.conf           | 2 +-
 src/transport/test_transport_api_restart_2peers_peer1.conf          | 2 +-
 src/transport/test_transport_api_restart_2peers_peer2.conf          | 2 +-
 src/transport/test_transport_api_slow_ats_peer1.conf                | 2 +-
 src/transport/test_transport_api_slow_ats_peer2.conf                | 2 +-
 src/transport/test_transport_api_tcp_nat_peer1.conf                 | 2 +-
 src/transport/test_transport_api_tcp_nat_peer2.conf                 | 2 +-
 src/transport/test_transport_api_tcp_peer1.conf                     | 2 +-
 src/transport/test_transport_api_tcp_peer2.conf                     | 2 +-
 src/transport/test_transport_api_timeout_bluetooth_peer1.conf       | 2 +-
 src/transport/test_transport_api_timeout_bluetooth_peer2.conf       | 2 +-
 src/transport/test_transport_api_timeout_http_peer1.conf            | 2 +-
 src/transport/test_transport_api_timeout_http_peer2.conf            | 2 +-
 src/transport/test_transport_api_timeout_https_peer1.conf           | 2 +-
 src/transport/test_transport_api_timeout_https_peer2.conf           | 2 +-
 src/transport/test_transport_api_timeout_tcp_peer1.conf             | 2 +-
 src/transport/test_transport_api_timeout_tcp_peer2.conf             | 2 +-
 src/transport/test_transport_api_timeout_udp_peer1.conf             | 2 +-
 src/transport/test_transport_api_timeout_udp_peer2.conf             | 2 +-
 src/transport/test_transport_api_timeout_unix_peer1.conf            | 2 +-
 src/transport/test_transport_api_timeout_unix_peer2.conf            | 2 +-
 src/transport/test_transport_api_timeout_wlan_peer1.conf            | 2 +-
 src/transport/test_transport_api_timeout_wlan_peer2.conf            | 2 +-
 src/transport/test_transport_api_udp_nat_peer1.conf                 | 2 +-
 src/transport/test_transport_api_udp_nat_peer2.conf                 | 2 +-
 src/transport/test_transport_api_udp_peer1.conf                     | 2 +-
 src/transport/test_transport_api_udp_peer2.conf                     | 2 +-
 src/transport/test_transport_api_unix_abstract_peer1.conf           | 2 +-
 src/transport/test_transport_api_unix_abstract_peer2.conf           | 2 +-
 src/transport/test_transport_api_unix_peer1.conf                    | 2 +-
 src/transport/test_transport_api_unix_peer2.conf                    | 2 +-
 src/transport/test_transport_api_unreliability_bluetooth_peer1.conf | 2 +-
 src/transport/test_transport_api_unreliability_bluetooth_peer2.conf | 2 +-
 .../test_transport_api_unreliability_constant_udp_peer1.conf        | 2 +-
 .../test_transport_api_unreliability_constant_udp_peer2.conf        | 2 +-
 src/transport/test_transport_api_unreliability_wlan_peer1.conf      | 2 +-
 src/transport/test_transport_api_unreliability_wlan_peer2.conf      | 2 +-
 src/transport/test_transport_api_wlan_peer1.conf                    | 2 +-
 src/transport/test_transport_api_wlan_peer2.conf                    | 2 +-
 src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf   | 2 +-
 .../test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf | 2 +-
 src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf | 2 +-
 src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf   | 2 +-
 .../test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf | 2 +-
 src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf | 2 +-
 src/transport/test_transport_blacklisting_cfg_peer1.conf            | 2 +-
 src/transport/test_transport_blacklisting_cfg_peer2.conf            | 2 +-
 src/transport/test_transport_defaults.conf                          | 2 +-
 .../test_transport_test_transport_address_switch_tcp_peer1.conf     | 2 +-
 .../test_transport_test_transport_address_switch_tcp_peer2.conf     | 2 +-
 src/util/test_configuration_data.conf                               | 2 +-
 src/util/test_resolver_api_data.conf                                | 2 +-
 src/util/test_service_data.conf                                     | 4 ++--
 262 files changed, 277 insertions(+), 277 deletions(-)

diff --git a/contrib/experiments/nse/infiniband.conf 
b/contrib/experiments/nse/infiniband.conf
index e42baba95..c7b7f2a59 100644
--- a/contrib/experiments/nse/infiniband.conf
+++ b/contrib/experiments/nse/infiniband.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/nse-profiler/
+SERVICEHOME = $GNUNET_TMP/nse-profiler/
 
 [testbed]
 AUTOSTART = NO
@@ -13,7 +13,7 @@ OPERATION_TIMEOUT = 45 s
 
 [nse]
 PORT = 12114
-UNIXPATH = /tmp/test-nse-service-nse.unix
+UNIXPATH = $GNUNET_TMP/test-nse-service-nse.unix
 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
@@ -26,7 +26,7 @@ WORKBITS = 0
 PROOFFILE = $SERVICEHOME/nse.proof
 
 [arm]
-UNIXPATH = /tmp/test-nse-service-arm.unix
+UNIXPATH = $GNUNET_TMP/test-nse-service-arm.unix
 
 [statistics]
 AUTOSTART = YES
diff --git a/contrib/testbed_configs/regex_profiler_infiniband.conf 
b/contrib/testbed_configs/regex_profiler_infiniband.conf
index 206423011..831ee0f76 100644
--- a/contrib/testbed_configs/regex_profiler_infiniband.conf
+++ b/contrib/testbed_configs/regex_profiler_infiniband.conf
@@ -86,7 +86,7 @@ USE_PROGRESSBARS = YES
 PEERGROUP_TIMEOUT = 2400 s
 
 [PATHS]
-SERVICEHOME = /tmp/perf-regex/
+SERVICEHOME = $GNUNET_TMP/perf-regex/
 
 [dns]
 AUTOSTART = NO
diff --git a/contrib/testbed_configs/testbed_cluster.conf 
b/contrib/testbed_configs/testbed_cluster.conf
index 6d646a0ce..f92e4d721 100644
--- a/contrib/testbed_configs/testbed_cluster.conf
+++ b/contrib/testbed_configs/testbed_cluster.conf
@@ -6,7 +6,7 @@ HOSTNAME = localhost
 OVERLAY_TOPOLOGY = RANDOM
 OVERLAY_RANDOM_LINKS = 10000
 OPERATION_TIMEOUT = 45 s
-# LOG_FILE = /tmp/testbed.log
+# LOG_FILE = $GNUNET_TMP/testbed.log
 SETUP_TIMEOUT = 30m
 MAX_OPEN_FDS = 512
 
@@ -55,7 +55,7 @@ PORT = 12368
 BROADCAST = NO
 
 [PATHS]
-SERVICEHOME = /tmp/test-testbed/
+SERVICEHOME = $GNUNET_TMP/test-testbed/
 
 [dns]
 AUTOSTART = NO
diff --git a/contrib/testbed_configs/testbed_infiniband.conf 
b/contrib/testbed_configs/testbed_infiniband.conf
index 7ad50d77a..c87f56eef 100644
--- a/contrib/testbed_configs/testbed_infiniband.conf
+++ b/contrib/testbed_configs/testbed_infiniband.conf
@@ -6,7 +6,7 @@ HOSTNAME = localhost
 OVERLAY_TOPOLOGY = RANDOM
 OVERLAY_RANDOM_LINKS = 1000
 OPERATION_TIMEOUT = 45 s
-# LOG_FILE = /tmp/testbed.log
+# LOG_FILE = $GNUNET_TMP/testbed.log
 SETUP_TIMEOUT = 30m
 MAX_OPEN_FDS = 512
 
@@ -55,7 +55,7 @@ PORT = 12368
 BROADCAST = NO
 
 [PATHS]
-SERVICEHOME = /tmp/test-testbed/
+SERVICEHOME = $GNUNET_TMP/test-testbed/
 
 [dns]
 AUTOSTART = NO
diff --git a/contrib/testbed_configs/testbed_supermuc.conf 
b/contrib/testbed_configs/testbed_supermuc.conf
index 35c6e0789..4603b1fe3 100644
--- a/contrib/testbed_configs/testbed_supermuc.conf
+++ b/contrib/testbed_configs/testbed_supermuc.conf
@@ -8,7 +8,7 @@ MAX_PARALLEL_OPERATIONS = 500
 OVERLAY_TOPOLOGY = 2D_TORUS
 OVERLAY_RANDOM_LINKS = 4000
 OPERATION_TIMEOUT = 10 s
-# LOG_FILE = /tmp/testbed.log
+# LOG_FILE = $GNUNET_TMP/testbed.log
 #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
 MAX_OPEN_FDS=512
 SETUP_TIMEOUT = 30 m
@@ -59,7 +59,7 @@ PORT = 12368
 BROADCAST = NO
 
 [PATHS]
-SERVICEHOME = /tmp/test-testbed/
+SERVICEHOME = $GNUNET_TMP/test-testbed/
 
 [nat]
 BEHIND_NAT = NO
diff --git a/src/arm/test_arm_api_data.conf b/src/arm/test_arm_api_data.conf
index 14d5b8fc1..57799ccc8 100644
--- a/src/arm/test_arm_api_data.conf
+++ b/src/arm/test_arm_api_data.conf
@@ -2,7 +2,7 @@
 @INLINE@ ../../contrib/no_autostart_above_core.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-arm/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-arm/
 
 [arm]
 BINARY = gnunet-service-arm
diff --git a/src/ats/test_ats_api.conf b/src/ats/test_ats_api.conf
index dedc92bae..e0cb495c8 100644
--- a/src/ats/test_ats_api.conf
+++ b/src/ats/test_ats_api.conf
@@ -1,7 +1,7 @@
 @INLINE@ ../../contrib/no_forcestart.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-ats-api-scheduling/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-ats-api-scheduling/
 
 [ats]
 # Enable MLP mode (default: NO)
diff --git a/src/ats/test_ats_api_delayed.conf 
b/src/ats/test_ats_api_delayed.conf
index 174b87bc6..f4d771448 100644
--- a/src/ats/test_ats_api_delayed.conf
+++ b/src/ats/test_ats_api_delayed.conf
@@ -1,7 +1,7 @@
 @INLINE@ ../../contrib/no_forcestart.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-ats-api-scheduling/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-ats-api-scheduling/
 
 [ats]
 PREFIX = ./test_delay -t 10 --
diff --git a/src/ats/test_ats_api_mlp.conf b/src/ats/test_ats_api_mlp.conf
index cabd5e71c..6a8e24177 100644
--- a/src/ats/test_ats_api_mlp.conf
+++ b/src/ats/test_ats_api_mlp.conf
@@ -1,7 +1,7 @@
 @INLINE@ ../../contrib/no_forcestart.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-ats-mlp/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-ats-mlp/
 
 [ats]
 # Enable MLP mode (default: NO)
diff --git a/src/ats/test_ats_api_proportional.conf 
b/src/ats/test_ats_api_proportional.conf
index 4f277e79f..e121c14ea 100644
--- a/src/ats/test_ats_api_proportional.conf
+++ b/src/ats/test_ats_api_proportional.conf
@@ -1,7 +1,7 @@
 @INLINE@ ../../contrib/no_forcestart.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-ats-proportional/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-ats-proportional/
 
 [ats]
 # Enable PROPORTIONAL mode (default: NO)
diff --git a/src/ats/test_ats_api_ril.conf b/src/ats/test_ats_api_ril.conf
index 0a424c458..d6f4f6101 100644
--- a/src/ats/test_ats_api_ril.conf
+++ b/src/ats/test_ats_api_ril.conf
@@ -1,7 +1,7 @@
 @INLINE@ ../../contrib/no_forcestart.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-ats-ril/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-ats-ril/
 
 [ats]
 # Enable RIL mode (default: NO)
diff --git a/src/ats/test_ats_mlp.conf b/src/ats/test_ats_mlp.conf
index 51082ae93..7d7bfcebd 100644
--- a/src/ats/test_ats_mlp.conf
+++ b/src/ats/test_ats_mlp.conf
@@ -1,5 +1,5 @@
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-ats-mlp/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-ats-mlp/
 
 [ats]
 # Enable MLP mode (default: NO)
diff --git a/src/cadet/test_cadet.conf b/src/cadet/test_cadet.conf
index b6e6c6ae3..f2308df29 100644
--- a/src/cadet/test_cadet.conf
+++ b/src/cadet/test_cadet.conf
@@ -59,7 +59,7 @@ BLUETOOTH_QUOTA_OUT = unlimited
 USE_EPHEMERAL_KEYS = NO
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-cadet/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-cadet/
 
 [peerinfo]
 NO_IO = YES
diff --git a/src/consensus/test_consensus.conf 
b/src/consensus/test_consensus.conf
index f78b77d09..6cb0885b0 100644
--- a/src/consensus/test_consensus.conf
+++ b/src/consensus/test_consensus.conf
@@ -1,5 +1,5 @@
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-consensus/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-consensus/
 
 [consensus]
 #OPTIONS = -L INFO
diff --git a/src/core/test_core_api_peer1.conf 
b/src/core/test_core_api_peer1.conf
index 3bbd03092..28463effe 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]
-GNUNET_TEST_HOME = /tmp/test-gnunet-core-peer-1/
+GNUNET_TEST_HOME = $GNUNET_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 739b6b1a1..819d58d17 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]
-GNUNET_TEST_HOME = /tmp/test-gnunet-core-peer-2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-core-peer-2/
 
 [arm]
 PORT = 22460
diff --git a/src/core/test_core_defaults.conf b/src/core/test_core_defaults.conf
index 4c956987c..669dd2a9c 100644
--- a/src/core/test_core_defaults.conf
+++ b/src/core/test_core_defaults.conf
@@ -2,7 +2,7 @@
 @INLINE@ ../../contrib/no_autostart_above_core.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-core/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-core/
 
 [nat]
 ENABLE_UPNP = NO
diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf 
b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
index 713854aff..fa2d64474 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]
-GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/
+GNUNET_TEST_HOME = $GNUNET_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 134f921b6..b2a84f706 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]
-GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/
+GNUNET_TEST_HOME = $GNUNET_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 97f485225..6b416f580 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]
-GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-1/
+GNUNET_TEST_HOME = $GNUNET_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 ce1fcda14..05ea062e6 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]
-GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-2/
+GNUNET_TEST_HOME = $GNUNET_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 1807c763a..ea4fa273c 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]
-GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-sym-peer-1/
+GNUNET_TEST_HOME = $GNUNET_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 122b00eec..03c684cff 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]
-GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-sym-peer-2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-core-quota-sym-peer-2/
 
 [arm]
 PORT = 22476
diff --git a/src/credential/test_credential_defaults.conf 
b/src/credential/test_credential_defaults.conf
index d157ddd43..328846a10 100644
--- a/src/credential/test_credential_defaults.conf
+++ b/src/credential/test_credential_defaults.conf
@@ -1,7 +1,7 @@
 @INLINE@ ../../contrib/no_forcestart.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-credential-testing/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-credential-testing/
 
 [namestore-sqlite]
 FILENAME = $GNUNET_TEST_HOME/namestore/sqlite_test.db
diff --git a/src/credential/test_credential_lookup.conf 
b/src/credential/test_credential_lookup.conf
index 3684063b1..bd464a1f4 100644
--- a/src/credential/test_credential_lookup.conf
+++ b/src/credential/test_credential_lookup.conf
@@ -1,7 +1,7 @@
 @INLINE@ test_credential_defaults.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-credential-peer-1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-credential-peer-1/
 
 [dht]
 AUTOSTART = YES
@@ -11,10 +11,10 @@ PLUGINS =
 
 [credential]
 AUTOSTART = YES
-PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=/tmp/credlog
+PREFIX = valgrind --leak-check=full --track-origins=yes 
--log-file=$GNUNET_TMP/credlog
 
 [rest]
-PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=/tmp/restlog
+PREFIX = valgrind --leak-check=full --track-origins=yes 
--log-file=$GNUNET_TMP/restlog
 
 [gns]
 #PREFIX = valgrind --leak-check=full --track-origins=yes
diff --git a/src/datastore/perf_plugin_datastore_data_heap.conf 
b/src/datastore/perf_plugin_datastore_data_heap.conf
index 6f9c701ba..873cf9606 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]
-GNUNET_TEST_HOME = /tmp/perf-gnunet-datastore-heap/
+GNUNET_TEST_HOME = $GNUNET_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 9d7330462..a32b830c3 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]
-GNUNET_TEST_HOME = /tmp/perf-gnunet-datastore-mysql/
+GNUNET_TEST_HOME = $GNUNET_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 ee7c180dc..7683887a8 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]
-GNUNET_TEST_HOME = /tmp/perf-gnunet-datastore-postgres/
+GNUNET_TEST_HOME = $GNUNET_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 756b44c5c..888e020a6 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]
-GNUNET_TEST_HOME = /tmp/perf-gnunet-datastore-sqlite/
+GNUNET_TEST_HOME = $GNUNET_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 847f41907..6f11fb3f7 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]
-GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-heap/
+GNUNET_TEST_HOME = $GNUNET_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 de6fff7ab..c0052c5ea 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]
-GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-mysql/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-datastore-mysql/
 
 [datastore]
 QUOTA = 10 MB
diff --git a/src/datastore/test_datastore_api_data_postgres.conf 
b/src/datastore/test_datastore_api_data_postgres.conf
index f436530d2..65fe11806 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]
-GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-postgres/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-datastore-postgres/
 
 [datastore]
 QUOTA = 10 MB
diff --git a/src/datastore/test_datastore_api_data_sqlite.conf 
b/src/datastore/test_datastore_api_data_sqlite.conf
index 894945586..ecdd0c6ee 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]
-GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-sqlite/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-datastore-sqlite/
 
 [datastore]
 QUOTA = 10 MB
diff --git a/src/datastore/test_plugin_datastore_data_heap.conf 
b/src/datastore/test_plugin_datastore_data_heap.conf
index c91bff764..b1ea8ff67 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]
-GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-plugin-heap/
+GNUNET_TEST_HOME = $GNUNET_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 18eda687e..07d3ec58e 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]
-GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-plugin-mysql/
+GNUNET_TEST_HOME = $GNUNET_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 bebc97e85..d0e29437f 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]
-GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-plugin-postgres/
+GNUNET_TEST_HOME = $GNUNET_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 9680dff8e..ca837c77a 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]
-GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-plugin-sqlite/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-datastore-plugin-sqlite/
 
diff --git a/src/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf
index c3fe5135f..de138e537 100644
--- a/src/dht/test_dht_2dtorus.conf
+++ b/src/dht/test_dht_2dtorus.conf
@@ -1,7 +1,7 @@
 @INLINE@ ../../contrib/no_forcestart.conf
 @INLINE@ ../../contrib/no_autostart_above_core.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test_dht_2dtorus/
+GNUNET_TEST_HOME = $GNUNET_TMP/test_dht_2dtorus/
 
 [dht]
 AUTOSTART = YES
diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index de9196107..6f5bf8525 100644
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_api_data.conf
@@ -2,7 +2,7 @@
 @INLINE@ ../../contrib/no_autostart_above_core.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-dht-api/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-dht-api/
 
 [dhtcache]
 QUOTA = 1 MB
diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index 0b9db1f8b..b563f5096 100644
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.conf
@@ -21,7 +21,7 @@ TIMEOUT = 300 s
 BINDTO = 127.0.0.1
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-dht-peer-1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-dht-peer-1/
 
 [nat]
 DISABLEV6 = YES
diff --git a/src/dht/test_dht_line.conf b/src/dht/test_dht_line.conf
index de91ed32b..81ce94390 100644
--- a/src/dht/test_dht_line.conf
+++ b/src/dht/test_dht_line.conf
@@ -1,7 +1,7 @@
 @INLINE@ ../../contrib/no_forcestart.conf
 @INLINE@ ../../contrib/no_autostart_above_core.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test_dht_line/
+GNUNET_TEST_HOME = $GNUNET_TMP/test_dht_line/
 
 [dht]
 AUTOSTART = YES
diff --git a/src/dht/test_dht_monitor.conf b/src/dht/test_dht_monitor.conf
index ed0dece58..e33563746 100644
--- a/src/dht/test_dht_monitor.conf
+++ b/src/dht/test_dht_monitor.conf
@@ -17,7 +17,7 @@ WAN_QUOTA_OUT = 1 GB
 OVERLAY_TOPOLOGY = LINE
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-dht-monitor/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-dht-monitor/
 
 [nat]
 DISABLEV6 = YES
diff --git a/src/dht/test_dht_multipeer.conf b/src/dht/test_dht_multipeer.conf
index 1d69dacfd..5251883aa 100644
--- a/src/dht/test_dht_multipeer.conf
+++ b/src/dht/test_dht_multipeer.conf
@@ -21,7 +21,7 @@ OVERLAY_TOPOLOGY = FROM_FILE
 OVERLAY_TOPOLOGY_FILE = test_dht_multipeer_topology.dat
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-dht-multipeer/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-dht-multipeer/
 
 [nat]
 DISABLEV6 = YES
diff --git a/src/dht/test_dht_tools.conf b/src/dht/test_dht_tools.conf
index 9306c5dc9..46d206448 100644
--- a/src/dht/test_dht_tools.conf
+++ b/src/dht/test_dht_tools.conf
@@ -18,7 +18,7 @@ TIMEOUT = 300 s
 BINDTO = 127.0.0.1
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-dht-peer-1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-dht-peer-1/
 
 [nat]
 DISABLEV6 = YES
diff --git a/src/dv/template_dv.conf b/src/dv/template_dv.conf
index 0a3d81bcf..d37154261 100644
--- a/src/dv/template_dv.conf
+++ b/src/dv/template_dv.conf
@@ -23,7 +23,7 @@ G3FK2T8AMPJ0H556QXEYVTEW409BP3KHPCG99TV66V8NYAS1KEWG = tcp
 [transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50]
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-dv-testing/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-dv-testing/
 
 [peerinfo]
 USE_INCLUDED_HELLOS = NO
diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf
index c4e508324..01cac95b8 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]
-GNUNET_TEST_HOME = /tmp/gnunet-fs-test-lib/
+GNUNET_TEST_HOME = $GNUNET_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 7c93eee42..00f0f512e 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]
-GNUNET_TEST_HOME = /tmp/gnunet-fs-test-lib/
+GNUNET_TEST_HOME = $GNUNET_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 a9e5e779c..993141064 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]
-GNUNET_TEST_HOME = /tmp/gnunet-test-fs-data/
+GNUNET_TEST_HOME = $GNUNET_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 299328928..79344cd66 100644
--- a/src/fs/test_fs_defaults.conf
+++ b/src/fs/test_fs_defaults.conf
@@ -1,7 +1,7 @@
 @INLINE@ ../../contrib/no_forcestart.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/gnunet-test-fs-lib/
+GNUNET_TEST_HOME = $GNUNET_TMP/gnunet-test-fs-lib/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/fs/test_fs_download_data.conf 
b/src/fs/test_fs_download_data.conf
index cb0f8ede1..160dec3ae 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]
-GNUNET_TEST_HOME = /tmp/gnunet-test-fs-download/
+GNUNET_TEST_HOME = $GNUNET_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 153cb17b2..7f1e36935 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]
-GNUNET_TEST_HOME = /tmp/gnunet-test-fs-download/
+GNUNET_TEST_HOME = $GNUNET_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 e053116c5..c8fc0938c 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]
-GNUNET_TEST_HOME = /tmp/gnunet-test-fs-file-information/
+GNUNET_TEST_HOME = $GNUNET_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 c6e6af8f0..941809322 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]
-GNUNET_TEST_HOME = /tmp/gnunet-test-fs-list-indexed/
+GNUNET_TEST_HOME = $GNUNET_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 0e6c3c947..70b954f7d 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]
-GNUNET_TEST_HOME = /tmp/gnunet-test-fs-namespace/
+GNUNET_TEST_HOME = $GNUNET_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 2c87ea43e..0930cdfed 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]
-GNUNET_TEST_HOME = /tmp/gnunet-test-fs-publish/
+GNUNET_TEST_HOME = $GNUNET_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 88424189e..8b24e328d 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]
-GNUNET_TEST_HOME = /tmp/gnunet-test-fs-search/
+GNUNET_TEST_HOME = $GNUNET_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 0bcc89df8..dde401857 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]
-GNUNET_TEST_HOME = /tmp/gnunet-test-fs-unindex/
+GNUNET_TEST_HOME = $GNUNET_TMP/gnunet-test-fs-unindex/
 
 [transport]
 PLUGINS = 
diff --git a/src/fs/test_gnunet_fs_idx_data.conf 
b/src/fs/test_gnunet_fs_idx_data.conf
index 2038fd500..ba2a872dd 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]
-GNUNET_TEST_HOME = /tmp/gnunet-test-fs-py-idx/
+GNUNET_TEST_HOME = $GNUNET_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 84e498603..f6c05ecdd 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]
-GNUNET_TEST_HOME = /tmp/gnunet-test-fs-py-psd/
+GNUNET_TEST_HOME = $GNUNET_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 10af5cefd..82ddb8f49 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]
-GNUNET_TEST_HOME = /tmp/gnunet-test-fs-py-rec/
+GNUNET_TEST_HOME = $GNUNET_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 b231c0d3e..fca6c5a29 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]
-GNUNET_TEST_HOME = /tmp/test-gnunet-service-fs-migration/
+GNUNET_TEST_HOME = $GNUNET_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 27e9c2c31..261dab6ed 100644
--- a/src/gns/test_gns_defaults.conf
+++ b/src/gns/test_gns_defaults.conf
@@ -1,7 +1,7 @@
 @INLINE@ ../../contrib/no_forcestart.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-gns-testing/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-gns-testing/
 
 [namestore-sqlite]
 FILENAME = $GNUNET_TEST_HOME/namestore/sqlite_test.db
diff --git a/src/gns/test_gns_lookup.conf b/src/gns/test_gns_lookup.conf
index a9a2345c7..a7b842302 100644
--- a/src/gns/test_gns_lookup.conf
+++ b/src/gns/test_gns_lookup.conf
@@ -1,7 +1,7 @@
 @INLINE@ test_gns_defaults.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-gns-peer-1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-gns-peer-1/
 
 [dht]
 AUTOSTART = YES
diff --git a/src/gns/test_gns_nick_shorten.conf 
b/src/gns/test_gns_nick_shorten.conf
index eac9fee43..210159fc8 100644
--- a/src/gns/test_gns_nick_shorten.conf
+++ b/src/gns/test_gns_nick_shorten.conf
@@ -1,7 +1,7 @@
 @INLINE@ test_gns_defaults.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-gns-peer-1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-gns-peer-1/
 
 [dht]
 AUTOSTART = YES
diff --git a/src/gns/test_gns_proxy.conf b/src/gns/test_gns_proxy.conf
index fb1b0c7c8..875c0a5e3 100644
--- a/src/gns/test_gns_proxy.conf
+++ b/src/gns/test_gns_proxy.conf
@@ -1,5 +1,5 @@
 [PATHS]
-GNUNET_TEST_HOME = /tmp/gnunet-test-gns-proxy/
+GNUNET_TEST_HOME = $GNUNET_TMP/gnunet-test-gns-proxy/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/gns/test_gns_simple_lookup.conf 
b/src/gns/test_gns_simple_lookup.conf
index 77ee8fc18..5bf6f8e63 100644
--- a/src/gns/test_gns_simple_lookup.conf
+++ b/src/gns/test_gns_simple_lookup.conf
@@ -41,7 +41,7 @@ PORT = 12368
 BINDTO = 127.0.0.1
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunetd-gns-peer-1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-gns-peer-1/
 
 
 [nat]
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf 
b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
index 6269a13fe..f3346b9fc 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]
-GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-1/
+GNUNET_TEST_HOME = $GNUNET_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 91df6a65d..95fb7ea1b 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]
-GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-2/
+GNUNET_TEST_HOME = $GNUNET_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 2c9e14fc1..64e9acd51 100644
--- a/src/hostlist/test_hostlist_defaults.conf
+++ b/src/hostlist/test_hostlist_defaults.conf
@@ -2,7 +2,7 @@
 @INLINE@ ../../contrib/no_autostart_above_core.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-hostlist/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/hostlist/test_learning_adv_peer.conf 
b/src/hostlist/test_learning_adv_peer.conf
index 0b010ada1..11c846634 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]
-GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-1/
+GNUNET_TEST_HOME = $GNUNET_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 6675ba364..76585dbbd 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]
-GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-2/
+GNUNET_TEST_HOME = $GNUNET_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 6fd289e49..593744cdc 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]
-GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-3/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-hostlist-peer-3/
 
 [transport-tcp]
 PORT = 32968
diff --git a/src/identity-provider/test_idp.conf 
b/src/identity-provider/test_idp.conf
index 5480e4975..3559dd767 100644
--- a/src/identity-provider/test_idp.conf
+++ b/src/identity-provider/test_idp.conf
@@ -1,21 +1,21 @@
 @INLINE@ test_idp_defaults.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-idp-peer-1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-idp-peer-1/
 
 [dht]
 AUTOSTART = YES
 
 [rest]
 AUTOSTART = YES
-PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=/tmp/restlog
+PREFIX = valgrind --leak-check=full --track-origins=yes 
--log-file=$GNUNET_TMP/restlog
 
 [transport]
 PLUGINS =
 
 [identity-provider]
 AUTOSTART = YES
-#PREFIX = valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes 
--log-file=/tmp/idplog
+#PREFIX = valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes 
--log-file=$GNUNET_TMP/idplog
 
 [gns]
 #PREFIX = valgrind --leak-check=full --track-origins=yes
diff --git a/src/identity-provider/test_idp_defaults.conf 
b/src/identity-provider/test_idp_defaults.conf
index 10d89c2fb..d7de3ce12 100644
--- a/src/identity-provider/test_idp_defaults.conf
+++ b/src/identity-provider/test_idp_defaults.conf
@@ -1,7 +1,7 @@
 @INLINE@ ../../contrib/no_forcestart.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-idp-testing/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-idp-testing/
 
 [namestore-sqlite]
 FILENAME = $GNUNET_TEST_HOME/namestore/sqlite_test.db
diff --git a/src/identity/test_identity.conf b/src/identity/test_identity.conf
index 1653a88f8..9c433da77 100644
--- a/src/identity/test_identity.conf
+++ b/src/identity/test_identity.conf
@@ -4,5 +4,5 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [identity]
 # need to overwrite paths to ensure they stay the same between runs...
-EGODIR = /tmp/test-identity-service/egos/
-SUBSYSTEM_CFG = /tmp/test-identity-service/s.conf
+EGODIR = $GNUNET_TMP/test-identity-service/egos/
+SUBSYSTEM_CFG = $GNUNET_TMP/test-identity-service/s.conf
diff --git a/src/integration-tests/confs/c_bootstrap_server.conf 
b/src/integration-tests/confs/c_bootstrap_server.conf
index 4311e36f6..bcfa6b212 100644
--- a/src/integration-tests/confs/c_bootstrap_server.conf
+++ b/src/integration-tests/confs/c_bootstrap_server.conf
@@ -1,7 +1,7 @@
 @INLINE@ test_defaults.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/c_bootstrap_server/
+GNUNET_TEST_HOME = $GNUNET_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 12d542851..0040a8dc0 100644
--- a/src/integration-tests/confs/c_nat_client.conf
+++ b/src/integration-tests/confs/c_nat_client.conf
@@ -1,7 +1,7 @@
 @INLINE@ test_defaults.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/c_nat_client/
+GNUNET_TEST_HOME = $GNUNET_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 40bb37df8..26e816267 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@ test_defaults.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/c_no_nat_client/
+GNUNET_TEST_HOME = $GNUNET_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 805389a15..0cd6fc4f9 100644
--- a/src/integration-tests/confs/c_no_nat_client_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_2.conf
@@ -1,7 +1,7 @@
 @INLINE@ test_defaults.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/c_no_nat_client_2/
+GNUNET_TEST_HOME = $GNUNET_TMP/c_no_nat_client_2/
 
 [PEER]
 PRIVATE_KEY = hostkeys/c_no_nat_client_2
diff --git a/src/namecache/test_namecache_api.conf 
b/src/namecache/test_namecache_api.conf
index 7221033c6..b1ae31f14 100644
--- a/src/namecache/test_namecache_api.conf
+++ b/src/namecache/test_namecache_api.conf
@@ -1,5 +1,5 @@
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-namecache/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-namecache/
 
 [namecache]
 DATABASE = sqlite
diff --git a/src/namecache/test_plugin_namecache_flat.conf 
b/src/namecache/test_plugin_namecache_flat.conf
index 8b18c3b63..efe77e37a 100644
--- a/src/namecache/test_plugin_namecache_flat.conf
+++ b/src/namecache/test_plugin_namecache_flat.conf
@@ -1,2 +1,2 @@
 [namecache-flat]
-FILENAME = /tmp/gnunet-test-plugin-namecache-flat/flatdb
+FILENAME = $GNUNET_TMP/gnunet-test-plugin-namecache-flat/flatdb
diff --git a/src/namecache/test_plugin_namecache_sqlite.conf 
b/src/namecache/test_plugin_namecache_sqlite.conf
index 57b170f7a..24eecd286 100644
--- a/src/namecache/test_plugin_namecache_sqlite.conf
+++ b/src/namecache/test_plugin_namecache_sqlite.conf
@@ -1,2 +1,2 @@
 [namestore-sqlite]
-FILENAME = /tmp/gnunet-test-plugin-namestore-sqlite/sqlite.db
+FILENAME = $GNUNET_TMP/gnunet-test-plugin-namestore-sqlite/sqlite.db
diff --git a/src/namestore/test_namestore_api.conf 
b/src/namestore/test_namestore_api.conf
index 29ff90b5d..1e36c52fe 100644
--- a/src/namestore/test_namestore_api.conf
+++ b/src/namestore/test_namestore_api.conf
@@ -2,7 +2,7 @@
 @INLINE@ ../../contrib/no_autostart_above_core.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-namestore/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-namestore/
 
 [namestore]
 DATABASE = sqlite
diff --git a/src/namestore/test_plugin_namestore_flat.conf 
b/src/namestore/test_plugin_namestore_flat.conf
index 3639ce33e..6a5491df7 100644
--- a/src/namestore/test_plugin_namestore_flat.conf
+++ b/src/namestore/test_plugin_namestore_flat.conf
@@ -1,5 +1,5 @@
 [namestore-flat]
-FILENAME = /tmp/gnunet-test-plugin-namestore-sqlite/flatdb
+FILENAME = $GNUNET_TMP/gnunet-test-plugin-namestore-sqlite/flatdb
 
 [namestore]
 # PREFIX = valgrind --log-file=/home/schanzen/dev/gnunet/src/namestore/vg_log
diff --git a/src/namestore/test_plugin_namestore_sqlite.conf 
b/src/namestore/test_plugin_namestore_sqlite.conf
index 57b170f7a..24eecd286 100644
--- a/src/namestore/test_plugin_namestore_sqlite.conf
+++ b/src/namestore/test_plugin_namestore_sqlite.conf
@@ -1,2 +1,2 @@
 [namestore-sqlite]
-FILENAME = /tmp/gnunet-test-plugin-namestore-sqlite/sqlite.db
+FILENAME = $GNUNET_TMP/gnunet-test-plugin-namestore-sqlite/sqlite.db
diff --git a/src/nat/test_nat_data.conf b/src/nat/test_nat_data.conf
index d23a49162..cb018cecd 100644
--- a/src/nat/test_nat_data.conf
+++ b/src/nat/test_nat_data.conf
@@ -1,5 +1,5 @@
 [PATHS]
-GNUNET_TEST_HOME = /tmp/nat-test
+GNUNET_TEST_HOME = $GNUNET_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/nat/test_nat_test_data.conf b/src/nat/test_nat_test_data.conf
index 161af6c48..c0174bf53 100644
--- a/src/nat/test_nat_test_data.conf
+++ b/src/nat/test_nat_test_data.conf
@@ -1,5 +1,5 @@
 [PATHS]
-GNUNET_TEST_HOME = /tmp/nat-test
+GNUNET_TEST_HOME = $GNUNET_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/nat/test_stun.conf b/src/nat/test_stun.conf
index c8104f0a7..b03bbfff3 100644
--- a/src/nat/test_stun.conf
+++ b/src/nat/test_stun.conf
@@ -1,5 +1,5 @@
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-stun
+GNUNET_TEST_HOME = $GNUNET_TMP/test-stun
 
 [resolver]
 PORT = 22354
diff --git a/src/nse/nse_infiniband.conf b/src/nse/nse_infiniband.conf
index 8e98b18c3..9904ca711 100644
--- a/src/nse/nse_infiniband.conf
+++ b/src/nse/nse_infiniband.conf
@@ -1,5 +1,5 @@
 [PATHS]
-GNUNET_TEST_HOME = /tmp/nse-profiler/
+GNUNET_TEST_HOME = $GNUNET_TMP/nse-profiler/
 
 [testbed]
 AUTOSTART = NO
diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf
index b118132d1..ad5da536b 100644
--- a/src/nse/nse_profiler_test.conf
+++ b/src/nse/nse_profiler_test.conf
@@ -1,5 +1,5 @@
 [PATHS]
-GNUNET_TEST_HOME = /tmp/nse-profiler/
+GNUNET_TEST_HOME = $GNUNET_TMP/nse-profiler/
 
 [testbed]
 AUTOSTART = NO
diff --git a/src/nse/test_nse.conf b/src/nse/test_nse.conf
index c6061f421..8331c241c 100644
--- a/src/nse/test_nse.conf
+++ b/src/nse/test_nse.conf
@@ -1,5 +1,5 @@
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-nse-multipeer/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-nse-multipeer/
 
 [nse]
 #PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
diff --git a/src/peerinfo-tool/test_gnunet_peerinfo_data.conf 
b/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
index 1dd91e362..32b096809 100644
--- a/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
+++ b/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
@@ -1,7 +1,7 @@
 @INLINE@ ../../contrib/no_forcestart.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/gnunet-test-peerinfo/
+GNUNET_TEST_HOME = $GNUNET_TMP/gnunet-test-peerinfo/
 
 [transport]
 plugins = tcp
diff --git a/src/peerinfo/test_peerinfo_api_data.conf 
b/src/peerinfo/test_peerinfo_api_data.conf
index e3b37b1ea..1522d4dfe 100644
--- a/src/peerinfo/test_peerinfo_api_data.conf
+++ b/src/peerinfo/test_peerinfo_api_data.conf
@@ -1,5 +1,5 @@
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-peerinfo/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-peerinfo/
 
 [peerinfo]
 PORT = 22354
diff --git a/src/peerstore/test_peerstore_api_data.conf 
b/src/peerstore/test_peerstore_api_data.conf
index f6a964410..802418fa0 100644
--- a/src/peerstore/test_peerstore_api_data.conf
+++ b/src/peerstore/test_peerstore_api_data.conf
@@ -1,10 +1,10 @@
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-peerstore
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-peerstore
 
 [peerstore]
 AUTOSTART = YES
 BINARY = gnunet-service-peerstore
-UNIXPATH = /tmp/gnunet-service-peerstore.sock
+UNIXPATH = $GNUNET_TMP/gnunet-service-peerstore.sock
 HOME = $SERVICEHOME
 DATABASE = sqlite
 #PREFIX = xterm -e gdb --args 
diff --git a/src/peerstore/test_plugin_peerstore_flat.conf 
b/src/peerstore/test_plugin_peerstore_flat.conf
index f0548e5c8..c55b1e9d6 100644
--- a/src/peerstore/test_plugin_peerstore_flat.conf
+++ b/src/peerstore/test_plugin_peerstore_flat.conf
@@ -1,5 +1,5 @@
 [peerstore-flat]
-FILENAME = /tmp/gnunet-test-plugin-namestore-flat/flatdb
+FILENAME = $GNUNET_TMP/gnunet-test-plugin-namestore-flat/flatdb
 
 [peerstore]
 # PREFIX = valgrind --log-file=/home/schanzen/dev/gnunet/src/peerstore/vg_log
diff --git a/src/peerstore/test_plugin_peerstore_sqlite.conf 
b/src/peerstore/test_plugin_peerstore_sqlite.conf
index 4d011944f..dcf1fc1a4 100644
--- a/src/peerstore/test_plugin_peerstore_sqlite.conf
+++ b/src/peerstore/test_plugin_peerstore_sqlite.conf
@@ -1,2 +1,2 @@
 [peerstore-sqlite]
-FILENAME = /tmp/gnunet-test-plugin-peerstore-sqlite/sqlite.db
+FILENAME = $GNUNET_TMP/gnunet-test-plugin-peerstore-sqlite/sqlite.db
diff --git a/src/psycstore/test_plugin_psycstore_sqlite.conf 
b/src/psycstore/test_plugin_psycstore_sqlite.conf
index 7cde6fa4c..498b1d02d 100644
--- a/src/psycstore/test_plugin_psycstore_sqlite.conf
+++ b/src/psycstore/test_plugin_psycstore_sqlite.conf
@@ -1,2 +1,2 @@
 [psycstore-sqlite]
-FILENAME = /tmp/gnunet-test-plugin-psycstore-sqlite/sqlite.db
+FILENAME = $GNUNET_TMP/gnunet-test-plugin-psycstore-sqlite/sqlite.db
diff --git a/src/psycstore/test_psycstore.conf 
b/src/psycstore/test_psycstore.conf
index 926e625e6..fa7c2d003 100644
--- a/src/psycstore/test_psycstore.conf
+++ b/src/psycstore/test_psycstore.conf
@@ -1,5 +1,5 @@
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-psycstore/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-psycstore/
 
 [psycstore]
 DATABASE = sqlite
diff --git a/src/pt/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf
index 86642465f..c603b7422 100644
--- a/src/pt/test_gns_vpn.conf
+++ b/src/pt/test_gns_vpn.conf
@@ -1,5 +1,5 @@
 [PATHS]
-GNUNET_TEST_HOME = /tmp/gnunet-test-gns-vpn/
+GNUNET_TEST_HOME = $GNUNET_TMP/gnunet-test-gns-vpn/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/pt/test_gnunet_vpn.conf b/src/pt/test_gnunet_vpn.conf
index 9c3c2654f..c22cd3409 100644
--- a/src/pt/test_gnunet_vpn.conf
+++ b/src/pt/test_gnunet_vpn.conf
@@ -1,5 +1,5 @@
 [PATHS]
-GNUNET_TEST_HOME = /tmp/gnunet-test-vpn/
+GNUNET_TEST_HOME = $GNUNET_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 84df06238..8c87eeb96 100644
--- a/src/regex/test_regex_api_data.conf
+++ b/src/regex/test_regex_api_data.conf
@@ -2,7 +2,7 @@
 @INLINE@ ../../contrib/no_autostart_above_core.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-regex-api/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-regex-api/
 
 [dhtcache]
 QUOTA = 1 MB
diff --git a/src/revocation/test_revocation.conf 
b/src/revocation/test_revocation.conf
index 2c444ea7d..1beeba931 100644
--- a/src/revocation/test_revocation.conf
+++ b/src/revocation/test_revocation.conf
@@ -1,8 +1,8 @@
 @INLINE@ ../../contrib/no_forcestart.conf
 
 [paths]
-GNUNET_HOME=/tmp/test-revocation-service
-SERVICEHOME=/tmp/test-revocation-service
+GNUNET_HOME=$GNUNET_TMP/test-revocation-service
+SERVICEHOME=$GNUNET_TMP/test-revocation-service
 
 [revocation]
 WORKBITS = 3
diff --git a/src/rps/test_rps.conf b/src/rps/test_rps.conf
index 0b49b4e76..f171335d6 100644
--- a/src/rps/test_rps.conf
+++ b/src/rps/test_rps.conf
@@ -1,7 +1,7 @@
 [rps]
 #PREFIX = valgrind --leak-check=full --show-leak-kinds=all 
--log-file=/tmp/rps/valgrind!gnunet-service-rps!%p
 #BINARY = gnunet-service-rps
-UNIXPATH = /tmp/gnunet-service-rps.sock
+UNIXPATH = $GNUNET_TMP/gnunet-service-rps.sock
 HOME = $SERVICEHOME
 # PORT = 2106
 address@hidden@ PORT = 2087
diff --git a/src/scalarproduct/test_scalarproduct.conf 
b/src/scalarproduct/test_scalarproduct.conf
index 73dbadbce..fca141108 100644
--- a/src/scalarproduct/test_scalarproduct.conf
+++ b/src/scalarproduct/test_scalarproduct.conf
@@ -1,7 +1,7 @@
 @INLINE@ ../../contrib/no_forcestart.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-scalarproduct/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-scalarproduct/
 
 [testbed]
 OVERLAY_TOPOLOGY = CLIQUE
diff --git a/src/set/test_set.conf b/src/set/test_set.conf
index e28dfc6e9..58bd07773 100644
--- a/src/set/test_set.conf
+++ b/src/set/test_set.conf
@@ -1,7 +1,7 @@
 @INLINE@ ../../contrib/no_forcestart.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-set/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-set/
 
 [set]
 AUTOSTART = YES
diff --git a/src/social/test_social.conf b/src/social/test_social.conf
index 7cf858b1c..701789313 100644
--- a/src/social/test_social.conf
+++ b/src/social/test_social.conf
@@ -1,7 +1,7 @@
 @INLINE@ ../../contrib/no_forcestart.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/gnunet-test-social/
+GNUNET_TEST_HOME = $GNUNET_TMP/gnunet-test-social/
 
 [social]
 FORCESTART = YES
diff --git a/src/statistics/test_statistics_api_data.conf 
b/src/statistics/test_statistics_api_data.conf
index bf9a2c83e..66555291c 100644
--- a/src/statistics/test_statistics_api_data.conf
+++ b/src/statistics/test_statistics_api_data.conf
@@ -1,5 +1,5 @@
 @INLINE@ ../../contrib/no_forcestart.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-statistics/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-statistics/
 
diff --git a/src/testbed-logger/test_testbed_logger_api.conf 
b/src/testbed-logger/test_testbed_logger_api.conf
index 57ce5c254..5dc3df7f0 100644
--- a/src/testbed-logger/test_testbed_logger_api.conf
+++ b/src/testbed-logger/test_testbed_logger_api.conf
@@ -1,6 +1,6 @@
 [testbed-logger]
-UNIXPATH=/tmp/testbed-logger.sock
+UNIXPATH=$GNUNET_TMP/testbed-logger.sock
 DIR=$GNUNET_TEST_HOME/data
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-testbed/
\ No newline at end of file
+GNUNET_TEST_HOME = $GNUNET_TMP/test-testbed/
\ No newline at end of file
diff --git a/src/testbed-logger/testbed-logger.conf.in 
b/src/testbed-logger/testbed-logger.conf.in
index 094328c7b..05ef782ae 100644
--- a/src/testbed-logger/testbed-logger.conf.in
+++ b/src/testbed-logger/testbed-logger.conf.in
@@ -95,7 +95,7 @@ AUTOSTART = NO
 HOSTNAME = localhost
 BINARY = gnunet-service-testbed-logger
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gnunet-testbed-logger.sock
-DIR = /tmp
+DIR = $GNUNET_TMP
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
 
diff --git a/src/testbed/test_testbed_api_barriers.conf.in 
b/src/testbed/test_testbed_api_barriers.conf.in
index 27dc0e82e..8cad6df09 100644
--- a/src/testbed/test_testbed_api_barriers.conf.in
+++ b/src/testbed/test_testbed_api_barriers.conf.in
@@ -58,7 +58,7 @@ TIMEOUT = 300 s
 PORT = 12368
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-testbed/
 
 [dns]
 AUTOSTART = NO
diff --git a/src/testbed/test_testbed_api_template.conf 
b/src/testbed/test_testbed_api_template.conf
index 48926389b..89f16ed67 100644
--- a/src/testbed/test_testbed_api_template.conf
+++ b/src/testbed/test_testbed_api_template.conf
@@ -36,7 +36,7 @@ FORCESTART = YES
 TIMEOUT = 300 s
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-testbed/
 
 [nat]
 RETURN_LOCAL_ADDRESSES = YES
diff --git a/src/testing/test_testing_defaults.conf 
b/src/testing/test_testing_defaults.conf
index ec0334c05..e6a18bc86 100644
--- a/src/testing/test_testing_defaults.conf
+++ b/src/testing/test_testing_defaults.conf
@@ -1,5 +1,5 @@
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-testing/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-testing/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/testing/test_testing_sharedservices.conf 
b/src/testing/test_testing_sharedservices.conf
index e1830edd2..e41e2863c 100644
--- a/src/testing/test_testing_sharedservices.conf
+++ b/src/testing/test_testing_sharedservices.conf
@@ -1,10 +1,10 @@
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-testing/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-testing/
 
 [testbed-logger]
 PORT = 15000
 UNIXPATH = $GNUNET_RUNTIME_DIR/testbed-logger.sock
-DIR = /tmp/testbed-logger
+DIR = $GNUNET_TMP/testbed-logger
 
 [transport]
 PLUGINS = tcp
diff --git a/src/topology/test_gnunet_daemon_topology_data.conf 
b/src/topology/test_gnunet_daemon_topology_data.conf
index 9cd69b370..43d3da375 100644
--- a/src/topology/test_gnunet_daemon_topology_data.conf
+++ b/src/topology/test_gnunet_daemon_topology_data.conf
@@ -1,5 +1,5 @@
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-topology/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-topology/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/transport/perf_http_peer1.conf 
b/src/transport/perf_http_peer1.conf
index e683a8145..e97e16289 100644
--- a/src/transport/perf_http_peer1.conf
+++ b/src/transport/perf_http_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 
 [transport]
 PLUGINS = http_client
diff --git a/src/transport/perf_http_peer2.conf 
b/src/transport/perf_http_peer2.conf
index ab093d0ff..a1c83bde5 100644
--- a/src/transport/perf_http_peer2.conf
+++ b/src/transport/perf_http_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 
 [transport]
 PLUGINS = http_server
diff --git a/src/transport/perf_https_peer1.conf 
b/src/transport/perf_https_peer1.conf
index bad98c532..e943671c2 100644
--- a/src/transport/perf_https_peer1.conf
+++ b/src/transport/perf_https_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 
 [transport]
 PLUGINS = https_client
diff --git a/src/transport/perf_https_peer2.conf 
b/src/transport/perf_https_peer2.conf
index 923426dc3..6e30f9e60 100644
--- a/src/transport/perf_https_peer2.conf
+++ b/src/transport/perf_https_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 
 [transport]
 PLUGINS = https_server
diff --git a/src/transport/perf_tcp_peer1.conf 
b/src/transport/perf_tcp_peer1.conf
index 2471633fc..e56c47ada 100644
--- a/src/transport/perf_tcp_peer1.conf
+++ b/src/transport/perf_tcp_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/transport/perf_tcp_peer2.conf 
b/src/transport/perf_tcp_peer2.conf
index e1517ff75..3264161f5 100644
--- a/src/transport/perf_tcp_peer2.conf
+++ b/src/transport/perf_tcp_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/transport/perf_udp_peer1.conf 
b/src/transport/perf_udp_peer1.conf
index 10e44c178..68bf43908 100644
--- a/src/transport/perf_udp_peer1.conf
+++ b/src/transport/perf_udp_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 
 [transport]
 PLUGINS = udp
diff --git a/src/transport/perf_udp_peer2.conf 
b/src/transport/perf_udp_peer2.conf
index 4f27b2d71..efed935f8 100644
--- a/src/transport/perf_udp_peer2.conf
+++ b/src/transport/perf_udp_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 
 [transport]
 PLUGINS = udp
diff --git a/src/transport/perf_unix_peer1.conf 
b/src/transport/perf_unix_peer1.conf
index 96cda0748..06cd63fc6 100644
--- a/src/transport/perf_unix_peer1.conf
+++ b/src/transport/perf_unix_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 
 [transport]
 PORT = 12001
diff --git a/src/transport/perf_unix_peer2.conf 
b/src/transport/perf_unix_peer2.conf
index a9178ed8f..feadb6fec 100644
--- a/src/transport/perf_unix_peer2.conf
+++ b/src/transport/perf_unix_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 
 [transport]
 PORT = 12010
diff --git a/src/transport/template_cfg_peer1.conf 
b/src/transport/template_cfg_peer1.conf
index b26f43bf4..5ba198450 100644
--- a/src/transport/template_cfg_peer1.conf
+++ b/src/transport/template_cfg_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_transport_defaults.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 GNUNET_RUNTIME_DIR = $GNUNET_TEST_HOME/runtime/
 GNUNET_USER_RUNTIME_DIR = $GNUNET_TEST_HOME/runtime/
 
diff --git a/src/transport/template_cfg_peer2.conf 
b/src/transport/template_cfg_peer2.conf
index 8df39d488..6ac610fec 100644
--- a/src/transport/template_cfg_peer2.conf
+++ b/src/transport/template_cfg_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ test_transport_defaults.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 GNUNET_RUNTIME_DIR = $GNUNET_TEST_HOME/runtime/
 GNUNET_USER_RUNTIME_DIR = $GNUNET_TEST_HOME/runtime/
 
diff --git a/src/transport/test_plugin_transport_data.conf 
b/src/transport/test_plugin_transport_data.conf
index 2b9d134dc..cbecc56ed 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]
-GNUNET_TEST_HOME = /tmp/test-gnunetd-plugin-transport/
+GNUNET_TEST_HOME = $GNUNET_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 b707ee971..86bdf6db4 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/
+GNUNET_TEST_HOME = $GNUNET_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 ba79f4ab2..086688e73 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/
+GNUNET_TEST_HOME = $GNUNET_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 8f50bf113..3f86ee940 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/
+GNUNET_TEST_HOME = $GNUNET_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 1816ec99e..5fc178395 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/
+GNUNET_TEST_HOME = $GNUNET_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 576d2fc0f..47c523bcf 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]
-GNUNET_TEST_HOME = /tmp/test-gnunetd-plugin-transport/
+GNUNET_TEST_HOME = $GNUNET_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 10ee02936..201bafd01 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]
-GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1
+GNUNET_TEST_HOME = $GNUNET_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 470b3003a..cdc10516b 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]
-GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2
+GNUNET_TEST_HOME = $GNUNET_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 10ee02936..201bafd01 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]
-GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1
+GNUNET_TEST_HOME = $GNUNET_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 470b3003a..cdc10516b 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]
-GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2
+GNUNET_TEST_HOME = $GNUNET_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 52504d34d..3e8895665 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]
-GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/
+GNUNET_TEST_HOME = $GNUNET_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 59ac327d5..e0ff8da9f 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]
-GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2
+GNUNET_TEST_HOME = $GNUNET_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 52504d34d..3e8895665 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]
-GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/
+GNUNET_TEST_HOME = $GNUNET_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 59ac327d5..e0ff8da9f 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]
-GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2
+GNUNET_TEST_HOME = $GNUNET_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 cc797c154..59fbbff5b 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]
-GNUNET_TEST_HOME = /tmp/test-transport/quota-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_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 04c5161e9..e9757b080 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]
-GNUNET_TEST_HOME = /tmp/test-transport/quota-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_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 cc797c154..59fbbff5b 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]
-GNUNET_TEST_HOME = /tmp/test-transport/quota-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_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 326943504..a7b2cf90b 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_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 13d417d70..b7c3159b8 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]
-GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/
+GNUNET_TEST_HOME = $GNUNET_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 db5f32f0d..70e61db05 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]
-GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2
+GNUNET_TEST_HOME = $GNUNET_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 63beae53c..8d6073b67 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]
-GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/
+GNUNET_TEST_HOME = $GNUNET_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 36a55e69c..a3a42f739 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]
-GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2
+GNUNET_TEST_HOME = $GNUNET_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 284a830c5..d9255705c 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]
-GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/
+GNUNET_TEST_HOME = $GNUNET_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 9e10a92f0..b7ba15d86 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]
-GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2
+GNUNET_TEST_HOME = $GNUNET_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 eb7756f27..78e280b68 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p1/
+GNUNET_TEST_HOME = $GNUNET_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 aafeb09f8..e97ab3f38 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p2/
+GNUNET_TEST_HOME = $GNUNET_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 eb7756f27..78e280b68 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p1/
+GNUNET_TEST_HOME = $GNUNET_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 aafeb09f8..e97ab3f38 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-wlan-p2/
 
 [transport-wlan]
 INTERFACE = mon1
diff --git a/src/transport/test_transport_address_switch_http_peer1.conf 
b/src/transport/test_transport_address_switch_http_peer1.conf
index e361719ec..b48c5f47f 100644
--- a/src/transport/test_transport_address_switch_http_peer1.conf
+++ b/src/transport/test_transport_address_switch_http_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 
 [ats]
 UNSPECIFIED_QUOTA_IN = 8 KiB
diff --git a/src/transport/test_transport_address_switch_http_peer2.conf 
b/src/transport/test_transport_address_switch_http_peer2.conf
index 3c6f4a2a8..be8fb506c 100644
--- a/src/transport/test_transport_address_switch_http_peer2.conf
+++ b/src/transport/test_transport_address_switch_http_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 
 [ats]
 UNSPECIFIED_QUOTA_IN = 8 KiB
diff --git a/src/transport/test_transport_address_switch_https_peer1.conf 
b/src/transport/test_transport_address_switch_https_peer1.conf
index d34dc01f9..1f9210130 100644
--- a/src/transport/test_transport_address_switch_https_peer1.conf
+++ b/src/transport/test_transport_address_switch_https_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 
 [ats]
 UNSPECIFIED_QUOTA_IN = 8 KiB
diff --git a/src/transport/test_transport_address_switch_https_peer2.conf 
b/src/transport/test_transport_address_switch_https_peer2.conf
index 772ff1540..c58839868 100644
--- a/src/transport/test_transport_address_switch_https_peer2.conf
+++ b/src/transport/test_transport_address_switch_https_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 
 [ats]
 UNSPECIFIED_QUOTA_IN = 8 KiB
diff --git a/src/transport/test_transport_address_switch_tcp_peer1.conf 
b/src/transport/test_transport_address_switch_tcp_peer1.conf
index 34248b9e3..cfcbfe41c 100644
--- a/src/transport/test_transport_address_switch_tcp_peer1.conf
+++ b/src/transport/test_transport_address_switch_tcp_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 
 [ats]
 UNSPECIFIED_QUOTA_IN = 8 KiB
diff --git a/src/transport/test_transport_address_switch_tcp_peer2.conf 
b/src/transport/test_transport_address_switch_tcp_peer2.conf
index 91a699d76..bda2354b6 100644
--- a/src/transport/test_transport_address_switch_tcp_peer2.conf
+++ b/src/transport/test_transport_address_switch_tcp_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 
 [ats]
 UNSPECIFIED_QUOTA_IN = 8 KiB
diff --git a/src/transport/test_transport_address_switch_udp_peer1.conf 
b/src/transport/test_transport_address_switch_udp_peer1.conf
index 69887cf25..bdc3a2253 100644
--- a/src/transport/test_transport_address_switch_udp_peer1.conf
+++ b/src/transport/test_transport_address_switch_udp_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 
 [ats]
 UNSPECIFIED_QUOTA_IN = 8 KiB
diff --git a/src/transport/test_transport_address_switch_udp_peer2.conf 
b/src/transport/test_transport_address_switch_udp_peer2.conf
index a0b1d405c..ae6397db4 100644
--- a/src/transport/test_transport_address_switch_udp_peer2.conf
+++ b/src/transport/test_transport_address_switch_udp_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 
 [ats]
 UNSPECIFIED_QUOTA_IN = 8 KiB
diff --git a/src/transport/test_transport_api_blacklisting_tcp_peer1.conf 
b/src/transport/test_transport_api_blacklisting_tcp_peer1.conf
index 4bfe9b6ca..eabd6b701 100644
--- a/src/transport/test_transport_api_blacklisting_tcp_peer1.conf
+++ b/src/transport/test_transport_api_blacklisting_tcp_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/transport/test_transport_api_blacklisting_tcp_peer2.conf 
b/src/transport/test_transport_api_blacklisting_tcp_peer2.conf
index e68cdbee4..58ce0777f 100644
--- a/src/transport/test_transport_api_blacklisting_tcp_peer2.conf
+++ b/src/transport/test_transport_api_blacklisting_tcp_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/transport/test_transport_api_bluetooth_peer1.conf 
b/src/transport/test_transport_api_bluetooth_peer1.conf
index 12d2ee881..b1209e44b 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/
+GNUNET_TEST_HOME = $GNUNET_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 b44f7cc53..371a5d3b0 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/
+GNUNET_TEST_HOME = $GNUNET_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 72b8006b1..8530ba310 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/transport/test_transport_api_disconnect_tcp_peer2.conf 
b/src/transport/test_transport_api_disconnect_tcp_peer2.conf
index ba7e5ff24..ce9c2f885 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/transport/test_transport_api_http_peer1.conf 
b/src/transport/test_transport_api_http_peer1.conf
index de0ff8506..2a622ae02 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-http-p1/
 
 [transport]
 PLUGINS = http_client
diff --git a/src/transport/test_transport_api_http_peer2.conf 
b/src/transport/test_transport_api_http_peer2.conf
index 1559c78fd..aca41804b 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-http-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-http-p2/
 
 [transport]
 PLUGINS = http_server
diff --git a/src/transport/test_transport_api_http_reverse_peer1.conf 
b/src/transport/test_transport_api_http_reverse_peer1.conf
index ae29d8a29..67640d7bb 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-http-p1/
 
 [transport]
 PLUGINS = 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 136c09008..0e7a2ea05 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-http-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-http-p2/
 
 [transport-http_server]
 PORT = 8080
diff --git a/src/transport/test_transport_api_https_peer1.conf 
b/src/transport/test_transport_api_https_peer1.conf
index c6a083f37..55d119259 100644
--- a/src/transport/test_transport_api_https_peer1.conf
+++ b/src/transport/test_transport_api_https_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-https-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-https-p1/
 
 [arm]
 PORT = 12105
diff --git a/src/transport/test_transport_api_https_peer2.conf 
b/src/transport/test_transport_api_https_peer2.conf
index 49210651c..3b1d55b0a 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-https-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-https-p2/
 
 [transport-https_server]
 EXTERNAL_HOSTNAME = localhost
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 3d30f84ea..9804f171e 100644
--- a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
+++ b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
@@ -1,7 +1,7 @@
 @INLINE@ template_cfg_peer1.conf
 @INLINE@ ../../contrib/no_autostart_above_core.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 
 [transport]
 PLUGINS = tcp
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 09781b2a5..16dddf744 100644
--- a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
+++ b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
@@ -2,7 +2,7 @@
 @INLINE@ ../../contrib/no_autostart_above_core.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/transport/test_transport_api_manipulation_cfg_peer1.conf 
b/src/transport/test_transport_api_manipulation_cfg_peer1.conf
index e611b1ae9..77cdce2e2 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/transport/test_transport_api_manipulation_cfg_peer2.conf 
b/src/transport/test_transport_api_manipulation_cfg_peer2.conf
index 2c0251fa3..9cbaaddef 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 
 [transport]
 PLUGINS = tcp
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 d75e23e06..9150c7faf 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_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 326943504..a7b2cf90b 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_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 d75e23e06..9150c7faf 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_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 326943504..a7b2cf90b 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 
 [transport-tcp]
 PORT = 12015
diff --git a/src/transport/test_transport_api_monitor_peers_peer1.conf 
b/src/transport/test_transport_api_monitor_peers_peer1.conf
index a5518c524..bc9eee19b 100644
--- a/src/transport/test_transport_api_monitor_peers_peer1.conf
+++ b/src/transport/test_transport_api_monitor_peers_peer1.conf
@@ -1,4 +1,4 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-monitoring-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-monitoring-p1/
 
diff --git a/src/transport/test_transport_api_monitor_peers_peer2.conf 
b/src/transport/test_transport_api_monitor_peers_peer2.conf
index 248557b39..5225a5a87 100644
--- a/src/transport/test_transport_api_monitor_peers_peer2.conf
+++ b/src/transport/test_transport_api_monitor_peers_peer2.conf
@@ -1,5 +1,5 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-monitoring-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-monitoring-p2/
 
 
diff --git a/src/transport/test_transport_api_monitor_validation_peer1.conf 
b/src/transport/test_transport_api_monitor_validation_peer1.conf
index aca9c1e7c..02f7bc2f0 100644
--- a/src/transport/test_transport_api_monitor_validation_peer1.conf
+++ b/src/transport/test_transport_api_monitor_validation_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-monitoring-val-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-monitoring-val-p1/
 
 [transport]
 PLUGINS=tcp
diff --git a/src/transport/test_transport_api_monitor_validation_peer2.conf 
b/src/transport/test_transport_api_monitor_validation_peer2.conf
index 86dfcbbbc..d4e0874f0 100644
--- a/src/transport/test_transport_api_monitor_validation_peer2.conf
+++ b/src/transport/test_transport_api_monitor_validation_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-monitoring-val-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-monitoring-val-p2/
 
 [TRANSPORT]
 PLUGINS=tcp
diff --git a/src/transport/test_transport_api_multi_peer1.conf 
b/src/transport/test_transport_api_multi_peer1.conf
index 87b7610ed..b7cb98777 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-multi-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-multi-p1/
 
 [transport]
 PLUGINS = tcp udp
diff --git a/src/transport/test_transport_api_multi_peer2.conf 
b/src/transport/test_transport_api_multi_peer2.conf
index f6bb59183..f69e0abd9 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-multi-p2/
+GNUNET_TEST_HOME = $GNUNET_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 0bf419c2d..738255235 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/
+GNUNET_TEST_HOME = $GNUNET_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 b60e8e360..9c68b5fbc 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/
+GNUNET_TEST_HOME = $GNUNET_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 a04b6d3d8..a1e5c96ac 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/
+GNUNET_TEST_HOME = $GNUNET_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 8d85cf7b1..25a554f94 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-http-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-http-p2/
 
 [transport-http_server]
 PORT = 12090
diff --git a/src/transport/test_transport_api_reliability_http_xhr_peer1.conf 
b/src/transport/test_transport_api_reliability_http_xhr_peer1.conf
index c0cd835a5..ba4101ebe 100644
--- a/src/transport/test_transport_api_reliability_http_xhr_peer1.conf
+++ b/src/transport/test_transport_api_reliability_http_xhr_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-http-p1/
 
 [transport-http_client]
 EMULATE_XHR = YES
diff --git a/src/transport/test_transport_api_reliability_http_xhr_peer2.conf 
b/src/transport/test_transport_api_reliability_http_xhr_peer2.conf
index 8d85cf7b1..25a554f94 100644
--- a/src/transport/test_transport_api_reliability_http_xhr_peer2.conf
+++ b/src/transport/test_transport_api_reliability_http_xhr_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-http-p2/
+GNUNET_TEST_HOME = $GNUNET_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 07f8590a2..1b51da130 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-https-p1/
+GNUNET_TEST_HOME = $GNUNET_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 7f7f80778..3dfb87a6d 100644
--- a/src/transport/test_transport_api_reliability_https_peer2.conf
+++ b/src/transport/test_transport_api_reliability_https_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-https-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-https-p2/
 
 [transport-https_server]
 PORT = 12310
diff --git a/src/transport/test_transport_api_reliability_https_xhr_peer1.conf 
b/src/transport/test_transport_api_reliability_https_xhr_peer1.conf
index 614e371da..5d042f2f9 100644
--- a/src/transport/test_transport_api_reliability_https_xhr_peer1.conf
+++ b/src/transport/test_transport_api_reliability_https_xhr_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-https-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-https-p1/
 
 [transport-https_client]
 EMULATE_XHR = YES
diff --git a/src/transport/test_transport_api_reliability_https_xhr_peer2.conf 
b/src/transport/test_transport_api_reliability_https_xhr_peer2.conf
index 7f7f80778..3dfb87a6d 100644
--- a/src/transport/test_transport_api_reliability_https_xhr_peer2.conf
+++ b/src/transport/test_transport_api_reliability_https_xhr_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-https-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-https-p2/
 
 [transport-https_server]
 PORT = 12310
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 e3c14dc0b..6aa9dbf22 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-reliability-tcp-nat-p1/
+GNUNET_TEST_HOME = $GNUNET_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 6a648c41c..2de9026f5 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-reliability-tcp-nat-p2/
+GNUNET_TEST_HOME = $GNUNET_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 297382fcf..305605d63 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_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 879223ad9..43bb4ae37 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 
 [transport-tcp]
 PORT = 12015
diff --git a/src/transport/test_transport_api_reliability_udp_peer1.conf 
b/src/transport/test_transport_api_reliability_udp_peer1.conf
index 34e4d7eea..141fb0840 100644
--- a/src/transport/test_transport_api_reliability_udp_peer1.conf
+++ b/src/transport/test_transport_api_reliability_udp_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-udp-p1/
 
 [transport-udp]
 PORT = 12040
diff --git a/src/transport/test_transport_api_reliability_udp_peer2.conf 
b/src/transport/test_transport_api_reliability_udp_peer2.conf
index 23eae7862..7523db854 100644
--- a/src/transport/test_transport_api_reliability_udp_peer2.conf
+++ b/src/transport/test_transport_api_reliability_udp_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-udp-p2/
 
 [transport-udp]
 PORT = 12050
diff --git a/src/transport/test_transport_api_reliability_unix_peer1.conf 
b/src/transport/test_transport_api_reliability_unix_peer1.conf
index d43ef4a33..e253aad8c 100644
--- a/src/transport/test_transport_api_reliability_unix_peer1.conf
+++ b/src/transport/test_transport_api_reliability_unix_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-unix-p1/
 
 [arm]
 PORT = 12125
diff --git a/src/transport/test_transport_api_reliability_unix_peer2.conf 
b/src/transport/test_transport_api_reliability_unix_peer2.conf
index f863d4d42..e0df47c07 100644
--- a/src/transport/test_transport_api_reliability_unix_peer2.conf
+++ b/src/transport/test_transport_api_reliability_unix_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-unix-p2/
 
 [arm]
 PORT = 12135
diff --git a/src/transport/test_transport_api_reliability_wlan_peer1.conf 
b/src/transport/test_transport_api_reliability_wlan_peer1.conf
index 2ad5b3e14..19eb21456 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p1/
+GNUNET_TEST_HOME = $GNUNET_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 b52438c21..d5c269b43 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-wlan-p2/
 
 [transport-wlan]
 INTERFACE = mon1
diff --git a/src/transport/test_transport_api_restart_1peer_peer1.conf 
b/src/transport/test_transport_api_restart_1peer_peer1.conf
index 4bfe9b6ca..eabd6b701 100644
--- a/src/transport/test_transport_api_restart_1peer_peer1.conf
+++ b/src/transport/test_transport_api_restart_1peer_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/transport/test_transport_api_restart_1peer_peer2.conf 
b/src/transport/test_transport_api_restart_1peer_peer2.conf
index e68cdbee4..58ce0777f 100644
--- a/src/transport/test_transport_api_restart_1peer_peer2.conf
+++ b/src/transport/test_transport_api_restart_1peer_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/transport/test_transport_api_restart_2peers_peer1.conf 
b/src/transport/test_transport_api_restart_2peers_peer1.conf
index 4bfe9b6ca..eabd6b701 100644
--- a/src/transport/test_transport_api_restart_2peers_peer1.conf
+++ b/src/transport/test_transport_api_restart_2peers_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/transport/test_transport_api_restart_2peers_peer2.conf 
b/src/transport/test_transport_api_restart_2peers_peer2.conf
index e68cdbee4..58ce0777f 100644
--- a/src/transport/test_transport_api_restart_2peers_peer2.conf
+++ b/src/transport/test_transport_api_restart_2peers_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/transport/test_transport_api_slow_ats_peer1.conf 
b/src/transport/test_transport_api_slow_ats_peer1.conf
index 5d50d5375..a96f5e263 100644
--- a/src/transport/test_transport_api_slow_ats_peer1.conf
+++ b/src/transport/test_transport_api_slow_ats_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-slow-ats-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-slow-ats-p1/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/transport/test_transport_api_slow_ats_peer2.conf 
b/src/transport/test_transport_api_slow_ats_peer2.conf
index 6b67c89d8..3a6ed05d3 100644
--- a/src/transport/test_transport_api_slow_ats_peer2.conf
+++ b/src/transport/test_transport_api_slow_ats_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-slow-ats-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-slow-ats-p2/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf 
b/src/transport/test_transport_api_tcp_nat_peer1.conf
index 946d5e1cb..b8d83ce29 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-nat-p1/
+GNUNET_TEST_HOME = $GNUNET_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 eae20a8d5..1faefc195 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-nat-p2/
+GNUNET_TEST_HOME = $GNUNET_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 4bfe9b6ca..eabd6b701 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/transport/test_transport_api_tcp_peer2.conf 
b/src/transport/test_transport_api_tcp_peer2.conf
index e68cdbee4..58ce0777f 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/transport/test_transport_api_timeout_bluetooth_peer1.conf 
b/src/transport/test_transport_api_timeout_bluetooth_peer1.conf
index d63bca939..dcc159e45 100644
--- a/src/transport/test_transport_api_timeout_bluetooth_peer1.conf
+++ b/src/transport/test_transport_api_timeout_bluetooth_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-bluetooth-p1/
 
 [transport-bluetooth]
 INTERFACE = hci0
diff --git a/src/transport/test_transport_api_timeout_bluetooth_peer2.conf 
b/src/transport/test_transport_api_timeout_bluetooth_peer2.conf
index 4a19cddf5..5cd550d0e 100644
--- a/src/transport/test_transport_api_timeout_bluetooth_peer2.conf
+++ b/src/transport/test_transport_api_timeout_bluetooth_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-bluetooth-p2/
 
 [transport-bluetooth]
 INTERFACE = hci1
diff --git a/src/transport/test_transport_api_timeout_http_peer1.conf 
b/src/transport/test_transport_api_timeout_http_peer1.conf
index 5811761d2..d7bc59ea3 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-http-p1/
 
 [arm]
 PORT = 12085
diff --git a/src/transport/test_transport_api_timeout_http_peer2.conf 
b/src/transport/test_transport_api_timeout_http_peer2.conf
index 934dc8c6c..453c6d0c5 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-http-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-http-p2/
 
 [transport-http_server]
 PORT = 12090
diff --git a/src/transport/test_transport_api_timeout_https_peer1.conf 
b/src/transport/test_transport_api_timeout_https_peer1.conf
index 8fc2edf2e..c4f96814c 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-https-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-https-p1/
 
 [arm]
 PORT = 12105
diff --git a/src/transport/test_transport_api_timeout_https_peer2.conf 
b/src/transport/test_transport_api_timeout_https_peer2.conf
index 017aa908e..bfdf0caec 100644
--- a/src/transport/test_transport_api_timeout_https_peer2.conf
+++ b/src/transport/test_transport_api_timeout_https_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-https-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-https-p2/
 
 [transport-https_server]
 PORT = 12110
diff --git a/src/transport/test_transport_api_timeout_tcp_peer1.conf 
b/src/transport/test_transport_api_timeout_tcp_peer1.conf
index 4cdfdcdee..389250bec 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_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 2abd5331c..225b8fac2 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_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 efa08fde5..e28e3a2e0 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p1/
+GNUNET_TEST_HOME = $GNUNET_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 14618f3b4..434ef4853 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p2/
+GNUNET_TEST_HOME = $GNUNET_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 d43ef4a33..e253aad8c 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p1/
+GNUNET_TEST_HOME = $GNUNET_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 9feed6592..bd3fccbb3 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-unix-p2/
 
 [arm]
 PORT = 12135
diff --git a/src/transport/test_transport_api_timeout_wlan_peer1.conf 
b/src/transport/test_transport_api_timeout_wlan_peer1.conf
index 8b870f1d4..68716d287 100644
--- a/src/transport/test_transport_api_timeout_wlan_peer1.conf
+++ b/src/transport/test_transport_api_timeout_wlan_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-wlan-p1/
 
 [transport-wlan]
 INTERFACE = mon0
diff --git a/src/transport/test_transport_api_timeout_wlan_peer2.conf 
b/src/transport/test_transport_api_timeout_wlan_peer2.conf
index c32ce5ced..98bbc6e2b 100644
--- a/src/transport/test_transport_api_timeout_wlan_peer2.conf
+++ b/src/transport/test_transport_api_timeout_wlan_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-wlan-p2/
 
 [transport-wlan]
 INTERFACE = mon1
diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf 
b/src/transport/test_transport_api_udp_nat_peer1.conf
index 23f280b5e..7bbcaa628 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-udp-nat-p1/
+GNUNET_TEST_HOME = $GNUNET_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 702791846..8bdb8c293 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-udp-nat-p2/
+GNUNET_TEST_HOME = $GNUNET_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 7c1f0d9f9..4684b77f2 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p1/
+GNUNET_TEST_HOME = $GNUNET_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 ab9b2148f..96706ce49 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-udp-p2/
 
 [transport-udp]
 PORT = 12050
diff --git a/src/transport/test_transport_api_unix_abstract_peer1.conf 
b/src/transport/test_transport_api_unix_abstract_peer1.conf
index aea61113d..103a483b4 100644
--- a/src/transport/test_transport_api_unix_abstract_peer1.conf
+++ b/src/transport/test_transport_api_unix_abstract_peer1.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-unix-p1/
 
 [arm]
 PORT = 12125
diff --git a/src/transport/test_transport_api_unix_abstract_peer2.conf 
b/src/transport/test_transport_api_unix_abstract_peer2.conf
index 3adbd7fd0..c3a5525d9 100644
--- a/src/transport/test_transport_api_unix_abstract_peer2.conf
+++ b/src/transport/test_transport_api_unix_abstract_peer2.conf
@@ -1,6 +1,6 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-unix-p2/
 
 [arm]
 PORT = 12135
diff --git a/src/transport/test_transport_api_unix_peer1.conf 
b/src/transport/test_transport_api_unix_peer1.conf
index 292756806..005558bcc 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-unix-p1/
 
 [transport]
 PLUGINS = unix
diff --git a/src/transport/test_transport_api_unix_peer2.conf 
b/src/transport/test_transport_api_unix_peer2.conf
index 6da2a2b7c..840ed81c7 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-unix-p2/
 
 [transport]
 PLUGINS = unix
diff --git 
a/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf 
b/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf
index 8f50bf113..3f86ee940 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/
+GNUNET_TEST_HOME = $GNUNET_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 1816ec99e..5fc178395 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/
+GNUNET_TEST_HOME = $GNUNET_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 eeee8ee62..9f63c0ced 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p1/
+GNUNET_TEST_HOME = $GNUNET_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 678642a41..cdf3d7bb4 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-udp-p2/
 
 [transport-udp]
 PORT = 12050
diff --git a/src/transport/test_transport_api_unreliability_wlan_peer1.conf 
b/src/transport/test_transport_api_unreliability_wlan_peer1.conf
index eb7756f27..78e280b68 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p1/
+GNUNET_TEST_HOME = $GNUNET_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 aafeb09f8..e97ab3f38 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p2/
+GNUNET_TEST_HOME = $GNUNET_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 8b870f1d4..68716d287 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p1/
+GNUNET_TEST_HOME = $GNUNET_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 c32ce5ced..98bbc6e2b 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-wlan-p2/
+GNUNET_TEST_HOME = $GNUNET_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 3f2742c91..c8a5bf0d4 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_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 bd0108b9b..30b82aebf 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 
 [transport]
 PLUGINS = tcp udp
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 6261fa7a1..12c11252e 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 
 [transport]
 PLUGINS = tcp
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 cfcc2a24a..4b449bed8 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 
 [transport]
 PLUGINS = tcp
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 5f54b7321..690eb3b76 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 
 [transport]
 PLUGINS = tcp udp
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 98a5e787f..00d3343e8 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/transport/test_transport_blacklisting_cfg_peer1.conf 
b/src/transport/test_transport_blacklisting_cfg_peer1.conf
index d75e23e06..9150c7faf 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_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 879223ad9..43bb4ae37 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]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_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 95a57c954..ddb523986 100644
--- a/src/transport/test_transport_defaults.conf
+++ b/src/transport/test_transport_defaults.conf
@@ -1,7 +1,7 @@
 @INLINE@ ../../contrib/no_forcestart.conf
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport-api/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport-api/
 
 [transport-tcp]
 TIMEOUT = 300 s
diff --git 
a/src/transport/test_transport_test_transport_address_switch_tcp_peer1.conf 
b/src/transport/test_transport_test_transport_address_switch_tcp_peer1.conf
index 4a550402d..920e8d199 100644
--- a/src/transport/test_transport_test_transport_address_switch_tcp_peer1.conf
+++ b/src/transport/test_transport_test_transport_address_switch_tcp_peer1.conf
@@ -20,7 +20,7 @@ BLUETOOTH_QUOTA_IN = 8 KiB
 BLUETOOTH_QUOTA_OUT = 8 KiB
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/quota-tcp-p1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/quota-tcp-p1/
 
 [transport]
 PLUGINS = tcp
diff --git 
a/src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf 
b/src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf
index 927c35c56..6855cd00d 100644
--- a/src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf
+++ b/src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf
@@ -21,7 +21,7 @@ BLUETOOTH_QUOTA_OUT = 8 KiB
 
 
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 
 [transport]
 PLUGINS = tcp
diff --git a/src/util/test_configuration_data.conf 
b/src/util/test_configuration_data.conf
index 517cbf0b0..93dfd128a 100644
--- a/src/util/test_configuration_data.conf
+++ b/src/util/test_configuration_data.conf
@@ -3,7 +3,7 @@ SUBST=/hello
 
 [GNUNET]
 SUBST=hello
-GNUNET_HOME=/tmp
+GNUNET_HOME=$GNUNET_TMP/test-hello-configuration-data/
 
 [test]
 a=a
diff --git a/src/util/test_resolver_api_data.conf 
b/src/util/test_resolver_api_data.conf
index 42b36d66a..dd4384b80 100644
--- a/src/util/test_resolver_api_data.conf
+++ b/src/util/test_resolver_api_data.conf
@@ -1,5 +1,5 @@
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunetd-statistics/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-statistics/
 
 [resolver]
 PORT = 22354
diff --git a/src/util/test_service_data.conf b/src/util/test_service_data.conf
index c04626b5b..975d5a1e3 100644
--- a/src/util/test_service_data.conf
+++ b/src/util/test_service_data.conf
@@ -1,7 +1,7 @@
 [test_service]
 PORT=12435
 BINDTO=localhost
-PIDFILE=/tmp/test-service.pid
+PIDFILE=$GNUNET_TMP/test-service.pid
 MAXBUF=1024
 DISABLEV6=NO
 ACCEPT_FROM=127.0.0.1;
@@ -12,7 +12,7 @@ HOSTNAME=localhost
 
 [test_service6]
 PORT=12435
-PIDFILE=/tmp/test-service.pid
+PIDFILE=$GNUNET_TMP/test-service.pid
 TIMEOUT=30 s
 MAXBUF=1024
 DISABLEV6=NO

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]