fix #3275 with solution from https://gnunet.org/bugs/view.php?id=3275#c8029

sed -i 's#^\(\s*\)TESTS#\1TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;\n&#'

46 files changed, 49 insertions, 1 deletions

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index e3ff5068e..eacfa8295 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -83,6 +83,7 @@ check_PROGRAMS = \
  test_gnunet_prefix
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am
index e122efe99..7b022fe5d 100644
--- a/src/arm/Makefile.am
+++ b/src/arm/Makefile.am
@@ -72,6 +72,7 @@ check_SCRIPTS = \
 endif
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS)  $(check_SCRIPTS)
 endif
 
diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am
index 21916ccc0..bda1eb999 100644
--- a/src/ats-tests/Makefile.am
+++ b/src/ats-tests/Makefile.am
@@ -45,6 +45,7 @@ check_PROGRAMS = \
  $(TESTING_TESTS)
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index ab20b6dac..2e4e1651e 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -145,6 +145,7 @@ check_PROGRAMS = \
  $(TESTING_TESTS)
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am
index ac57ce2dc..b14be5681 100644
--- a/src/consensus/Makefile.am
+++ b/src/consensus/Makefile.am
@@ -77,6 +77,7 @@ check_PROGRAMS = \
  test_consensus_api
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index 37cf5c85f..af3b96655 100644
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -94,6 +94,7 @@ libexec_PROGRAMS += \
   $(AUDIO_HELPER_RECD) \
   $(AUDIO_HELPER_PLAY)
 
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(AUDIO_TESTS)
 
 if BUILD_PULSE_HELPERS
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 9a68925b2..8d9faf2c7 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -73,6 +73,7 @@ check_PROGRAMS = \
  $(TESTING_TESTS)
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am
index 97ffabb87..f9af4610b 100644
--- a/src/datacache/Makefile.am
+++ b/src/datacache/Makefile.am
@@ -122,6 +122,7 @@ check_PROGRAMS = \
  $(POSTGRES_TESTS) 
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am
index 5522b0295..092f0ede5 100644
--- a/src/datastore/Makefile.am
+++ b/src/datastore/Makefile.am
@@ -170,6 +170,7 @@ check_PROGRAMS = \
   $(POSTGRES_TESTS)
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index dcfb20166..f35e1e18c 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -158,6 +158,7 @@ if HAVE_EXPERIMENTAL
 endif
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = test_dht_api $(check_SCRIPTS) \
  test_dht_twopeer \
  test_dht_line \
diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am
index 8b94a3bf6..c2a432ca6 100644
--- a/src/dns/Makefile.am
+++ b/src/dns/Makefile.am
@@ -115,6 +115,7 @@ libgnunet_plugin_block_dns_la_LDFLAGS = \
 
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS)  $(check_SCRIPTS)
 endif
 
diff --git a/src/dv/Makefile.am b/src/dv/Makefile.am
index 447f64022..a4b1c4b04 100644
--- a/src/dv/Makefile.am
+++ b/src/dv/Makefile.am
@@ -76,6 +76,7 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
+ TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
  TESTS = $(check_PROGRAMS) 
 endif
 
diff --git a/src/env/Makefile.am b/src/env/Makefile.am
index 67e9c6425..c3f2aee02 100644
--- a/src/env/Makefile.am
+++ b/src/env/Makefile.am
@@ -32,6 +32,7 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
diff --git a/src/experimentation/Makefile.am b/src/experimentation/Makefile.am
index 5935d9388..0c6a96936 100644
--- a/src/experimentation/Makefile.am
+++ b/src/experimentation/Makefile.am
@@ -25,6 +25,7 @@ check_PROGRAMS = \
  $(TEXT_EXP_CLIQUE)
 
 if ENABLE_TEST_RUN
+ TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
  TESTS = \
  $(TEXT_EXP_CLIQUE)
 endif
diff --git a/src/fragmentation/Makefile.am b/src/fragmentation/Makefile.am
index 138b7ea6a..d85373a10 100644
--- a/src/fragmentation/Makefile.am
+++ b/src/fragmentation/Makefile.am
@@ -25,6 +25,7 @@ check_PROGRAMS = \
  test_fragmentation
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index c892bb47e..a04591ab2 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -273,12 +273,15 @@ check_SCRIPTS = \
 endif
 
 if ENABLE_MONKEY
