104 files changed, 517 insertions, 517 deletions

diff --git a/src/transport/template_cfg_peer1.conf b/src/transport/template_cfg_peer1.conf
index d66ab1906..3042ce862 100644
--- a/src/transport/template_cfg_peer1.conf
+++ b/src/transport/template_cfg_peer1.conf
@@ -19,31 +19,31 @@ PORT = 12007
 [arm]
 PORT = 12005
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12004
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12003
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12002
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 USE_INCLUDED_HELLOS = NO
 
 [transport]
 #PREFIX = valgrind --leak-check=full
 PORT = 12001
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 [ats]
 WAN_QUOTA_IN = unlimited
 WAN_QUOTA_OUT = unlimited
 PORT = 12006
-UNIXPATH = /tmp/gnunet-p1-service-ats.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock
 
 [hostlist]
 SERVERS = dummy
\ No newline at end of file
diff --git a/src/transport/template_cfg_peer2.conf b/src/transport/template_cfg_peer2.conf
index a4b2f2b91..b5ba77b76 100644
--- a/src/transport/template_cfg_peer2.conf
+++ b/src/transport/template_cfg_peer2.conf
@@ -19,31 +19,31 @@ PORT = 12017
 [arm]
 PORT = 12014
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12013
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12012
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12011
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 USE_INCLUDED_HELLOS = NO
 
 [transport]
 #PREFIX = valgrind --leak-check=full
 PORT = 12010
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 [ats]
 WAN_QUOTA_IN = unlimited
 WAN_QUOTA_OUT = unlimited
 PORT = 12016
-UNIXPATH = /tmp/gnunet-p2-service-ats.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-ats.sock
 
 [hostlist]
 SERVERS = dummy
\ No newline at end of file
diff --git a/src/transport/test_plugin_transport_data.conf b/src/transport/test_plugin_transport_data.conf
index 885fed8d7..e561cfd30 100644
--- a/src/transport/test_plugin_transport_data.conf
+++ b/src/transport/test_plugin_transport_data.conf
@@ -26,23 +26,23 @@ PORT = 2403
 
 [arm]
 PORT = 2360
-UNIXPATH = /tmp/gnunet-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-arm.sock
 
 [statistics]
 PORT = 2361
-UNIXPATH = /tmp/gnunet-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics.sock
 
 [resolver]
 PORT = 2362
-UNIXPATH = /tmp/gnunet-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver.sock
 
 [peerinfo]
 PORT = 2363
-UNIXPATH = /tmp/gnunet-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-peerinfo.sock
 
 [transport]
 PORT = 2364
-UNIXPATH = /tmp/gnunet-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport.sock
 
 [nat]
 RETURN_LOCAL_ADDRESSES = YES
diff --git a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf
index f20b62b85..8f50bf113 100644
--- a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf
@@ -8,23 +8,23 @@ TESTMODE = 1
 
 [arm]
 PORT = 12164
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12163
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12162
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12161
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12160
 PLUGINS = bluetooth
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 
diff --git a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf
index fe2535d9f..1816ec99e 100644
--- a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf
@@ -8,22 +8,22 @@ TESTMODE = 2
 
 [arm]
 PORT = 12174
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12173
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12172
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12171
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12170
 PLUGINS = bluetooth
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
diff --git a/src/transport/test_quota_compliance_bluetooth_peer1.conf b/src/transport/test_quota_compliance_bluetooth_peer1.conf
index f20b62b85..8f50bf113 100644
--- a/src/transport/test_quota_compliance_bluetooth_peer1.conf
+++ b/src/transport/test_quota_compliance_bluetooth_peer1.conf
@@ -8,23 +8,23 @@ TESTMODE = 1
 
 [arm]
 PORT = 12164
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12163
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12162
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12161
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12160
 PLUGINS = bluetooth
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 
diff --git a/src/transport/test_quota_compliance_bluetooth_peer2.conf b/src/transport/test_quota_compliance_bluetooth_peer2.conf
index fe2535d9f..1816ec99e 100644
--- a/src/transport/test_quota_compliance_bluetooth_peer2.conf
+++ b/src/transport/test_quota_compliance_bluetooth_peer2.conf
@@ -8,22 +8,22 @@ TESTMODE = 2
 
 [arm]
 PORT = 12174
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12173
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12172
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12171
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12170
 PLUGINS = bluetooth
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
diff --git a/src/transport/test_quota_compliance_http_asymmetric_peer1.conf b/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
index 98d1db1cb..10ee02936 100644
--- a/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
@@ -6,23 +6,23 @@ GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1
 
 [arm]
 PORT = 4015
-UNIXPATH = /tmp/test_quota_compliance_http_arm_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_arm_peer1.sock
 
 [statistics]
 PORT = 4014
-UNIXPATH = /tmp/test_quota_compliance_http_statistics_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_statistics_peer1.sock
 
 [resolver]
 PORT = 4013
-UNIXPATH = /tmp/test_quota_compliance_http_resolver_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_resolver_peer1.sock
 
 [peerinfo]
 PORT = 4012
-UNIXPATH = /tmp/test_quota_compliance_http_peerinfo_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_peerinfo_peer1.sock
 
 [transport]
 PORT = 4011
 PLUGINS = http_client
-UNIXPATH = /tmp/test_quota_compliance_http_transport_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_transport_peer1.sock
 
 
diff --git a/src/transport/test_quota_compliance_http_asymmetric_peer2.conf b/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
index 953915cf6..470b3003a 100644
--- a/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
@@ -10,23 +10,23 @@ BINDTO = 127.0.0.1
 
 [arm]
 PORT = 3015
-UNIXPATH = /tmp/test_quota_compliance_http_arm_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_arm_peer2.sock
 
 [statistics]
 PORT = 3014
-UNIXPATH = /tmp/test_quota_compliance_http_statistics_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_statistics_peer2.sock
 
 [resolver]
 PORT = 3013
-UNIXPATH = /tmp/test_quota_compliance_http_resolver_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_resolver_peer2.sock
 
 [peerinfo]
 PORT = 3012
-UNIXPATH = /tmp/test_quota_compliance_http_peerinfo_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_peerinfo_peer2.sock
 
 [transport]
 PORT = 3011
 PLUGINS = http_server
-UNIXPATH = /tmp/test_quota_compliance_http_transport_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_transport_peer2.sock
 
 
diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf
index 98d1db1cb..10ee02936 100644
--- a/src/transport/test_quota_compliance_http_peer1.conf
+++ b/src/transport/test_quota_compliance_http_peer1.conf
@@ -6,23 +6,23 @@ GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1
 
 [arm]
 PORT = 4015
-UNIXPATH = /tmp/test_quota_compliance_http_arm_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_arm_peer1.sock
 
 [statistics]
 PORT = 4014
-UNIXPATH = /tmp/test_quota_compliance_http_statistics_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_statistics_peer1.sock
 
 [resolver]
 PORT = 4013
-UNIXPATH = /tmp/test_quota_compliance_http_resolver_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_resolver_peer1.sock
 
 [peerinfo]
 PORT = 4012
-UNIXPATH = /tmp/test_quota_compliance_http_peerinfo_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_peerinfo_peer1.sock
 
 [transport]
 PORT = 4011
 PLUGINS = http_client
