diff --git a/release.nix b/release.nix
index 4373b64e..59da8330 100644
--- a/release.nix
+++ b/release.nix
@@ -17,7 +17,7 @@ rec {
       version = builtins.readFile ./version;
 
       buildInputs =
-        [ perl libxslt dblatex tetex nukeReferences pkgconfig boehmgc ] ;
+        [ perl libxslt dblatex tetex nukeReferences pkgconfig boehmgc ];
 
       preConfigure = ''
         # TeX needs a writable font cache.
@@ -63,6 +63,8 @@ rec {
         gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial gnused graphviz bazaar
       ] ++ ( if stdenv.isLinux then [rpm dpkg cdrkit] else [] )));
 
+      preConfigure = "patchShebangs .";
+
       postInstall = ''
         ensureDir $out/nix-support
         nuke-refs $out/share/doc/hydra/manual/manual.pdf
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2f720af2..718070e4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,7 @@
-TESTS_ENVIRONMENT =					\
-  BZR_HOME="$(abs_builddir)/data" \
+TESTS_ENVIRONMENT = \
+  BZR_HOME="$(abs_builddir)/data"			\
   HYDRA_DBI="dbi:SQLite:db.sqlite"			\
-  HYDRA_DATA="$(abs_builddir)/data"				\
+  HYDRA_DATA="$(abs_builddir)/data"			\
   HYDRA_HOME="$(top_srcdir)/src"			\
   NIX_REMOTE=						\
   NIX_CONF_DIR="$(abs_builddir)/nix/etc/nix"		\
@@ -19,8 +19,6 @@ EXTRA_DIST = \
   $(wildcard jobs/*.sh) \
   $(TESTS)
 
-TESTS_ENVIRONMENT = $(perl) -w
-
 TESTS = \
   query-all-tables.pl \
   evaluation-tests.pl
@@ -29,7 +27,7 @@ clean :
 	chmod -R a+w nix
 	rm -rf db.sqlite data nix git-repo hg-repo svn-repo svn-checkout svn-checkout-repo bzr-repo bzr-checkout-repo
 
-$(TESTS) : db.sqlite repos
+check_SCRIPTS = db.sqlite repos
 
 db.sqlite : $(top_srcdir)/src/sql/hydra-sqlite.sql
 	sqlite3 db.sqlite <  $(top_srcdir)/src/sql/hydra-sqlite.sql
diff --git a/tests/Setup.pm b/tests/Setup.pm
index 345cb8cd..6c72685f 100644
--- a/tests/Setup.pm
+++ b/tests/Setup.pm
@@ -59,14 +59,14 @@ sub createJobsetWithOneInput {
 
 sub evalSucceeds {
   my ($jobset) = @_;
-  my $res = captureStdoutStderr(60, ("../src/script/hydra_evaluator.pl", $jobset->project->name, $jobset->name));
+  my $res = captureStdoutStderr(60, ("../src/script/hydra-evaluator", $jobset->project->name, $jobset->name));
   print STDERR "Evaluation errors for jobset ".$jobset->project->name.":".$jobset->name.": \n".$jobset->errormsg."\n" if $jobset->errormsg;
   return $res;
 }
 
 sub runBuild {
   my ($build) = @_;
-  return captureStdoutStderr(60, ("../src/script/hydra_build.pl", $build->id));
+  return captureStdoutStderr(60, ("../src/script/hydra-build", $build->id));
 }
 
 1;