diff --git a/tests/Makefile.am b/tests/Makefile.am
index f5a92239..4f84154c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -25,9 +25,7 @@ EXTRA_DIST = \
   $(TESTS)
 
 TESTS = \
-  set-up.pl \
-  test.pl \
-  tear-down.pl
+  test.pl
 
 check_SCRIPTS = repos
 
diff --git a/tests/set-up.pl b/tests/set-up.pl
deleted file mode 100644
index 4fb99a49..00000000
--- a/tests/set-up.pl
+++ /dev/null
@@ -1,5 +0,0 @@
-use strict;
-system("initdb -D postgres --locale C.UTF-8 ") == 0 or die;
-system("pg_ctl -D postgres -o \"-F -p 6433  -h '' -k /tmp \" -w start") == 0 or die;
-system("createdb -l C.UTF-8 -p 6433 hydra-test-suite") == 0 or die;
-system("hydra-init") == 0 or die;
diff --git a/tests/tear-down.pl b/tests/tear-down.pl
deleted file mode 100644
index f30bb278..00000000
--- a/tests/tear-down.pl
+++ /dev/null
@@ -1,12 +0,0 @@
-use strict;
-
-my $fail = 0;
-
-system("dropdb -p 6433 hydra-test-suite") == 0 or $fail = 1;
-system("pg_ctl -D postgres -w stop") == 0 or $fail = 1;
-
-system("chmod -R a+w nix") == 0 or $fail = 1;
-system("rm -rf postgres data nix git-repo hg-repo svn-repo svn-checkout svn-checkout-repo bzr-repo bzr-checkout-repo darcs-repo") == 0 or $fail = 1;
-system("rm -f .*-state") == 0 or $fail = 1;
-
-exit $fail;