diff --git a/Makefile b/Makefile
index fdccab1..8b34cbb 100644
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,9 @@ bareos: all
 sed:
 	echo "Doing: scripts/do_sed"
 	scripts/do_sed
+	echo "adapting default fileset for regression tests"
+	cp bin/bareos-dir.conf bin/bareos-dir.conf.orig
+	sed 's#File.*/$$#File = /usr/sbin#g'  < bin/bareos-dir.conf.orig > bin/bareos-dir.conf
 
 # Run all disk tests
 test:
diff --git a/tests/acl-xattr-test b/tests/acl-xattr-test
index 6229c9d..fa5fe05 100755
--- a/tests/acl-xattr-test
+++ b/tests/acl-xattr-test
@@ -208,7 +208,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label volume=TestVolume001 storage=File1 pool=File slot=1 drive=0
+label volume=TestVolume001 storage=File1 pool=Full slot=1 drive=0
 @#setdebug level=400 trace=1 client
 @#setdebug level=300 trace=1 director
 @#setdebug level=300 trace=1 storage=File1
diff --git a/tests/backup-bareos-test b/tests/backup-bareos-test
index 83aa6a0..03f61f3 100755
--- a/tests/backup-bareos-test
+++ b/tests/backup-bareos-test
@@ -27,7 +27,7 @@ cat <<END_OF_DATA >$tmp/bconcmds
 messages
 @$out $tmp/log1.out
 setdebug level=100 storage=File
-label volume=TestVolume001 storage=File pool=File
+label volume=TestVolume001 storage=File pool=Full
 run job=$JobName yes
 status storage=File
 status storage=File
diff --git a/tests/estimate-test b/tests/estimate-test
index 8b8705c..144efca 100755
--- a/tests/estimate-test
+++ b/tests/estimate-test
@@ -29,7 +29,7 @@ cat <<END_OF_DATA >$tmp/bconcmds
 @$out /dev/null
 messages
 @$out $tmp/log1.out
-label volume=TestVolume001 storage=File pool=File
+label volume=TestVolume001 storage=File pool=Full
 run job=$JobName yes
 wait
 messages
diff --git a/tests/fileregexp-test b/tests/fileregexp-test
index eb465be..27d2a49 100755
--- a/tests/fileregexp-test
+++ b/tests/fileregexp-test
@@ -27,7 +27,7 @@ cat <<END_OF_DATA >${tmp}/bconcmds
 @$out /dev/null
 messages
 @$out ${tmp}/log1.out
-label volume=TestVolume001 storage=File pool=File
+label volume=TestVolume001 storage=File pool=Full
 run job=$JobName yes
 wait
 messages
diff --git a/tests/messages-test b/tests/messages-test
index 332d145..1288c23 100755
--- a/tests/messages-test
+++ b/tests/messages-test
@@ -40,7 +40,7 @@ cat <<END_OF_DATA >$tmp/bconcmds
 messages
 @$out $tmp/log1.out
 @#setdebug level=100 storage=File
-label volume=TestVolume001 storage=File pool=File
+label volume=TestVolume001 storage=File pool=Full
 run job=$JobName yes
 @sleep 1
 status storage=File
diff --git a/tests/no-chksum-test b/tests/no-chksum-test
index 45056e4..e13686d 100755
--- a/tests/no-chksum-test
+++ b/tests/no-chksum-test
@@ -27,7 +27,7 @@ cat <<END_OF_DATA >$tmp/bconcmds
 @$out /dev/null
 messages
 @$out $tmp/log1.out
-label volume=TestVolume001 storage=File pool=File
+label volume=TestVolume001 storage=File pool=Full
 END_OF_DATA
 
 run_bareos
diff --git a/tests/source-addr-test b/tests/source-addr-test
index e27eab9..bd524e0 100755
--- a/tests/source-addr-test
+++ b/tests/source-addr-test
@@ -60,7 +60,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-@#label volume=TestVolume001 storage=File pool=File
+@#label volume=TestVolume001 storage=File pool=Full
 @#setdebug level=100 storage=File
 run job=$JobName yes
 @sleep 3
@@ -97,7 +97,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label volume=TestVolume001 storage=File pool=File
+label volume=TestVolume001 storage=File pool=Full
 @#setdebug level=100 storage=File
 wait
 messages
diff --git a/tests/stats-test b/tests/stats-test
index f04c6c0..fbe47e8 100755
--- a/tests/stats-test
+++ b/tests/stats-test
@@ -26,7 +26,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label volume=TestVolume001 storage=File pool=File
+label volume=TestVolume001 storage=File pool=Full
 run job=$JobName yes
 wait
 messages