diff --git a/systemtests/tests/CMakeLists.txt b/systemtests/tests/CMakeLists.txt
index f8a3c9a17bf..d7a69613817 100644
--- a/systemtests/tests/CMakeLists.txt
+++ b/systemtests/tests/CMakeLists.txt
@@ -81,6 +81,6 @@ add_subdirectory(testfind)
 add_subdirectory(tlsrestricted)
 add_subdirectory(truncate-command)
 add_subdirectory(upgrade-database)
-add_subdirectory(virtualfull)
+add_subdirectory(virtualfull-basic)
 add_subdirectory(virtualfull-bscan)
 add_subdirectory(xattr)
diff --git a/systemtests/tests/virtualfull/CMakeLists.txt b/systemtests/tests/virtualfull-basic/CMakeLists.txt
similarity index 100%
rename from systemtests/tests/virtualfull/CMakeLists.txt
rename to systemtests/tests/virtualfull-basic/CMakeLists.txt
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in b/systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
rename to systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in b/systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
rename to systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
rename to systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in b/systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
rename to systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in b/systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
rename to systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in b/systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
rename to systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf b/systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
rename to systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in b/systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
rename to systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/messages/Daemon.conf.in b/systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
rename to systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/messages/Standard.conf.in b/systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/messages/Standard.conf.in
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/messages/Standard.conf.in
rename to systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/messages/Standard.conf.in
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/pool/Differential.conf b/systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/pool/Differential.conf
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/pool/Differential.conf
rename to systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/pool/Differential.conf
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/pool/Full.conf b/systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/pool/Full.conf
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/pool/Full.conf
rename to systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/pool/Full.conf
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/pool/Incremental.conf b/systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/pool/Incremental.conf
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/pool/Incremental.conf
rename to systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/pool/Incremental.conf
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/pool/Scratch.conf b/systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/pool/Scratch.conf
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/pool/Scratch.conf
rename to systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/pool/Scratch.conf
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/pool/VirtualFull.conf b/systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/pool/VirtualFull.conf
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/pool/VirtualFull.conf
rename to systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/pool/VirtualFull.conf
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/profile/operator.conf b/systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/profile/operator.conf
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/profile/operator.conf
rename to systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/profile/operator.conf
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/storage/File.conf.in b/systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/storage/File.conf.in
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/storage/File.conf.in
rename to systemtests/tests/virtualfull-basic/etc/bareos/bareos-dir.d/storage/File.conf.in
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-fd.d/client/myself.conf.in b/systemtests/tests/virtualfull-basic/etc/bareos/bareos-fd.d/client/myself.conf.in
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bareos-fd.d/client/myself.conf.in
rename to systemtests/tests/virtualfull-basic/etc/bareos/bareos-fd.d/client/myself.conf.in
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in b/systemtests/tests/virtualfull-basic/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
rename to systemtests/tests/virtualfull-basic/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-fd.d/messages/Standard.conf b/systemtests/tests/virtualfull-basic/etc/bareos/bareos-fd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bareos-fd.d/messages/Standard.conf
rename to systemtests/tests/virtualfull-basic/etc/bareos/bareos-fd.d/messages/Standard.conf
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-sd.d/device/FileStorage.conf b/systemtests/tests/virtualfull-basic/etc/bareos/bareos-sd.d/device/FileStorage.conf
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bareos-sd.d/device/FileStorage.conf
rename to systemtests/tests/virtualfull-basic/etc/bareos/bareos-sd.d/device/FileStorage.conf
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in b/systemtests/tests/virtualfull-basic/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
rename to systemtests/tests/virtualfull-basic/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-sd.d/messages/Standard.conf b/systemtests/tests/virtualfull-basic/etc/bareos/bareos-sd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bareos-sd.d/messages/Standard.conf
rename to systemtests/tests/virtualfull-basic/etc/bareos/bareos-sd.d/messages/Standard.conf
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/virtualfull-basic/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
rename to systemtests/tests/virtualfull-basic/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
diff --git a/systemtests/tests/virtualfull/etc/bareos/bconsole.conf.in b/systemtests/tests/virtualfull-basic/etc/bareos/bconsole.conf.in
similarity index 100%
rename from systemtests/tests/virtualfull/etc/bareos/bconsole.conf.in
rename to systemtests/tests/virtualfull-basic/etc/bareos/bconsole.conf.in
diff --git a/systemtests/tests/virtualfull/testrunner b/systemtests/tests/virtualfull-basic/testrunner
similarity index 100%
rename from systemtests/tests/virtualfull/testrunner
rename to systemtests/tests/virtualfull-basic/testrunner