-UNIXPATH = /tmp/test_quota_compliance_http_transport_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_transport_peer1.sock
 
 
diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf
index 953915cf6..470b3003a 100644
--- a/src/transport/test_quota_compliance_http_peer2.conf
+++ b/src/transport/test_quota_compliance_http_peer2.conf
@@ -10,23 +10,23 @@ BINDTO = 127.0.0.1
 
 [arm]
 PORT = 3015
-UNIXPATH = /tmp/test_quota_compliance_http_arm_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_arm_peer2.sock
 
 [statistics]
 PORT = 3014
-UNIXPATH = /tmp/test_quota_compliance_http_statistics_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_statistics_peer2.sock
 
 [resolver]
 PORT = 3013
-UNIXPATH = /tmp/test_quota_compliance_http_resolver_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_resolver_peer2.sock
 
 [peerinfo]
 PORT = 3012
-UNIXPATH = /tmp/test_quota_compliance_http_peerinfo_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_peerinfo_peer2.sock
 
 [transport]
 PORT = 3011
 PLUGINS = http_server
-UNIXPATH = /tmp/test_quota_compliance_http_transport_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_transport_peer2.sock
 
 
diff --git a/src/transport/test_quota_compliance_https_asymmetric_peer1.conf b/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
index 9493fdee2..52504d34d 100644
--- a/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
@@ -6,23 +6,23 @@ GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/
 
 [arm]
 PORT = 4006
-UNIXPATH = /tmp/test_quota_compliance_https_arm_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_arm_peer1.sock
 
 [statistics]
 PORT = 4005
-UNIXPATH = /tmp/test_quota_compliance_https_statistics_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_statistics_peer1.sock
 
 [resolver]
 PORT = 4004
-UNIXPATH = /tmp/test_quota_compliance_https_resolver_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_resolver_peer1.sock
 
 [peerinfo]
 PORT = 4003
-UNIXPATH = /tmp/test_quota_compliance_https_peerinfo_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_peerinfo_peer1.sock
 
 [transport]
 PORT = 4002
 PLUGINS = https_client
-UNIXPATH = /tmp/test_quota_compliance_https_transport_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_transport_peer1.sock
 
 
diff --git a/src/transport/test_quota_compliance_https_asymmetric_peer2.conf b/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
index eefc24f1d..59ac327d5 100644
--- a/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
@@ -9,23 +9,23 @@ CERT_FILE = https_cert_qutoa_p2.crt
 
 [arm]
 PORT = 3006
-UNIXPATH = /tmp/test_quota_compliance_https_arm_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_arm_peer2.sock
 
 [statistics]
 PORT = 3005
-UNIXPATH = /tmp/test_quota_compliance_https_statistics_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_statistics_peer2.sock
 
 [resolver]
 PORT = 3004
-UNIXPATH = /tmp/test_quota_compliance_https_resolver_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_resolver_peer2.sock
 
 [peerinfo]
 PORT = 3003
-UNIXPATH = /tmp/test_quota_compliance_https_peerinfo_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_peerinfo_peer2.sock
 
 [transport]
 PORT = 3002
 PLUGINS = https_server
-UNIXPATH = /tmp/https_transport_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/https_transport_peer2.sock
 
 
diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf
index 9493fdee2..52504d34d 100644
--- a/src/transport/test_quota_compliance_https_peer1.conf
+++ b/src/transport/test_quota_compliance_https_peer1.conf
@@ -6,23 +6,23 @@ GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/
 
 [arm]
 PORT = 4006
-UNIXPATH = /tmp/test_quota_compliance_https_arm_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_arm_peer1.sock
 
 [statistics]
 PORT = 4005
-UNIXPATH = /tmp/test_quota_compliance_https_statistics_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_statistics_peer1.sock
 
 [resolver]
 PORT = 4004
-UNIXPATH = /tmp/test_quota_compliance_https_resolver_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_resolver_peer1.sock
 
 [peerinfo]
 PORT = 4003
-UNIXPATH = /tmp/test_quota_compliance_https_peerinfo_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_peerinfo_peer1.sock
 
 [transport]
 PORT = 4002
 PLUGINS = https_client
-UNIXPATH = /tmp/test_quota_compliance_https_transport_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_transport_peer1.sock
 
 
diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf
index eefc24f1d..59ac327d5 100644
--- a/src/transport/test_quota_compliance_https_peer2.conf
+++ b/src/transport/test_quota_compliance_https_peer2.conf
@@ -9,23 +9,23 @@ CERT_FILE = https_cert_qutoa_p2.crt
 
 [arm]
 PORT = 3006
-UNIXPATH = /tmp/test_quota_compliance_https_arm_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_arm_peer2.sock
 
 [statistics]
 PORT = 3005
-UNIXPATH = /tmp/test_quota_compliance_https_statistics_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_statistics_peer2.sock
 
 [resolver]
 PORT = 3004
-UNIXPATH = /tmp/test_quota_compliance_https_resolver_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_resolver_peer2.sock
 
 [peerinfo]
 PORT = 3003
-UNIXPATH = /tmp/test_quota_compliance_https_peerinfo_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_peerinfo_peer2.sock
 
 [transport]
 PORT = 3002
 PLUGINS = https_server
-UNIXPATH = /tmp/https_transport_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/https_transport_peer2.sock
 
 
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
index 51804917c..cc797c154 100644
--- a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
@@ -10,23 +10,23 @@ PORT = 4094
 
 [arm]
 PORT = 4087
-UNIXPATH = /tmp/test_quota_compliance_tcp_arm_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_arm_peer1.sock
 
 [statistics]
 PORT = 4088
-UNIXPATH = /tmp/test_quota_compliance_tcp_statistics_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_statistics_peer1.sock
 
 [resolver]
 PORT = 4089
-UNIXPATH = /tmp/test_quota_compliance_tcp_resolver_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_resolver_peer1.sock
 
 [peerinfo]
 PORT = 4090
-UNIXPATH = /tmp/test_quota_compliance_tcp_peerinfo_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_peerinfo_peer1.sock
 
 [transport]
 PORT = 4091
 PLUGINS = tcp
-UNIXPATH = /tmp/test_quota_compliance_tcp_transport_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_transport_peer1.sock
 
 
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
index a31459db0..d1e91a220 100644
--- a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
@@ -9,22 +9,22 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12014
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12013
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12012
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12011
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12010
 PLUGINS = tcp
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf
index 51804917c..cc797c154 100644
--- a/src/transport/test_quota_compliance_tcp_peer1.conf
+++ b/src/transport/test_quota_compliance_tcp_peer1.conf
@@ -10,23 +10,23 @@ PORT = 4094
 
 [arm]
 PORT = 4087
-UNIXPATH = /tmp/test_quota_compliance_tcp_arm_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_arm_peer1.sock
 
 [statistics]
 PORT = 4088
-UNIXPATH = /tmp/test_quota_compliance_tcp_statistics_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_statistics_peer1.sock
 
 [resolver]
 PORT = 4089
-UNIXPATH = /tmp/test_quota_compliance_tcp_resolver_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_resolver_peer1.sock
 
 [peerinfo]
 PORT = 4090
-UNIXPATH = /tmp/test_quota_compliance_tcp_peerinfo_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_peerinfo_peer1.sock
 
 [transport]
 PORT = 4091
 PLUGINS = tcp
