4 files changed, 10 insertions, 2 deletions
diff --git a/test/bbackupd/testfiles/bbackupd-snapshot.conf.in b/test/bbackupd/testfiles/bbackupd-snapshot.conf.in
index d245d077..73b50c6e 100644
--- a/test/bbackupd/testfiles/bbackupd-snapshot.conf.in
+++ b/test/bbackupd/testfiles/bbackupd-snapshot.conf.in
@@ -13,6 +13,7 @@ AccountNumber = 0x01234567
 
 AutomaticBackup = no
 UpdateStoreInterval = 0
+BackupErrorDelay = 10
 MinimumFileAge = 4
 MaxUploadWait = 24
 DeleteRedundantLocationsAfter = 10
diff --git a/test/bbackupd/testfiles/bbackupd.conf.in b/test/bbackupd/testfiles/bbackupd.conf.in
index 712b58b2..f0080c4a 100644
--- a/test/bbackupd/testfiles/bbackupd.conf.in
+++ b/test/bbackupd/testfiles/bbackupd.conf.in
@@ -12,6 +12,7 @@ StorePort = 22011
 AccountNumber = 0x01234567
 
 UpdateStoreInterval = 3
+BackupErrorDelay = 10
 MinimumFileAge = 4
 MaxUploadWait = 24
 DeleteRedundantLocationsAfter = 10
diff --git a/test/bbackupd/testfiles/extcheck1.pl.in b/test/bbackupd/testfiles/extcheck1.pl.in
index 5b70c677..c80ddc66 100755
--- a/test/bbackupd/testfiles/extcheck1.pl.in
+++ b/test/bbackupd/testfiles/extcheck1.pl.in
@@ -1,9 +1,12 @@
 #!@PERL@
 use strict;
 
+use File::Spec;
+
 my $flags = $ARGV[0] or "";
+my $bbackupquery = File::Spec->catfile('..', '..', 'bin', 'bbackupquery', 'bbackupquery');
 
-unless(open IN,"../../bin/bbackupquery/bbackupquery -Wwarning " .
+unless(open IN, "$bbackupquery -Wwarning " .
 	"-c testfiles/bbackupd.conf " .
 	"-l testfiles/query4.log " .
 	"\"compare -ac$flags\" quit 2>&1 |")
diff --git a/test/bbackupd/testfiles/extcheck2.pl.in b/test/bbackupd/testfiles/extcheck2.pl.in
index 3671ad93..02c258f8 100755
--- a/test/bbackupd/testfiles/extcheck2.pl.in
+++ b/test/bbackupd/testfiles/extcheck2.pl.in
@@ -1,9 +1,12 @@
 #!@PERL@
 use strict;
 
+use File::Spec;
+
 my $flags = $ARGV[0] or "";
+my $bbackupquery = File::Spec->catfile('..', '..', 'bin', 'bbackupquery', 'bbackupquery');
 
-unless(open IN,"../../bin/bbackupquery/bbackupquery -Wwarning " .
+unless(open IN, "$bbackupquery -Wwarning " .
 	"-c testfiles/bbackupd.conf " .
 	"-l testfiles/query4.log " .
 	"\"compare -ac$flags\" quit 2>&1 |")