2 files changed, 3 insertions, 3 deletions

diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am
index 25885a34c..20f657b41 100644
--- a/src/peerinfo-tool/Makefile.am
+++ b/src/peerinfo-tool/Makefile.am
@@ -19,9 +19,9 @@ gnunet_peerinfo_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 
-
 if HAVE_PYTHON_PEXPECT
-check_SCRIPTS = \
+TESTS_ENVIRONMENT = $(PYTHON)
+TESTS = \
  test_gnunet_peerinfo.py 
 endif
 
diff --git a/src/peerinfo-tool/test_gnunet_peerinfo.py b/src/peerinfo-tool/test_gnunet_peerinfo.py
index 804b4cb2a..bab59ee47 100755
--- a/src/peerinfo-tool/test_gnunet_peerinfo.py
+++ b/src/peerinfo-tool/test_gnunet_peerinfo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python 
+#!/usr/bin/env python
 #    This file is part of GNUnet.
 #    (C) 2010 Christian Grothoff (and other contributing authors)
 #