-UNIXPATH = /tmp/test_quota_compliance_tcp_transport_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_transport_peer1.sock
 
 
diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf
index 0e477e7c6..c80e588ce 100644
--- a/src/transport/test_quota_compliance_tcp_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_peer2.conf
@@ -9,22 +9,22 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12014
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12013
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12012
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12011
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12010
 PLUGINS = tcp
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
diff --git a/src/transport/test_quota_compliance_udp_peer1.conf b/src/transport/test_quota_compliance_udp_peer1.conf
index 8130083b1..13d417d70 100644
--- a/src/transport/test_quota_compliance_udp_peer1.conf
+++ b/src/transport/test_quota_compliance_udp_peer1.conf
@@ -8,22 +8,22 @@ MAX_BPS = 50000000
 
 [arm]
 PORT = 4087
-UNIXPATH = /tmp/test_quota_compliance_udp_arm_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_arm_peer1.sock
 
 [statistics]
 PORT = 4088
-UNIXPATH = /tmp/test_quota_compliance_udp_statistics_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_statistics_peer1.sock
 
 [resolver]
 PORT = 4089
-UNIXPATH = /tmp/test_quota_compliance_udp_resolver_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_resolver_peer1.sock
 
 [peerinfo]
 PORT = 4090
-UNIXPATH = /tmp/test_quota_compliance_udp_peerinfo_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_peerinfo_peer1.sock
 
 [transport]
 PORT = 4091
 PLUGINS = udp
-UNIXPATH = /tmp/test_quota_compliance_udp_transport_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_transport_peer1.sock
 
diff --git a/src/transport/test_quota_compliance_udp_peer2.conf b/src/transport/test_quota_compliance_udp_peer2.conf
index 835ad8ff0..db5f32f0d 100644
--- a/src/transport/test_quota_compliance_udp_peer2.conf
+++ b/src/transport/test_quota_compliance_udp_peer2.conf
@@ -8,23 +8,23 @@ MAX_BPS = 50000000
 
 [arm]
 PORT = 3087
-UNIXPATH = /tmp/test_quota_compliance_udp_arm_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_arm_peer2.sock
 
 [statistics]
 PORT = 3088
-UNIXPATH = /tmp/test_quota_compliance_udp_statistics_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_statistics_peer2.sock
 
 [resolver]
 PORT = 3089
-UNIXPATH = /tmp/test_quota_compliance_udp_resolver_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_resolver_peer2.sock
 
 [peerinfo]
 PORT = 3090
-UNIXPATH = /tmp/test_quota_compliance_udp_peerinfo_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_peerinfo_peer2.sock
 
 [transport]
 PORT = 3091
 PLUGINS = udp
-UNIXPATH = /tmp/test_quota_compliance_udp_transport_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_transport_peer2.sock
 
 
diff --git a/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf b/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
index 2282bcb57..63beae53c 100644
--- a/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
@@ -4,24 +4,24 @@ GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/
 
 [arm]
 PORT = 4087
-UNIXPATH = /tmp/test_quota_compliance_unix_arm_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_arm_peer1.sock
 
 [statistics]
 PORT = 4088
-UNIXPATH = /tmp/test_quota_compliance_unix_statistics_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_statistics_peer1.sock
 
 [resolver]
 PORT = 4089
-UNIXPATH = /tmp/test_quota_compliance_unix_resolver_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_resolver_peer1.sock
 
 [peerinfo]
 PORT = 4090
-UNIXPATH = /tmp/test_quota_compliance_unix_peerinfo_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_peerinfo_peer1.sock
 
 [transport]
 PORT = 4091
 PLUGINS = unix
-UNIXPATH = /tmp/test_quota_compliance_unix_transport_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_transport_peer1.sock
 
 [transport-unix]
 PORT = 4092
diff --git a/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf b/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
index 339d5d7c6..36a55e69c 100644
--- a/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
@@ -4,24 +4,24 @@ GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2
 
 [arm]
 PORT = 3087
-UNIXPATH = /tmp/test_quota_compliance_unix_arm_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_arm_peer2.sock
 
 [statistics]
 PORT = 3088
-UNIXPATH = /tmp/test_quota_compliance_unix_statistics_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_statistics_peer2.sock
 
 [resolver]
 PORT = 3089
-UNIXPATH = /tmp/test_quota_compliance_unix_resolver_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_resolver_peer2.sock
 
 [peerinfo]
 PORT = 3090
-UNIXPATH = /tmp/test_quota_compliance_unix_peerinfo_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_peerinfo_peer2.sock
 
 [transport]
 PORT = 3091
 PLUGINS = unix
-UNIXPATH = /tmp/test_quota_compliance_unix_transport_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_transport_peer2.sock
 
 [transport-unix]
 PORT = 3368
diff --git a/src/transport/test_quota_compliance_unix_peer1.conf b/src/transport/test_quota_compliance_unix_peer1.conf
index 38dfb4fe7..284a830c5 100644
--- a/src/transport/test_quota_compliance_unix_peer1.conf
+++ b/src/transport/test_quota_compliance_unix_peer1.conf
@@ -7,21 +7,21 @@ PORT = 12120
 
 [arm]
 PORT = 4087
-UNIXPATH = /tmp/test_quota_compliance_unix_arm_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_arm_peer1.sock
 
 [statistics]
 PORT = 4088
-UNIXPATH = /tmp/test_quota_compliance_unix_statistics_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_statistics_peer1.sock
 
 [resolver]
 PORT = 4089
-UNIXPATH = /tmp/test_quota_compliance_unix_resolver_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_resolver_peer1.sock
 
 [peerinfo]
 PORT = 4090
-UNIXPATH = /tmp/test_quota_compliance_unix_peerinfo_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_peerinfo_peer1.sock
 
 [transport]
 PORT = 4091
 PLUGINS = unix
-UNIXPATH = /tmp/test_quota_compliance_unix_transport_peer1.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_transport_peer1.sock
diff --git a/src/transport/test_quota_compliance_unix_peer2.conf b/src/transport/test_quota_compliance_unix_peer2.conf
index c9dc6126b..9e10a92f0 100644
--- a/src/transport/test_quota_compliance_unix_peer2.conf
+++ b/src/transport/test_quota_compliance_unix_peer2.conf
@@ -7,24 +7,24 @@ PORT = 12136
 
 [arm]
 PORT = 3087
-UNIXPATH = /tmp/test_quota_compliance_unix_arm_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_arm_peer2.sock
 
 [statistics]
 PORT = 3088
-UNIXPATH = /tmp/test_quota_compliance_unix_statistics_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_statistics_peer2.sock
 
 [resolver]
 PORT = 3089
-UNIXPATH = /tmp/test_quota_compliance_unix_resolver_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_resolver_peer2.sock
 
 [peerinfo]
 PORT = 3090
-UNIXPATH = /tmp/test_quota_compliance_unix_peerinfo_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_peerinfo_peer2.sock
 
 [transport]
 PORT = 3091
 PLUGINS = unix
-UNIXPATH = /tmp/test_quota_compliance_unix_transport_peer2.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_transport_peer2.sock
 
 [transport-unix]
 PORT = 3368