- TESTS_ENVIRONMENT = @MONKEYPREFIX@
+ MONKEY = @MONKEYPREFIX@
  AM_LDFLAGS = -no-install
 endif
 
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;\
+ export PATH=@prefix@/bin:$$PATH;\
+ $(MONKEY)
 TESTS = \
  test_fs_directory \
  test_fs_download \
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 3b39755a4..41c9032f0 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -277,6 +277,7 @@ check_SCRIPTS = \
 
 if ENABLE_TEST_RUN
 if HAVE_SQLITE
+ TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
  TESTS = $(check_SCRIPTS)
 endif
 endif
diff --git a/src/gnsrecord/Makefile.am b/src/gnsrecord/Makefile.am
index 2c9d2f476..a5a698e2f 100644
--- a/src/gnsrecord/Makefile.am
+++ b/src/gnsrecord/Makefile.am
@@ -21,6 +21,7 @@ check_PROGRAMS = \
  test_gnsrecord_block_expiration
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = \
   $(check_PROGRAMS) \
   $(check_SCRIPTS)
diff --git a/src/hello/Makefile.am b/src/hello/Makefile.am
index ab25538ac..328a88a48 100644
--- a/src/hello/Makefile.am
+++ b/src/hello/Makefile.am
@@ -28,6 +28,7 @@ check_PROGRAMS = \
  test_friend_hello
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am
index c31f28c26..887355d9b 100644
--- a/src/hostlist/Makefile.am
+++ b/src/hostlist/Makefile.am
@@ -48,6 +48,7 @@ check_PROGRAMS = \
 
 if HAVE_MHD
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = \
  test_gnunet_daemon_hostlist \
  test_gnunet_daemon_hostlist_reconnect \
diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am
index e01a47974..616f0b5b0 100644
--- a/src/identity/Makefile.am
+++ b/src/identity/Makefile.am
@@ -68,6 +68,7 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS) 
 endif
 
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index 080b8754b..2a106d381 100644
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -26,6 +26,7 @@ endif
 
 if HAVE_MHD
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = \
  $(check_SCRIPTS)
 endif
diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index c8e39ffc8..455d45a46 100644
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -184,6 +184,7 @@ test_mesh_small_speed_reliable_backwards_DEPENDENCIES = $(dep_mesh_test_lib)
 
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = \
  $(check_PROGRAMS)
 endif
diff --git a/src/multicast/Makefile.am b/src/multicast/Makefile.am
index 5035c3f79..b65bd65cd 100644
--- a/src/multicast/Makefile.am
+++ b/src/multicast/Makefile.am
@@ -51,6 +51,7 @@ check_PROGRAMS = \
  test_multicast_api
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
diff --git a/src/namecache/Makefile.am b/src/namecache/Makefile.am
index 8203a19be..41c27e413 100644
--- a/src/namecache/Makefile.am
+++ b/src/namecache/Makefile.am
@@ -47,6 +47,7 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = \
   $(check_PROGRAMS)
 endif
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 91bc3d5ef..32d29ebca 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -63,6 +63,7 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = \
   $(check_PROGRAMS) \
   $(check_SCRIPTS)
diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am
index e5630519c..a7424b8dc 100644
--- a/src/nat/Makefile.am
+++ b/src/nat/Makefile.am
@@ -80,6 +80,7 @@ check_PROGRAMS = \
   test_nat_test
 
 if ENABLE_TEST_RUN
+ TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
  TESTS = $(check_PROGRAMS)
 endif
 
diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am
index b60d38d80..44c187739 100644
--- a/src/nse/Makefile.am
+++ b/src/nse/Makefile.am
@@ -80,6 +80,7 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am
index 2309a47e2..1bca57678 100644
--- a/src/peerinfo-tool/Makefile.am
+++ b/src/peerinfo-tool/Makefile.am
@@ -29,6 +29,7 @@ check_SCRIPTS = \
 endif
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_SCRIPTS)
 endif
 
diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am
index 457b674b3..7dd1581c4 100644
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -57,6 +57,7 @@ endif
 
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
diff --git a/src/psyc/Makefile.am b/src/psyc/Makefile.am
index 96f86ca92..d199bd3a2 100644
--- a/src/psyc/Makefile.am
+++ b/src/psyc/Makefile.am
@@ -59,6 +59,7 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
diff --git a/src/psycstore/Makefile.am b/src/psycstore/Makefile.am
index 40cd3ce6d..44ac5bb49 100644
--- a/src/psycstore/Makefile.am
+++ b/src/psycstore/Makefile.am
@@ -81,6 +81,7 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index 2bec16329..ebd662851 100644
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -57,6 +57,7 @@ endif
 check_PROGRAMS = $(VPN_TEST)
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am
index 8f9f9edb9..dd02afa19 100644
--- a/src/regex/Makefile.am
+++ b/src/regex/Makefile.am
@@ -170,6 +170,7 @@ check_PROGRAMS = \
   test_regex_api
 
 if ENABLE_TEST_RUN
+ TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
  TESTS = $(check_PROGRAMS)
 endif
 
diff --git a/src/revocation/Makefile.am b/src/revocation/Makefile.am
index 18d379b0b..c1aef65cb 100644
--- a/src/revocation/Makefile.am
+++ b/src/revocation/Makefile.am
@@ -74,6 +74,7 @@ check_SCRIPTS = \
         test_local_revocation.py
 
 if ENABLE_TEST_RUN
+ TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
  TESTS = \
  $(check_SCRIPTS) \
  $(check_PROGRAMS)
diff --git a/src/scalarproduct/Makefile.am b/src/scalarproduct/Makefile.am
index 0bdc76e3e..b167bacb1 100644
--- a/src/scalarproduct/Makefile.am
+++ b/src/scalarproduct/Makefile.am
@@ -67,5 +67,6 @@ check_SCRIPTS = \
   test_scalarproduct_negativezero.sh
 
 if ENABLE_TEST_RUN
+  TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
   TESTS = $(check_SCRIPTS)
 endif
diff --git a/src/secretsharing/Makefile.am b/src/secretsharing/Makefile.am
index b875953ba..556356b6f 100644
--- a/src/secretsharing/Makefile.am
+++ b/src/secretsharing/Makefile.am
@@ -63,6 +63,7 @@ check_PROGRAMS = \
  test_secretsharing_api
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
diff --git a/src/set/Makefile.am b/src/set/Makefile.am
index 124818ce4..a2bbab9a6 100644
--- a/src/set/Makefile.am
+++ b/src/set/Makefile.am
@@ -70,6 +70,7 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am
index 30d01661d..3baea5580 100644
--- a/src/statistics/Makefile.am
+++ b/src/statistics/Makefile.am
@@ -58,6 +58,7 @@ check_PROGRAMS = \
  test_statistics_api_watch_zero_value 
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
 endif
 
diff --git a/src/template/Makefile.am b/src/template/Makefile.am
index 275cf2ff8..8d8acccea 100644
--- a/src/template/Makefile.am
+++ b/src/template/Makefile.am
@@ -38,6 +38,7 @@ check_PROGRAMS = \
  test_template_api
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 532f4ea08..209894be7 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -193,6 +193,7 @@ check_PROGRAMS = \
   $(underlay_testcases)
 
 if ENABLE_TEST_RUN
+ TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
  TESTS = \
   test_testbed_api \
   test_testbed_logger_api \
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 8657d42cb..c1b41c265 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -57,6 +57,7 @@ check_PROGRAMS = \
  test_testing_sharedservices
 
 if ENABLE_TEST_RUN 
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = \
  test_testing_portreservation \
  test_testing_peerstartup \
diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am
index 09a2766d9..4f354a141 100644
--- a/src/topology/Makefile.am
+++ b/src/topology/Makefile.am
@@ -46,6 +46,7 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index acfaa9403..699899b2b 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -440,6 +440,7 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = \
  test_transport_testing_startstop \
  test_transport_testing_restart \
diff --git a/src/tun/Makefile.am b/src/tun/Makefile.am
index f090266a9..a27d192cb 100644
--- a/src/tun/Makefile.am
+++ b/src/tun/Makefile.am
@@ -27,6 +27,7 @@ check_PROGRAMS = \
  test_regex
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index dd85f2c09..acebb39da 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -279,6 +279,7 @@ check_PROGRAMS = \
  test_common_logging_runtime_loglevels
 
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif