diff --git a/systemtests/tests/multiplied-device-test/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/systemtests/tests/multiplied-device-test/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
index 136b75bd39e..5546d140d72 100644
--- a/systemtests/tests/multiplied-device-test/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
+++ b/systemtests/tests/multiplied-device-test/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
@@ -22,6 +22,6 @@ Director {                            # define myself
   # Plugin Directory = "@plugindir@"
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
-  Pid Directory =  "@working_dir@"
+  Pid Directory =  "@piddir@"
   DirPort = @dir_port@
 }
diff --git a/systemtests/tests/multiplied-device-test/etc/bareos/bareos-fd.d/client/myself.conf.in b/systemtests/tests/multiplied-device-test/etc/bareos/bareos-fd.d/client/myself.conf.in
index ddea3cd6ff4..30a1d912c5b 100644
--- a/systemtests/tests/multiplied-device-test/etc/bareos/bareos-fd.d/client/myself.conf.in
+++ b/systemtests/tests/multiplied-device-test/etc/bareos/bareos-fd.d/client/myself.conf.in
@@ -14,7 +14,7 @@ Client {
   # compatible = yes
 
   Working Directory =  "@working_dir@"
-  Pid Directory =  "@working_dir@"
+  Pid Directory =  "@piddir@"
   FD Port = @fd_port@
 
 }
diff --git a/systemtests/tests/multiplied-device-test/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/multiplied-device-test/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index 228fab8de68..cfdc01a1ca8 100644
--- a/systemtests/tests/multiplied-device-test/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/multiplied-device-test/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -9,6 +9,6 @@ Storage {
   # Plugin Directory = "@plugindir@"
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
-  Pid Directory =  "@working_dir@"
+  Pid Directory =  "@piddir@"
   SD Port = @sd_port@
 }
diff --git a/systemtests/tests/multiplied-device-test/testrunner b/systemtests/tests/multiplied-device-test/testrunner
index b0d04b5c7ff..cbf51c4e636 100755
--- a/systemtests/tests/multiplied-device-test/testrunner
+++ b/systemtests/tests/multiplied-device-test/testrunner
@@ -6,23 +6,13 @@
 TestName="$(basename "$(pwd)")"
 export TestName
 
-JobName=backup-bareos-fd
+JobName=backup-to-pool1
 . ./environment
 . ${scripts}/functions
 
 ${scripts}/cleanup
 ${scripts}/setup
 
-#
-# Zap out any schedule in default conf file so that
-#  it doesn't start during our test
-#
-#outf="$tmp/sed_tmp"
-#echo "s%  Schedule =%# Schedule =%g" >${outf}
-#cp $rscripts/bareos-dir.conf $tmp/1
-#sed -f ${outf} $tmp/1 >$conf/bareos-dir.conf
-
-#change_jobname BackupClient1FileList $JobName
 
 # Directory to backup.
 # This directory will be created by setup_data().
@@ -46,23 +36,6 @@ run job=backup-to-pool1 level=Full yes
 run job=backup-to-pool2 level=Full yes
 run job=backup-to-pool3 level=Full yes
 status storage=File
-status storage=File
-status storage=File
-status storage=File
-status storage=File
-status storage=File
-@#sleep 1
-status storage=File
-status storage=File
-status storage=File
-status storage=File
-status storage=File
-@#sleep 1
-status storage=File
-status storage=File
-status storage=File
-status storage=File
-status storage=File
 wait
 messages
 @#
@@ -76,30 +49,6 @@ messages
 quit
 END_OF_DATA
 
-run_bareos
-
-check_for_zombie_jobs storage=File
-stop_bareos
-
-cat <<END_OF_DATA >$tmp/bconcmds
-@$out /dev/null
-messages
-@$out $tmp/log1.out
-@#setdebug level=100 storage=File
-run job=$JobName yes
-wait
-messages
-@#
-@# now do a restore
-@#
-@$out $tmp/log2.out
-restore where=$tmp/bareos-restores select all done
-yes
-wait
-messages
-quit
-END_OF_DATA
-
 run_bareos
 check_for_zombie_jobs storage=File
 stop_bareos