diff --git a/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf b/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf
index d49a06b78..eb7756f27 100644
--- a/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf
@@ -7,23 +7,23 @@ TESTMODE = 1
 
 [arm]
 PORT = 12164
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12163
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12162
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12161
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12160
 PLUGINS = wlan
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 
diff --git a/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf b/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf
index 137dd37ec..aafeb09f8 100644
--- a/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf
@@ -8,22 +8,22 @@ TESTMODE = 2
 
 [arm]
 PORT = 12174
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12173
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12172
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12171
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12170
 PLUGINS = wlan
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
diff --git a/src/transport/test_quota_compliance_wlan_peer1.conf b/src/transport/test_quota_compliance_wlan_peer1.conf
index d49a06b78..eb7756f27 100644
--- a/src/transport/test_quota_compliance_wlan_peer1.conf
+++ b/src/transport/test_quota_compliance_wlan_peer1.conf
@@ -7,23 +7,23 @@ TESTMODE = 1
 
 [arm]
 PORT = 12164
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12163
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12162
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12161
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12160
 PLUGINS = wlan
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 
diff --git a/src/transport/test_quota_compliance_wlan_peer2.conf b/src/transport/test_quota_compliance_wlan_peer2.conf
index 137dd37ec..aafeb09f8 100644
--- a/src/transport/test_quota_compliance_wlan_peer2.conf
+++ b/src/transport/test_quota_compliance_wlan_peer2.conf
@@ -8,22 +8,22 @@ TESTMODE = 2
 
 [arm]
 PORT = 12174
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12173
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12172
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12171
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12170
 PLUGINS = wlan
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
diff --git a/src/transport/test_transport_api_bidirectional_connect_peer1.conf b/src/transport/test_transport_api_bidirectional_connect_peer1.conf
index 88a4f54f6..855fa2557 100644
--- a/src/transport/test_transport_api_bidirectional_connect_peer1.conf
+++ b/src/transport/test_transport_api_bidirectional_connect_peer1.conf
@@ -5,23 +5,23 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
 [arm]
 PORT = 12000
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12001
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12002
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12003
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12004
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 [transport-tcp]
 PORT = 12005
diff --git a/src/transport/test_transport_api_bidirectional_connect_peer2.conf b/src/transport/test_transport_api_bidirectional_connect_peer2.conf
index 7d6ddec3e..c81777ae3 100644
--- a/src/transport/test_transport_api_bidirectional_connect_peer2.conf
+++ b/src/transport/test_transport_api_bidirectional_connect_peer2.conf
@@ -5,23 +5,23 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
 [arm]
 PORT = 12010
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12011
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12012
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12013
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12014
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 [transport-tcp]
 PORT = 12015
diff --git a/src/transport/test_transport_api_bluetooth_peer1.conf b/src/transport/test_transport_api_bluetooth_peer1.conf
index ccc9cec58..d63bca939 100644
--- a/src/transport/test_transport_api_bluetooth_peer1.conf
+++ b/src/transport/test_transport_api_bluetooth_peer1.conf
@@ -8,24 +8,24 @@ TESTMODE = 1
 
 [arm]
 PORT = 12164
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12163
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12162
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12161
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12160
 PLUGINS = bluetooth
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 #PREFIX = xterm -T transport2 -e gdb --command=cmd --args
 #PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600
 #PREFIX = valgrind --leak-check=full --show-reachable=yes
diff --git a/src/transport/test_transport_api_bluetooth_peer2.conf b/src/transport/test_transport_api_bluetooth_peer2.conf
index 5250cfdee..4a19cddf5 100644
--- a/src/transport/test_transport_api_bluetooth_peer2.conf
+++ b/src/transport/test_transport_api_bluetooth_peer2.conf
@@ -8,24 +8,24 @@ TESTMODE = 2
 
 [arm]
 PORT = 12174
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12173
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12172
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12171
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12170
 PLUGINS = bluetooth
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 #PREFIX = xterm -T transport2 -e gdb --command=cmd --args
 #PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600
 #PREFIX = valgrind --leak-check=full --show-reachable=yes
diff --git a/src/transport/test_transport_api_disconnect_tcp_peer1.conf b/src/transport/test_transport_api_disconnect_tcp_peer1.conf
index 0de45c8cf..66daf44ec 100644
--- a/src/transport/test_transport_api_disconnect_tcp_peer1.conf
+++ b/src/transport/test_transport_api_disconnect_tcp_peer1.conf
@@ -9,22 +9,22 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12005
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12004
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12003
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12002
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12001
 PLUGINS = tcp
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
diff --git a/src/transport/test_transport_api_disconnect_tcp_peer2.conf b/src/transport/test_transport_api_disconnect_tcp_peer2.conf
index 0e477e7c6..c80e588ce 100644
--- a/src/transport/test_transport_api_disconnect_tcp_peer2.conf
+++ b/src/transport/test_transport_api_disconnect_tcp_peer2.conf
@@ -9,22 +9,22 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12014
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12013
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12012
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12011
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12010
 PLUGINS = tcp
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf
index c65c38f94..238089c42 100644
--- a/src/transport/test_transport_api_http_peer1.conf
+++ b/src/transport/test_transport_api_http_peer1.conf
@@ -7,25 +7,25 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/
 [arm]
 PORT = 12085
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12084
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12083
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12082
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12081
 PLUGINS = http_client
 #BINARY = .libs/gnunet-service-transport
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 #PREFIX = valgrind --leak-check=full
 #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
 
diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf
index 04e51fe93..f2b748fd8 100644
--- a/src/transport/test_transport_api_http_peer2.conf
+++ b/src/transport/test_transport_api_http_peer2.conf
@@ -10,22 +10,22 @@ USE_IPv6 = YES
 [arm]
 PORT = 12095
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12094
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12093
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12092
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12091
 PLUGINS = http_server
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 #PREFIX = valgrind --leak-check=full
diff --git a/src/transport/test_transport_api_http_reverse_peer1.conf b/src/transport/test_transport_api_http_reverse_peer1.conf
index 2bdc3dbd5..351b29746 100644
--- a/src/transport/test_transport_api_http_reverse_peer1.conf
+++ b/src/transport/test_transport_api_http_reverse_peer1.conf
@@ -8,25 +8,25 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/
 [arm]
 PORT = 12095
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12094
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12093
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12092
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12091
 PLUGINS = http_client
 #BINARY = .libs/gnunet-service-transport
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 PREFIX = valgrind --leak-check=full
 #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
 
@@ -35,5 +35,5 @@ PREFIX = valgrind --leak-check=full
 WAN_QUOTA_IN = unlimited
 WAN_QUOTA_OUT = unlimited
 PORT = 12006
-UNIXPATH = /tmp/gnunet-http_reserver_p1-service-ats.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-http_reserver_p1-service-ats.sock
 
diff --git a/src/transport/test_transport_api_http_reverse_peer2.conf b/src/transport/test_transport_api_http_reverse_peer2.conf
index b38b5e56d..0283d12b5 100644
--- a/src/transport/test_transport_api_http_reverse_peer2.conf
+++ b/src/transport/test_transport_api_http_reverse_peer2.conf
@@ -17,24 +17,24 @@ EXTERNAL_HOSTNAME_ONLY = YES
 [arm]
 PORT = 12085
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12084
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12083
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12082
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12081
 PLUGINS = http_server
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 PREFIX = valgrind --leak-check=full
 #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
 
diff --git a/src/transport/test_transport_api_https_peer1.conf b/src/transport/test_transport_api_https_peer1.conf
index 4e0cac452..e682b9b76 100644
--- a/src/transport/test_transport_api_https_peer1.conf
+++ b/src/transport/test_transport_api_https_peer1.conf
@@ -12,19 +12,19 @@ PORT = 12105
 
 [statistics]
 PORT = 12104
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12103
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12102
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12101
 PLUGINS = https_client
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 
diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf
index 443717ebd..96cc50723 100644
--- a/src/transport/test_transport_api_https_peer2.conf
+++ b/src/transport/test_transport_api_https_peer2.conf
@@ -16,23 +16,23 @@ CERT_FILE = $GNUNET_TEST_HOME/https_cert_p2.crt
 
 [arm]
 PORT = 12115
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12114
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12113
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12112
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12111
 PLUGINS = https_server
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 
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 004893a99..2e9912593 100644
--- a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
+++ b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
@@ -9,23 +9,23 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12005
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12004
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12003
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12002
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12001
 PLUGINS = tcp
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 
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 121566e0b..06bd8aeca 100644
--- a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
+++ b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
@@ -9,22 +9,22 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12014
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12013
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12012
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12011
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12010
 PLUGINS = tcp
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
diff --git a/src/transport/test_transport_api_manipulation_cfg_peer1.conf b/src/transport/test_transport_api_manipulation_cfg_peer1.conf
index 786256777..952230a49 100644
--- a/src/transport/test_transport_api_manipulation_cfg_peer1.conf
+++ b/src/transport/test_transport_api_manipulation_cfg_peer1.conf
@@ -9,23 +9,23 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12005
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12004
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12003
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12002
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12001
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 PLUGINS = tcp
 MANIPULATE_DELAY_IN = 100 ms
 MANIPULATE_DELAY_OUT = 100 ms
\ No newline at end of file
diff --git a/src/transport/test_transport_api_manipulation_cfg_peer2.conf b/src/transport/test_transport_api_manipulation_cfg_peer2.conf
index 6985bf172..85127bee4 100644
--- a/src/transport/test_transport_api_manipulation_cfg_peer2.conf
+++ b/src/transport/test_transport_api_manipulation_cfg_peer2.conf
@@ -9,23 +9,23 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12014
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12013
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12012
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12011
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12010
 PLUGINS = tcp
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 #MANIPULATE_DELAY_IN = 0 ms
 #MANIPULATE_DELAY_OUT = 0 ms
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 ed11174f0..c05439ab2 100644
--- a/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf
+++ b/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf
@@ -9,22 +9,22 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12005
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12004
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12003
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12002
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12001
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 PLUGINS = tcp
 
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 0e477e7c6..c80e588ce 100644
--- a/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf
+++ b/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf
@@ -9,22 +9,22 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12014
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12013
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12012
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12011
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12010
 PLUGINS = tcp
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
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 ed11174f0..c05439ab2 100644
--- a/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf
+++ b/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf
@@ -9,22 +9,22 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12005
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12004
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12003
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12002
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12001
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 PLUGINS = tcp
 
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 0e477e7c6..c80e588ce 100644
--- a/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf
+++ b/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf
@@ -9,22 +9,22 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12014
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12013
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12012
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12011
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12010
 PLUGINS = tcp
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf
index 5105324f4..0313f5b60 100644
--- a/src/transport/test_transport_api_multi_peer1.conf
+++ b/src/transport/test_transport_api_multi_peer1.conf
@@ -18,24 +18,24 @@ PORT = 12143
 [arm]
 PORT = 12149
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12148
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12147
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12146
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12145
 PLUGINS = tcp udp
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 [transport-unix]
 PORT = 12144
diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf
index 54ab6b8fd..2d548a66d 100644
--- a/src/transport/test_transport_api_multi_peer2.conf
+++ b/src/transport/test_transport_api_multi_peer2.conf
@@ -21,24 +21,24 @@ PORT = 12153
 [arm]
 PORT = 12159
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12158
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12157
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12156
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12155
 PLUGINS = tcp udp
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 [transport-unix]
 PORT = 12154
