3 files changed, 4 insertions, 4 deletions

diff --git a/src/util/test_configuration_data.conf b/src/util/test_configuration_data.conf
index 517cbf0b0..93dfd128a 100644
--- a/src/util/test_configuration_data.conf
+++ b/src/util/test_configuration_data.conf
@@ -3,7 +3,7 @@ SUBST=/hello
 
 [GNUNET]
 SUBST=hello
-GNUNET_HOME=/tmp
+GNUNET_HOME=$GNUNET_TMP/test-hello-configuration-data/
 
 [test]
 a=a
diff --git a/src/util/test_resolver_api_data.conf b/src/util/test_resolver_api_data.conf
index 42b36d66a..dd4384b80 100644
--- a/src/util/test_resolver_api_data.conf
+++ b/src/util/test_resolver_api_data.conf
@@ -1,5 +1,5 @@
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunetd-statistics/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-statistics/
 
 [resolver]
 PORT = 22354
diff --git a/src/util/test_service_data.conf b/src/util/test_service_data.conf
index c04626b5b..975d5a1e3 100644
--- a/src/util/test_service_data.conf
+++ b/src/util/test_service_data.conf
@@ -1,7 +1,7 @@
 [test_service]
 PORT=12435
 BINDTO=localhost
-PIDFILE=/tmp/test-service.pid
+PIDFILE=$GNUNET_TMP/test-service.pid
 MAXBUF=1024
 DISABLEV6=NO
 ACCEPT_FROM=127.0.0.1;
@@ -12,7 +12,7 @@ HOSTNAME=localhost
 
 [test_service6]
 PORT=12435
-PIDFILE=/tmp/test-service.pid
+PIDFILE=$GNUNET_TMP/test-service.pid
 TIMEOUT=30 s
 MAXBUF=1024
 DISABLEV6=NO