diff --git a/scripts/cleanup b/scripts/cleanup
index d22c9c0..5838e39 100755
--- a/scripts/cleanup
+++ b/scripts/cleanup
@@ -25,7 +25,6 @@ rm -rf ${working}/*.trace ${working}/*.traceback ${working}/*.bactrace
 rm -rf ${working}/*.state
 rm -rf ${working}/CLEANUPMARKER
 rm -rf ${tmp}disk-changer
-rm -f ${cwd}/bin/plugins/test-plugin-fd.so
 find . -name "gigaslam.gif" -exec rm -f {} \;
 # cleanup old config files
 rm -f  ${conf}/bareos-*.conf
diff --git a/scripts/setup b/scripts/setup
index f53d2d5..2f7486c 100755
--- a/scripts/setup
+++ b/scripts/setup
@@ -118,6 +118,9 @@ cd ../..
   cd src/plugins/filed
   make install-test-plugin
 )
+#disable test-plugin
+mv ${cwd}/bin/plugins/test-plugin-fd.so ${cwd}/bin/plugins/test-plugin-fd.sox
+
 
 cd ${cwd}
 bin/bareos stop
diff --git a/tests/plugin-test b/tests/plugin-test
index 259b2b7..41d0c40 100755
--- a/tests/plugin-test
+++ b/tests/plugin-test
@@ -9,6 +9,10 @@ JobName=pluginTest
 scripts/cleanup
 scripts/copy-plugin-confs
 
+# enable test-plugin
+mv -f ${cwd}/bin/plugins/test-plugin-fd.sox ${cwd}/bin/plugins/test-plugin-fd.so
+
+mv -f ${cwd}/bin/plugins/bpipe-fd.sox ${cwd}/bin/plugins/bpipe-fd.so
 
 file=encrypt-bug.jpg
 echo "${cwd}/README" >${cwd}/tmp/file-list
@@ -155,4 +159,7 @@ perl -ne '
 
 estat=$?
 
+# disable test-plugin
+mv -f ${cwd}/bin/plugins/test-plugin-fd.so ${cwd}/bin/plugins/test-plugin-fd.sox
+
 end_test