diff --git a/src/transport/test_transport_api_reliability_bluetooth_peer1.conf b/src/transport/test_transport_api_reliability_bluetooth_peer1.conf
index f20b62b85..8f50bf113 100644
--- a/src/transport/test_transport_api_reliability_bluetooth_peer1.conf
+++ b/src/transport/test_transport_api_reliability_bluetooth_peer1.conf
@@ -8,23 +8,23 @@ TESTMODE = 1
 
 [arm]
 PORT = 12164
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12163
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12162
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12161
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12160
 PLUGINS = bluetooth
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 
diff --git a/src/transport/test_transport_api_reliability_bluetooth_peer2.conf b/src/transport/test_transport_api_reliability_bluetooth_peer2.conf
index fe2535d9f..1816ec99e 100644
--- a/src/transport/test_transport_api_reliability_bluetooth_peer2.conf
+++ b/src/transport/test_transport_api_reliability_bluetooth_peer2.conf
@@ -8,22 +8,22 @@ TESTMODE = 2
 
 [arm]
 PORT = 12174
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12173
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12172
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12171
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12170
 PLUGINS = bluetooth
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
diff --git a/src/transport/test_transport_api_reliability_http_peer1.conf b/src/transport/test_transport_api_reliability_http_peer1.conf
index 1e493aaba..a04b6d3d8 100644
--- a/src/transport/test_transport_api_reliability_http_peer1.conf
+++ b/src/transport/test_transport_api_reliability_http_peer1.conf
@@ -12,22 +12,22 @@ PORT = 12180
 
 [arm]
 PORT = 12185
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12184
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12183
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12182
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12181
 PLUGINS = http_client
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
diff --git a/src/transport/test_transport_api_reliability_http_peer2.conf b/src/transport/test_transport_api_reliability_http_peer2.conf
index 4f7bbaf28..8d85cf7b1 100644
--- a/src/transport/test_transport_api_reliability_http_peer2.conf
+++ b/src/transport/test_transport_api_reliability_http_peer2.conf
@@ -9,22 +9,22 @@ BINDTO = 127.0.0.1
 
 [arm]
 PORT = 12195
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12194
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12193
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12192
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12191
 PLUGINS = http_server
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
diff --git a/src/transport/test_transport_api_reliability_https_peer1.conf b/src/transport/test_transport_api_reliability_https_peer1.conf
index 6f20604e2..07f8590a2 100644
--- a/src/transport/test_transport_api_reliability_https_peer1.conf
+++ b/src/transport/test_transport_api_reliability_https_peer1.conf
@@ -6,22 +6,22 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-https-p1/
 
 [arm]
 PORT = 12305
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12304
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12303
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12302
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12301
 PLUGINS = https_client
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
diff --git a/src/transport/test_transport_api_reliability_https_peer2.conf b/src/transport/test_transport_api_reliability_https_peer2.conf
index 82e5cc01d..7f7f80778 100644
--- a/src/transport/test_transport_api_reliability_https_peer2.conf
+++ b/src/transport/test_transport_api_reliability_https_peer2.conf
@@ -9,23 +9,23 @@ CERT_FILE = $GNUNET_TEST_HOME/https_cert_p2.crt
 
 [arm]
 PORT = 12315
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12314
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12313
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12312
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12311
 PLUGINS = https_server
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 
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 d248984d6..6de950189 100644
--- a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
@@ -14,23 +14,23 @@ TIMEOUT = 5 s
 [arm]
 PORT = 1204
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12023
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12022
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12021
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 29542
 PLUGINS = tcp
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 
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 bb221e891..5e8b54a68 100644
--- a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
+++ b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
@@ -13,23 +13,23 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12034
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12033
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12032
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12031
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 45923
 PLUGINS = tcp
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 
diff --git a/src/transport/test_transport_api_reliability_tcp_peer1.conf b/src/transport/test_transport_api_reliability_tcp_peer1.conf
index 0de45c8cf..66daf44ec 100644
--- a/src/transport/test_transport_api_reliability_tcp_peer1.conf
+++ b/src/transport/test_transport_api_reliability_tcp_peer1.conf
@@ -9,22 +9,22 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12005
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12004
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12003
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12002
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12001
 PLUGINS = tcp
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
diff --git a/src/transport/test_transport_api_reliability_tcp_peer2.conf b/src/transport/test_transport_api_reliability_tcp_peer2.conf
index 0e1667b89..e6baa32f6 100644
--- a/src/transport/test_transport_api_reliability_tcp_peer2.conf
+++ b/src/transport/test_transport_api_reliability_tcp_peer2.conf
@@ -9,21 +9,21 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12014
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12013
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12012
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12011
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12010
 PLUGINS = tcp
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
diff --git a/src/transport/test_transport_api_reliability_wlan_peer1.conf b/src/transport/test_transport_api_reliability_wlan_peer1.conf
index d49a06b78..eb7756f27 100644
--- a/src/transport/test_transport_api_reliability_wlan_peer1.conf
+++ b/src/transport/test_transport_api_reliability_wlan_peer1.conf
@@ -7,23 +7,23 @@ TESTMODE = 1
 
 [arm]
 PORT = 12164
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12163
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12162
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12161
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12160
 PLUGINS = wlan
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 
diff --git a/src/transport/test_transport_api_reliability_wlan_peer2.conf b/src/transport/test_transport_api_reliability_wlan_peer2.conf
index 137dd37ec..aafeb09f8 100644
--- a/src/transport/test_transport_api_reliability_wlan_peer2.conf
+++ b/src/transport/test_transport_api_reliability_wlan_peer2.conf
@@ -8,22 +8,22 @@ TESTMODE = 2
 
 [arm]
 PORT = 12174
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12173
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12172
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12171
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12170
 PLUGINS = wlan
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf
index d50bac543..0b2e7a4d3 100644
--- a/src/transport/test_transport_api_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer1.conf
@@ -14,22 +14,22 @@ TIMEOUT = 5 s
 [arm]
 PORT = 1204
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12023
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12022
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12021
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 29542
 PLUGINS = tcp
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
diff --git a/src/transport/test_transport_api_tcp_nat_peer2.conf b/src/transport/test_transport_api_tcp_nat_peer2.conf
index 395bbadc6..b2afa4a8d 100644
--- a/src/transport/test_transport_api_tcp_nat_peer2.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer2.conf
@@ -13,21 +13,21 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12034
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12033
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12032
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12031
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 45923
 PLUGINS = tcp
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf
index ed11174f0..c05439ab2 100644
--- a/src/transport/test_transport_api_tcp_peer1.conf
+++ b/src/transport/test_transport_api_tcp_peer1.conf
@@ -9,22 +9,22 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12005
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12004
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12003
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12002
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12001
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 PLUGINS = tcp
 
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf
index 0e477e7c6..c80e588ce 100644
--- a/src/transport/test_transport_api_tcp_peer2.conf
+++ b/src/transport/test_transport_api_tcp_peer2.conf
@@ -9,22 +9,22 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12014
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12013
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12012
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12011
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12010
 PLUGINS = tcp
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
diff --git a/src/transport/test_transport_api_timeout_http_peer1.conf b/src/transport/test_transport_api_timeout_http_peer1.conf
index 9af0c22fa..9c3f90998 100644
--- a/src/transport/test_transport_api_timeout_http_peer1.conf
+++ b/src/transport/test_transport_api_timeout_http_peer1.conf
@@ -9,25 +9,25 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/
 [arm]
 PORT = 12085
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12084
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12083
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12082
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12081
 PLUGINS = http_client
 #BINARY = .libs/gnunet-service-transport
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 #PREFIX = valgrind --leak-check=full
 #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
 
diff --git a/src/transport/test_transport_api_timeout_http_peer2.conf b/src/transport/test_transport_api_timeout_http_peer2.conf
index e572dbe7f..7d0359fd2 100644
--- a/src/transport/test_transport_api_timeout_http_peer2.conf
+++ b/src/transport/test_transport_api_timeout_http_peer2.conf
@@ -13,22 +13,22 @@ BINDTO = 127.0.0.1
 [arm]
 PORT = 12095
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12094
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12093
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12092
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12091
 PLUGINS = http_server
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 #PREFIX = valgrind --leak-check=full
diff --git a/src/transport/test_transport_api_timeout_https_peer1.conf b/src/transport/test_transport_api_timeout_https_peer1.conf
index 674014afa..00980de99 100644
--- a/src/transport/test_transport_api_timeout_https_peer1.conf
+++ b/src/transport/test_transport_api_timeout_https_peer1.conf
@@ -9,19 +9,19 @@ PORT = 12105
 
 [statistics]
 PORT = 12104
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12103
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12102
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12101
 PLUGINS = https_client
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 
diff --git a/src/transport/test_transport_api_timeout_https_peer2.conf b/src/transport/test_transport_api_timeout_https_peer2.conf
index 2891cf665..017aa908e 100644
--- a/src/transport/test_transport_api_timeout_https_peer2.conf
+++ b/src/transport/test_transport_api_timeout_https_peer2.conf
@@ -9,23 +9,23 @@ CERT_FILE = $GNUNET_TEST_HOME/https_cert_p2.crt
 
 [arm]
 PORT = 12115
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12114
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12113
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12112
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12111
 PLUGINS = https_server
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 
diff --git a/src/transport/test_transport_api_timeout_tcp_peer1.conf b/src/transport/test_transport_api_timeout_tcp_peer1.conf
index 004893a99..2e9912593 100644
--- a/src/transport/test_transport_api_timeout_tcp_peer1.conf
+++ b/src/transport/test_transport_api_timeout_tcp_peer1.conf
@@ -9,23 +9,23 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12005
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12004
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12003
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12002
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12001
 PLUGINS = tcp
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 
diff --git a/src/transport/test_transport_api_timeout_tcp_peer2.conf b/src/transport/test_transport_api_timeout_tcp_peer2.conf
index 4e1e9791a..b3c68ac0e 100644
--- a/src/transport/test_transport_api_timeout_tcp_peer2.conf
+++ b/src/transport/test_transport_api_timeout_tcp_peer2.conf
@@ -11,23 +11,23 @@ PORT = 12100
 [arm]
 PORT = 12014
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12013
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12012
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12011
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12010
 PLUGINS = tcp
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 
diff --git a/src/transport/test_transport_api_timeout_udp_peer1.conf b/src/transport/test_transport_api_timeout_udp_peer1.conf
index 71e85bdc7..efa08fde5 100644
--- a/src/transport/test_transport_api_timeout_udp_peer1.conf
+++ b/src/transport/test_transport_api_timeout_udp_peer1.conf
@@ -10,24 +10,24 @@ MAX_BPS = 50000000
 
 [arm]
 PORT = 12045
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12044
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12043
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12042
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 #PREFIX = valgrind --leak-check=full
 PORT = 12041
 PLUGINS = udp
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 
diff --git a/src/transport/test_transport_api_timeout_udp_peer2.conf b/src/transport/test_transport_api_timeout_udp_peer2.conf
index c545ec7fa..14618f3b4 100644
--- a/src/transport/test_transport_api_timeout_udp_peer2.conf
+++ b/src/transport/test_transport_api_timeout_udp_peer2.conf
@@ -9,23 +9,23 @@ MAX_BPS = 50000000
 
 [arm]
 PORT = 12055
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12054
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12053
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12052
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12051
 PLUGINS = udp
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 
diff --git a/src/transport/test_transport_api_timeout_unix_peer1.conf b/src/transport/test_transport_api_timeout_unix_peer1.conf
index 34e6ae945..d43ef4a33 100644
--- a/src/transport/test_transport_api_timeout_unix_peer1.conf
+++ b/src/transport/test_transport_api_timeout_unix_peer1.conf
@@ -4,24 +4,24 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p1/
 
 [arm]
 PORT = 12125
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12124
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12123
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12122
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12121
 PLUGINS = unix
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 [transport-unix]
 PORT = 12120
