diff --git a/test/EXAMPLE_MANIFEST b/test/EXAMPLE_MANIFEST
deleted file mode 100755
index 900fc19d..00000000
--- a/test/EXAMPLE_MANIFEST
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# 2010 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-# 
-# Define configuration, currently global, add matches later!
-#
-
-__file cdist_bin --source /from/outer/space --destination /to/earth
-__user hal --uid 9000
-__service puppet --status disabled
-
-# fails
-__service puppet --status duplicated
-
-# fails
-__service time --missing
diff --git a/test/caller b/test/caller
deleted file mode 100755
index d9409538..00000000
--- a/test/caller
+++ /dev/null
@@ -1,3 +0,0 @@
-. ./reporter
-
-reporter
diff --git a/test/func_var1 b/test/func_var1
deleted file mode 100644
index d1b6f145..00000000
--- a/test/func_var1
+++ /dev/null
@@ -1,5 +0,0 @@
-func1()
-{
-   myvar="blu"
-   echo $myvar
-}
diff --git a/test/func_var1var2 b/test/func_var1var2
deleted file mode 100644
index 42f6d319..00000000
--- a/test/func_var1var2
+++ /dev/null
@@ -1,5 +0,0 @@
-. ./func_var1
-. ./func_var2
-
-func1
-func2
diff --git a/test/func_var2 b/test/func_var2
deleted file mode 100644
index 35680eb7..00000000
--- a/test/func_var2
+++ /dev/null
@@ -1,4 +0,0 @@
-func2()
-{
-   echo $myvar
-}
diff --git a/test/reporter b/test/reporter
deleted file mode 100644
index 293a0722..00000000
--- a/test/reporter
+++ /dev/null
@@ -1,4 +0,0 @@
-reporter()
-{
-   echo 0: $0
-}
diff --git a/test/ssh-pseudo-interactive-explorer b/test/ssh-pseudo-interactive-explorer
deleted file mode 100755
index 81ad0db5..00000000
--- a/test/ssh-pseudo-interactive-explorer
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-#
-# 2010 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-# 
-# Let's build a cconfig tree from a generic configuration (example)
-#
-
-d1="$(date)"
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-uname=$(ssh localhost "uname -r")
-d2="$(date)"
-
-echo $d1 $d2
diff --git a/test/test_collectd b/test/test_collectd
deleted file mode 100755
index a3bb1d7c..00000000
--- a/test/test_collectd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# 2010 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-#
-
-. cdist-config
-
-collectd
diff --git a/test/test_package_install b/test/test_package_install
deleted file mode 100755
index 9f6ba3d6..00000000
--- a/test/test_package_install
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# 2010 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-#
-
-. cdist-config
-
-cdist_package install "$@"