diff --git a/test/build/aterm-build.sh b/test/build/aterm-build.sh
deleted file mode 100755
index f8cca71aa0..0000000000
--- a/test/build/aterm-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-top=`pwd`
-tar xvfz $src
-cd aterm-*
-./configure --prefix=$top
-make
-make install
-cd ..
-rm -rf aterm-*
diff --git a/test/build/atk-build.sh b/test/build/atk-build.sh
deleted file mode 100755
index 632dbe12fb..0000000000
--- a/test/build/atk-build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib
-
-top=`pwd` || exit 1
-tar xvfj $src || exit 1
-cd atk-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf atk-* || exit 1
diff --git a/test/build/glib-build.sh b/test/build/glib-build.sh
deleted file mode 100755
index 92736f7015..0000000000
--- a/test/build/glib-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-
-top=`pwd`
-tar xvfj $src
-cd glib-*
-./configure --prefix=$top
-make
-make install
-cd ..
-rm -rf glib-*
diff --git a/test/build/gnet-build.sh b/test/build/gnet-build.sh
deleted file mode 100755
index 72141c2687..0000000000
--- a/test/build/gnet-build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd gnet-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf gnet-* || exit 1
diff --git a/test/build/gtk+-build.sh b/test/build/gtk+-build.sh
deleted file mode 100755
index 3b663fec5f..0000000000
--- a/test/build/gtk+-build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib
-
-top=`pwd`
-tar xvfj $src || exit 1
-cd gtk+-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf gtk+-* || exit 1
diff --git a/test/build/gtkspell-build.sh b/test/build/gtkspell-build.sh
deleted file mode 100755
index d4267b3028..0000000000
--- a/test/build/gtkspell-build.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$gtk/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$pspell/lib
-export C_INCLUDE_PATH=$pspell/include
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd gtkspell-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf gtkspell-* || exit 1
diff --git a/test/build/httpd-build.sh b/test/build/httpd-build.sh
deleted file mode 100755
index a5b43d7443..0000000000
--- a/test/build/httpd-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd httpd-* || exit 1
-./configure --prefix=$top --enable-ssl --with-ssl=$ssl --enable-mods-shared=all || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf httpd-* || exit 1
diff --git a/test/build/openssl-build.sh b/test/build/openssl-build.sh
deleted file mode 100755
index 23437a37b3..0000000000
--- a/test/build/openssl-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd openssl-* || exit 1
-./config --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf openssl-* || exit 1
diff --git a/test/build/pan-build-2.sh b/test/build/pan-build-2.sh
deleted file mode 100755
index 8320cb0102..0000000000
--- a/test/build/pan-build-2.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:$gnet/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$gtk/lib/pkgconfig:$gtkspell/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$gnet/lib:$pspell/lib:$gtkspell/lib
-
-# A bug in gtkspell: the pspell library path is not exported
-# through pkgconfig.
-export LIBRARY_PATH=$pspell/lib
-
-export LDFLAGS=-s
-
-top=`pwd`
-tar xvfj $src || exit 1
-cd pan-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf pan-* || exit 1
diff --git a/test/build/pan-build.sh b/test/build/pan-build.sh
deleted file mode 100755
index 907215f37f..0000000000
--- a/test/build/pan-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:$gnet/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$gtk/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$gnet/lib
-
-top=`pwd`
-tar xvfj $src
-cd pan-*
-./configure --prefix=$top
-make
-make install
diff --git a/test/build/pan-run.sh b/test/build/pan-run.sh
deleted file mode 100755
index 1d9db53776..0000000000
--- a/test/build/pan-run.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$gnet/lib:$pspell/lib:$gtkspell/lib
-
-ldd $pan/bin/pan
-
-prog=$1
-shift
-
-$pan/bin/$prog $*
diff --git a/test/build/pango-build.sh b/test/build/pango-build.sh
deleted file mode 100755
index 42a2758025..0000000000
--- a/test/build/pango-build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib
-
-top=`pwd` || exit 1
-tar xvfj $src || exit 1
-cd pango-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf pango-* || exit 1
diff --git a/test/build/pkgconfig-build.sh b/test/build/pkgconfig-build.sh
deleted file mode 100755
index beceddfb64..0000000000
--- a/test/build/pkgconfig-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd pkgconfig-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd .. || exit 1
-rm -rf pkgconfig-* || exit 1
diff --git a/test/build/pspell-build.sh b/test/build/pspell-build.sh
deleted file mode 100755
index 862bb25e61..0000000000
--- a/test/build/pspell-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd pspell-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf pspell-* || exit 1
diff --git a/test/build/subversion-build.sh b/test/build/subversion-build.sh
deleted file mode 100755
index 3d1922c98a..0000000000
--- a/test/build/subversion-build.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-export LDFLAGS=-s
-
-top=`pwd`
-
-if test $httpsClient; then
-    extraflags="--with-ssl --with-libs=$ssl $extraflags"
-fi
-
-if test $httpServer; then
-    extraflags="--with-apxs=$httpd/bin/apxs --with-apr=$httpd --with-apr-util=$httpd $extraflags"
-    extrainst="APACHE_LIBEXECDIR=$top/modules $extrainst"
-fi
-
-echo "extra flags: $extraflags"
-
-tar xvfz $src || exit 1
-cd subversion-* || exit 1
-./configure --prefix=$top $extraflags || exit 1
-make || exit 1
-make install $extrainst || exit 1
-cd $top || exit 1
-rm -rf subversion-* || exit 1
diff --git a/test/fixdescriptors/aterm-2.0.fix b/test/fixdescriptors/aterm-2.0.fix
deleted file mode 100644
index 2fdf43434f..0000000000
--- a/test/fixdescriptors/aterm-2.0.fix
+++ /dev/null
@@ -1,10 +0,0 @@
-Descr(
-  [ Bind("pkgId", "aterm-2.0")
-  , Bind("releaseId", "1")
-
-  , Bind("createGCC", True)
-
-  , Bind("src", Url("853474e4bcf4a85f7d38a0676b36bded", "http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.0.tar.gz"))
-  , Bind("build", Local("../build/aterm-build.sh"))
-  ]
-)
diff --git a/test/fixdescriptors/atk-1.2.0.fix b/test/fixdescriptors/atk-1.2.0.fix
deleted file mode 100644
index 9f880be114..0000000000
--- a/test/fixdescriptors/atk-1.2.0.fix
+++ /dev/null
@@ -1,11 +0,0 @@
-Descr(
-  [ Bind("pkgId", "atk-1.2.0")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-
-  , Bind("src", Url("06a84758129554ae044af8865ecb6f1c", "ftp://ftp.gtk.org/pub/gtk/v2.2/atk-1.2.0.tar.bz2"))
-  , Bind("build", Local("../build/atk-build.sh"))
-  ]
-)
diff --git a/test/fixdescriptors/glib-2.2.1.fix b/test/fixdescriptors/glib-2.2.1.fix
deleted file mode 100644
index 9dc0f4e292..0000000000
--- a/test/fixdescriptors/glib-2.2.1.fix
+++ /dev/null
@@ -1,10 +0,0 @@
-Descr(
-  [ Bind("pkgId", "glib-2.2.1")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-
-  , Bind("src", Url("42406a17819080326e105f8333963b97", "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-2.2.1.tar.bz2"))
-  , Bind("build", Local("../build/glib-build.sh"))
-  ]
-)
diff --git a/test/fixdescriptors/gnet-1.1.8.fix b/test/fixdescriptors/gnet-1.1.8.fix
deleted file mode 100644
index ef1f1b1da7..0000000000
--- a/test/fixdescriptors/gnet-1.1.8.fix
+++ /dev/null
@@ -1,11 +0,0 @@
-Descr(
-  [ Bind("pkgId", "gnet-1.1.8")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-
-  , Bind("src", Url("da2b5de278e96a5b907c2e2304bf6542", "http://www.gnetlibrary.org/src/gnet-1.1.8.tar.gz"))
-  , Bind("build", Local("../build/gnet-build.sh"))
-  ]
-)
diff --git a/test/fixdescriptors/gtk+-2.2.1.fix b/test/fixdescriptors/gtk+-2.2.1.fix
deleted file mode 100644
index 9563df0a92..0000000000
--- a/test/fixdescriptors/gtk+-2.2.1.fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Descr(
-  [ Bind("pkgId", "gtk+-2.2.1")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-  , Bind("atk", Fix("./atk-1.2.0.fix"))
-  , Bind("pango", Fix("./pango-1.2.1.fix"))
-
-  , Bind("src", Url("dfd5755fddb26a46c96bfaa813280ac4", "ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-2.2.1.tar.bz2"))
-  , Bind("build", Local("../build/gtk+-build.sh"))
-  ]
-)
diff --git a/test/fixdescriptors/gtkspell-2.0.2.fix b/test/fixdescriptors/gtkspell-2.0.2.fix
deleted file mode 100644
index ef7e185c92..0000000000
--- a/test/fixdescriptors/gtkspell-2.0.2.fix
+++ /dev/null
@@ -1,15 +0,0 @@
-Descr(
-  [ Bind("pkgId", "gtkspell-2.0.2")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-  , Bind("atk", Fix("./atk-1.2.0.fix"))
-  , Bind("pango", Fix("./pango-1.2.1.fix"))
-  , Bind("gtk", Fix("./gtk+-2.2.1.fix"))
-  , Bind("pspell", Fix("./pspell-.12.2.fix"))
-
-  , Bind("src", Url("385daba9bebfdc7fdbdf524e07deb920", "http://pan.rebelbase.com/download/extras/gtkspell/SOURCES/gtkspell-2.0.2.tar.gz"))
-  , Bind("build", Local("../build/gtkspell-build.sh"))
-  ]
-)
diff --git a/test/fixdescriptors/httpd-2.0.45.fix b/test/fixdescriptors/httpd-2.0.45.fix
deleted file mode 100644
index e0db5ab2ef..0000000000
--- a/test/fixdescriptors/httpd-2.0.45.fix
+++ /dev/null
@@ -1,10 +0,0 @@
-Descr(
-  [ Bind("pkgId", "httpd-2.0.45")
-  , Bind("releaseId", "1")
-
-  , Bind("ssl", Fix("./openssl-0.9.7b.fix"))
-
-  , Bind("src", Url("1f33e9a2e2de06da190230fa72738d75", "http://apache.cs.uu.nl/dist/httpd/httpd-2.0.45.tar.gz"))
-  , Bind("build", Local("../build/httpd-build.sh"))
-  ]
-)
diff --git a/test/fixdescriptors/openssl-0.9.7b.fix b/test/fixdescriptors/openssl-0.9.7b.fix
deleted file mode 100644
index f55d0cca1e..0000000000
--- a/test/fixdescriptors/openssl-0.9.7b.fix
+++ /dev/null
@@ -1,8 +0,0 @@
-Descr(
-  [ Bind("pkgId", "openssl-0.9.7b")
-  , Bind("releaseId", "1")
-
-  , Bind("src", Url("fae4bec090fa78e20f09d76d55b6ccff", "http://www.openssl.org/source/openssl-0.9.7b.tar.gz"))
-  , Bind("build", Local("../build/openssl-build.sh"))
-  ]
-)
diff --git a/test/fixdescriptors/pan-0.14.0.fix b/test/fixdescriptors/pan-0.14.0.fix
deleted file mode 100644
index 1fbee11795..0000000000
--- a/test/fixdescriptors/pan-0.14.0.fix
+++ /dev/null
@@ -1,17 +0,0 @@
-Descr(
-  [ Bind("pkgId", "pan-0.14.0")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-  , Bind("atk", Fix("./atk-1.2.0.fix"))
-  , Bind("pango", Fix("./pango-1.2.1.fix"))
-  , Bind("gtk", Fix("./gtk+-2.2.1.fix"))
-  , Bind("gnet", Fix("./gnet-1.1.8.fix"))
-  , Bind("pspell", Fix("./pspell-.12.2.fix"))
-  , Bind("gtkspell", Fix("./gtkspell-2.0.2.fix"))
-
-  , Bind("src", Url("b2702adadb84c2e0d52d2bb029c05206", "http://pan.rebelbase.com/download/releases/0.14.0/SOURCE/pan-0.14.0.tar.bz2"))
-  , Bind("build", Local("../build/pan-build-2.sh"))
-  ]
-)
diff --git a/test/fixdescriptors/pango-1.2.1.fix b/test/fixdescriptors/pango-1.2.1.fix
deleted file mode 100644
index 886616d0d0..0000000000
--- a/test/fixdescriptors/pango-1.2.1.fix
+++ /dev/null
@@ -1,11 +0,0 @@
-Descr(
-  [ Bind("pkgId", "pango-1.2.1")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-
-  , Bind("src", Url("6b354ef14e75739a92b5b78f4ca3165a", "ftp://ftp.gtk.org/pub/gtk/v2.2/pango-1.2.1.tar.bz2"))
-  , Bind("build", Local("../build/pango-build.sh"))
-  ]
-)
diff --git a/test/fixdescriptors/pkgconfig-0.15.0.fix b/test/fixdescriptors/pkgconfig-0.15.0.fix
deleted file mode 100644
index bf895b0f50..0000000000
--- a/test/fixdescriptors/pkgconfig-0.15.0.fix
+++ /dev/null
@@ -1,8 +0,0 @@
-Descr(
-  [ Bind("pkgId", "pkgconfig-0.15.0")
-  , Bind("releaseId", "1")
-
-  , Bind("src", Url("a7e4f60a6657dbc434334deb594cc242", "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.15.0.tar.gz"))
-  , Bind("build", Local("../build/pkgconfig-build.sh"))
-  ]
-)
diff --git a/test/fixdescriptors/pspell-.12.2.fix b/test/fixdescriptors/pspell-.12.2.fix
deleted file mode 100644
index 945cb62a88..0000000000
--- a/test/fixdescriptors/pspell-.12.2.fix
+++ /dev/null
@@ -1,8 +0,0 @@
-Descr(
-  [ Bind("pkgId", "pspell-.12.2")
-  , Bind("releaseId", "1")
-
-  , Bind("src", Url("cfd3816b2372932a1b71c0ce4e9f881e", "http://unc.dl.sourceforge.net/sourceforge/pspell/pspell-.12.2.tar.gz"))
-  , Bind("build", Local("../build/pspell-build.sh"))
-  ]
-)
diff --git a/test/fixdescriptors/subversion-0.21.0.fix b/test/fixdescriptors/subversion-0.21.0.fix
deleted file mode 100644
index de2edbcbbd..0000000000
--- a/test/fixdescriptors/subversion-0.21.0.fix
+++ /dev/null
@@ -1,16 +0,0 @@
-Descr(
-  [ Bind("pkgId", "subversion-0.21.0")
-  , Bind("releaseId", "1")
-
-  , Bind("httpsClient", Bool(True))
-  , Bind("httpServer", Bool(True))
-  , Bind("httpsServer", Bool(True))
-
-  , Bind("ssl", If(Var("httpsClient"), Fix("./openssl-0.9.7b.fix"), ""))
-
-  , Bind("httpd", If(Var("httpServer"), Fix("./httpd-2.0.45.fix"), ""))
-
-  , Bind("src", Url("b2ad91127fb652e764b750f4c0002528", "http://subversion.tigris.org/files/documents/15/3712/subversion-0.21.0.tar.gz"))
-  , Bind("build", Local("../build/subversion-build.sh"))
-  ]
-)
diff --git a/test/fixdescriptors/system.fix b/test/fixdescriptors/system.fix
deleted file mode 100644
index 7ca8c8797c..0000000000
--- a/test/fixdescriptors/system.fix
+++ /dev/null
@@ -1,19 +0,0 @@
-Descr(
-  [ Bind("pkgId", Str("system"))
-  , Bind("releaseId", Str("3"))
-
-  , Bind("actATerm", Fix("./aterm-2.0.fix"))
-  , Bind("actPkgConfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("actGlib", Fix("./glib-2.2.1.fix"))
-  , Bind("actAtk", Fix("./atk-1.2.0.fix"))
-  , Bind("actPango", Fix("./pango-1.2.1.fix"))
-  , Bind("actGtk", Fix("./gtk+-2.2.1.fix"))
-  , Bind("actGnet", Fix("./gnet-1.1.8.fix"))
-  , Bind("actPspell", Fix("./pspell-.12.2.fix"))
-  , Bind("actGtkspell", Fix("./gtkspell-2.0.2.fix"))
-  , Bind("actPan", Fix("./pan-0.14.0.fix"))
-  , Bind("actSubversion", Fix("./subversion-0.21.0.fix"))
-
-  , Bind("build", Local("../../scripts/nix-populate"))
-  ]
-)