diff --git a/src/transport/test_transport_api_timeout_unix_peer2.conf b/src/transport/test_transport_api_timeout_unix_peer2.conf
index d0a5c0953..9feed6592 100644
--- a/src/transport/test_transport_api_timeout_unix_peer2.conf
+++ b/src/transport/test_transport_api_timeout_unix_peer2.conf
@@ -4,24 +4,24 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p2/
 
 [arm]
 PORT = 12135
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12134
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12133
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12132
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12131
 PLUGINS = unix
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 [transport-unix]
 PORT = 12136
diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf
index 89e5e8d3e..526f3e6b1 100644
--- a/src/transport/test_transport_api_udp_nat_peer1.conf
+++ b/src/transport/test_transport_api_udp_nat_peer1.conf
@@ -13,23 +13,23 @@ PORT = 0
 [arm]
 PORT = 12065
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12064
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12063
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12062
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12061
 PLUGINS = udp
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 
diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf
index 9f31cfa21..24bb6f691 100644
--- a/src/transport/test_transport_api_udp_nat_peer2.conf
+++ b/src/transport/test_transport_api_udp_nat_peer2.conf
@@ -11,23 +11,23 @@ PORT = 12070
 [arm]
 PORT = 12075
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12074
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12073
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12072
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12071
 PLUGINS = udp
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 
diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf
index 046cd86ca..70af52994 100644
--- a/src/transport/test_transport_api_udp_peer1.conf
+++ b/src/transport/test_transport_api_udp_peer1.conf
@@ -12,24 +12,24 @@ BINDTO6 = ::1
 
 [arm]
 PORT = 12045
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12044
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12043
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12042
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 #PREFIX = valgrind --leak-check=full
 PORT = 12041
 PLUGINS = udp
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 
diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf
index 5def1dfee..6400ef554 100644
--- a/src/transport/test_transport_api_udp_peer2.conf
+++ b/src/transport/test_transport_api_udp_peer2.conf
@@ -11,23 +11,23 @@ BINDTO6 = ::1
 
 [arm]
 PORT = 12055
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12054
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12053
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12052
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12051
 PLUGINS = udp
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 
diff --git a/src/transport/test_transport_api_unix_peer1.conf b/src/transport/test_transport_api_unix_peer1.conf
index 34e6ae945..d43ef4a33 100644
--- a/src/transport/test_transport_api_unix_peer1.conf
+++ b/src/transport/test_transport_api_unix_peer1.conf
@@ -4,24 +4,24 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p1/
 
 [arm]
 PORT = 12125
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12124
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12123
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12122
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12121
 PLUGINS = unix
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 [transport-unix]
 PORT = 12120
diff --git a/src/transport/test_transport_api_unix_peer2.conf b/src/transport/test_transport_api_unix_peer2.conf
index d0a5c0953..9feed6592 100644
--- a/src/transport/test_transport_api_unix_peer2.conf
+++ b/src/transport/test_transport_api_unix_peer2.conf
@@ -4,24 +4,24 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p2/
 
 [arm]
 PORT = 12135
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12134
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12133
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12132
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12131
 PLUGINS = unix
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 [transport-unix]
 PORT = 12136
diff --git a/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf b/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf
index f20b62b85..8f50bf113 100644
--- a/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf
+++ b/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf
@@ -8,23 +8,23 @@ TESTMODE = 1
 
 [arm]
 PORT = 12164
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12163
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12162
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12161
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12160
 PLUGINS = bluetooth
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 
diff --git a/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf b/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf
index fe2535d9f..1816ec99e 100644
--- a/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf
+++ b/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf
@@ -8,22 +8,22 @@ TESTMODE = 2
 
 [arm]
 PORT = 12174
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12173
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12172
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12171
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12170
 PLUGINS = bluetooth
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
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 7fe9a0810..eeee8ee62 100644
--- a/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
+++ b/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
@@ -8,23 +8,23 @@ MAX_BPS = 1073741824
 
 [arm]
 PORT = 12045
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12044
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12043
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12042
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12041
 PLUGINS = udp
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 
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 83ecb9eb2..678642a41 100644
--- a/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
+++ b/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
@@ -8,23 +8,23 @@ MAX_BPS = 1073741824
 
 [arm]
 PORT = 12055
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12054
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12053
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12052
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12051
 PLUGINS = udp
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 
diff --git a/src/transport/test_transport_api_unreliability_udp_peer1.conf b/src/transport/test_transport_api_unreliability_udp_peer1.conf
index 17c644b0b..d16be3b20 100644
--- a/src/transport/test_transport_api_unreliability_udp_peer1.conf
+++ b/src/transport/test_transport_api_unreliability_udp_peer1.conf
@@ -8,23 +8,23 @@ MAX_BPS = 5000000
 
 [arm]
 PORT = 12045
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12044
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12043
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12042
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12041
 PLUGINS = udp
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 
diff --git a/src/transport/test_transport_api_unreliability_udp_peer2.conf b/src/transport/test_transport_api_unreliability_udp_peer2.conf
index 220866861..a7e6a57fb 100644
--- a/src/transport/test_transport_api_unreliability_udp_peer2.conf
+++ b/src/transport/test_transport_api_unreliability_udp_peer2.conf
@@ -8,23 +8,23 @@ MAX_BPS = 5000000
 
 [arm]
 PORT = 12055
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12054
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12053
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12052
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12051
 PLUGINS = udp
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 
diff --git a/src/transport/test_transport_api_unreliability_unix_peer1.conf b/src/transport/test_transport_api_unreliability_unix_peer1.conf
index 34e6ae945..d43ef4a33 100644
--- a/src/transport/test_transport_api_unreliability_unix_peer1.conf
+++ b/src/transport/test_transport_api_unreliability_unix_peer1.conf
@@ -4,24 +4,24 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p1/
 
 [arm]
 PORT = 12125
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12124
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12123
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12122
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12121
 PLUGINS = unix
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 [transport-unix]
 PORT = 12120
diff --git a/src/transport/test_transport_api_unreliability_unix_peer2.conf b/src/transport/test_transport_api_unreliability_unix_peer2.conf
index fd8a29cff..f863d4d42 100644
--- a/src/transport/test_transport_api_unreliability_unix_peer2.conf
+++ b/src/transport/test_transport_api_unreliability_unix_peer2.conf
@@ -4,24 +4,24 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p2/
 
 [arm]
 PORT = 12135
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12134
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12133
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12132
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12131
 PLUGINS = unix
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 [transport-unix]
 PORT = 12131
diff --git a/src/transport/test_transport_api_unreliability_wlan_peer1.conf b/src/transport/test_transport_api_unreliability_wlan_peer1.conf
index d49a06b78..eb7756f27 100644
--- a/src/transport/test_transport_api_unreliability_wlan_peer1.conf
+++ b/src/transport/test_transport_api_unreliability_wlan_peer1.conf
@@ -7,23 +7,23 @@ TESTMODE = 1
 
 [arm]
 PORT = 12164
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12163
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12162
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12161
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12160
 PLUGINS = wlan
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 
diff --git a/src/transport/test_transport_api_unreliability_wlan_peer2.conf b/src/transport/test_transport_api_unreliability_wlan_peer2.conf
index 137dd37ec..aafeb09f8 100644
--- a/src/transport/test_transport_api_unreliability_wlan_peer2.conf
+++ b/src/transport/test_transport_api_unreliability_wlan_peer2.conf
@@ -8,22 +8,22 @@ TESTMODE = 2
 
 [arm]
 PORT = 12174
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12173
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12172
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12171
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12170
 PLUGINS = wlan
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf
index 68b507ad9..8b870f1d4 100644
--- a/src/transport/test_transport_api_wlan_peer1.conf
+++ b/src/transport/test_transport_api_wlan_peer1.conf
@@ -8,24 +8,24 @@ TESTMODE = 1
 
 [arm]
 PORT = 12164
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12163
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12162
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12161
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12160
 PLUGINS = wlan
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 #PREFIX = xterm -T transport2 -e gdb --command=cmd --args
 #PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600
 #PREFIX = valgrind --leak-check=full --show-reachable=yes
diff --git a/src/transport/test_transport_api_wlan_peer2.conf b/src/transport/test_transport_api_wlan_peer2.conf
index 7f18dbfb0..c32ce5ced 100644
--- a/src/transport/test_transport_api_wlan_peer2.conf
+++ b/src/transport/test_transport_api_wlan_peer2.conf
@@ -8,24 +8,24 @@ TESTMODE = 2
 
 [arm]
 PORT = 12174
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12173
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12172
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12171
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12170
 PLUGINS = wlan
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 #PREFIX = xterm -T transport2 -e gdb --command=cmd --args
 #PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600
 #PREFIX = valgrind --leak-check=full --show-reachable=yes
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 a11c6536a..ed04799f5 100644
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
+++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
@@ -9,24 +9,24 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12005
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12004
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12003
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12002
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 #PREFIX = valgrind --leak-check=full
 PORT = 12001
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 PLUGINS = tcp
 
 [transport-blacklist-ABB6BSVJT4LGSSFGJO91RVBE5R53UHUV55SIDAV3C01RB6CEUV0HDNVFOEUF69BRRROK361TOH6DUV3GUTANUB57N112VB5FPFKF2CO]
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 0cf3c6c4a..07d779bab 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
@@ -9,24 +9,24 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12005
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12004
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12003
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12002
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 #PREFIX = valgrind --leak-check=full
 PORT = 12001
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 PLUGINS = tcp udp
 
 [transport-blacklist-ABB6BSVJT4LGSSFGJO91RVBE5R53UHUV55SIDAV3C01RB6CEUV0HDNVFOEUF69BRRROK361TOH6DUV3GUTANUB57N112VB5FPFKF2CO]
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 be699a6c3..f4d955f06 100644
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
+++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
@@ -9,24 +9,24 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12005
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12004
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12003
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12002
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 #PREFIX = valgrind --leak-check=full
 PORT = 12001
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 PLUGINS = tcp
 
 [transport-blacklist-ABB6BSVJT4LGSSFGJO91RVBE5R53UHUV55SIDAV3C01RB6CEUV0HDNVFOEUF69BRRROK361TOH6DUV3GUTANUB57N112VB5FPFKF2CO]
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 1aefad0d9..830c3d4c0 100644
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf
+++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf
@@ -9,25 +9,25 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12014
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12013
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12012
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12011
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 #PREFIX = valgrind --leak-check=full
 PORT = 12010
 PLUGINS = tcp
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 
 [transport-blacklist-CQQU54C07Q4P8HGGM6ATP8NV8ACJONGK5NJSP0UAL1RGH34V553JT70UEBO52VKOBHGJ6RJVDPUKUJ2F9U6EBAICJJEBHIHAC1TI238]
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 e0cbad2b9..ef4efd373 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
@@ -9,25 +9,25 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12014
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12013
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12012
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12011
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 #PREFIX = valgrind --leak-check=full
 PORT = 12010
 PLUGINS = tcp udp
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 [transport-blacklist-CQQU54C07Q4P8HGGM6ATP8NV8ACJONGK5NJSP0UAL1RGH34V553JT70UEBO52VKOBHGJ6RJVDPUKUJ2F9U6EBAICJJEBHIHAC1TI238]
 ABB6BSVJT4LGSSFGJO91RVBE5R53UHUV55SIDAV3C01RB6CEUV0HDNVFOEUF69BRRROK361TOH6DUV3GUTANUB57N112VB5FPFKF2CO = tcp
\ No newline at end of file
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 590b96d13..254425a09 100644
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
+++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
@@ -9,25 +9,25 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12014
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12013
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12012
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12011
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 #PREFIX = valgrind --leak-check=full
 PORT = 12010
 PLUGINS = tcp
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 [transport-blacklist-CQQU54C07Q4P8HGGM6ATP8NV8ACJONGK5NJSP0UAL1RGH34V553JT70UEBO52VKOBHGJ6RJVDPUKUJ2F9U6EBAICJJEBHIHAC1TI238]
 ABB6BSVJT4LGSSFGJO91RVBE5R53UHUV55SIDAV3C01RB6CEUV0HDNVFOEUF69BRRROK361TOH6DUV3GUTANUB57N112VB5FPFKF2CO = tcp 
\ No newline at end of file
diff --git a/src/transport/test_transport_blacklisting_cfg_peer1.conf b/src/transport/test_transport_blacklisting_cfg_peer1.conf
index ed11174f0..c05439ab2 100644
--- a/src/transport/test_transport_blacklisting_cfg_peer1.conf
+++ b/src/transport/test_transport_blacklisting_cfg_peer1.conf
@@ -9,22 +9,22 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12005
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12004
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
 [resolver]
 PORT = 12003
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12002
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12001
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 PLUGINS = tcp
 
diff --git a/src/transport/test_transport_blacklisting_cfg_peer2.conf b/src/transport/test_transport_blacklisting_cfg_peer2.conf
index 0e1667b89..e6baa32f6 100644
--- a/src/transport/test_transport_blacklisting_cfg_peer2.conf
+++ b/src/transport/test_transport_blacklisting_cfg_peer2.conf
@@ -9,21 +9,21 @@ TIMEOUT = 5 s
 [arm]
 PORT = 12014
 DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 12013
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 12012
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 12011
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 12010
 PLUGINS = tcp
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
diff --git a/src/transport/transport.conf.in b/src/transport/transport.conf.in
index d9abdbf11..945d7b4cb 100644
--- a/src/transport/transport.conf.in
+++ b/src/transport/transport.conf.in
@@ -8,7 +8,7 @@ NEIGHBOUR_LIMIT = 50
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 PLUGINS = tcp udp
-UNIXPATH = /tmp/gnunet-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport.sock
 BLACKLIST_FILE = $GNUNET_CONFIG_HOME/transport/blacklist
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES