diff --git a/systemtests/tests/py3plug-dir b/systemtests/tests/py3plug-dir
deleted file mode 120000
index 5db90547d1d..00000000000
--- a/systemtests/tests/py3plug-dir
+++ /dev/null
@@ -1 +0,0 @@
-py2plug-dir
\ No newline at end of file
diff --git a/systemtests/tests/py2plug-dir/CMakeLists.txt b/systemtests/tests/py3plug-dir/CMakeLists.txt
similarity index 100%
rename from systemtests/tests/py2plug-dir/CMakeLists.txt
rename to systemtests/tests/py3plug-dir/CMakeLists.txt
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in b/systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
rename to systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in b/systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
rename to systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in b/systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
rename to systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in b/systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
rename to systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in b/systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
rename to systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in b/systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in
rename to systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in b/systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
rename to systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/messages/Daemon.conf.in b/systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
rename to systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/messages/Standard.conf.in b/systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/messages/Standard.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/messages/Standard.conf.in
rename to systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/messages/Standard.conf.in
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/pool/Differential.conf b/systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/pool/Differential.conf
similarity index 100%
rename from systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/pool/Differential.conf
rename to systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/pool/Differential.conf
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/pool/Full.conf b/systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/pool/Full.conf
similarity index 100%
rename from systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/pool/Full.conf
rename to systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/pool/Full.conf
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/pool/Incremental.conf b/systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/pool/Incremental.conf
similarity index 100%
rename from systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/pool/Incremental.conf
rename to systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/pool/Incremental.conf
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/pool/Scratch.conf b/systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/pool/Scratch.conf
similarity index 100%
rename from systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/pool/Scratch.conf
rename to systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/pool/Scratch.conf
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/profile/operator.conf b/systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/profile/operator.conf
similarity index 100%
rename from systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/profile/operator.conf
rename to systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/profile/operator.conf
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/storage/File.conf.in b/systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/storage/File.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-dir/etc/bareos/bareos-dir.d/storage/File.conf.in
rename to systemtests/tests/py3plug-dir/etc/bareos/bareos-dir.d/storage/File.conf.in
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bareos-fd.d/client/myself.conf.in b/systemtests/tests/py3plug-dir/etc/bareos/bareos-fd.d/client/myself.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-dir/etc/bareos/bareos-fd.d/client/myself.conf.in
rename to systemtests/tests/py3plug-dir/etc/bareos/bareos-fd.d/client/myself.conf.in
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-dir/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-dir/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-dir/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bareos-fd.d/messages/Standard.conf b/systemtests/tests/py3plug-dir/etc/bareos/bareos-fd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/py2plug-dir/etc/bareos/bareos-fd.d/messages/Standard.conf
rename to systemtests/tests/py3plug-dir/etc/bareos/bareos-fd.d/messages/Standard.conf
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bareos-sd.d/device/FileStorage.conf b/systemtests/tests/py3plug-dir/etc/bareos/bareos-sd.d/device/FileStorage.conf
similarity index 100%
rename from systemtests/tests/py2plug-dir/etc/bareos/bareos-sd.d/device/FileStorage.conf
rename to systemtests/tests/py3plug-dir/etc/bareos/bareos-sd.d/device/FileStorage.conf
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-dir/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-dir/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-dir/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bareos-sd.d/messages/Standard.conf b/systemtests/tests/py3plug-dir/etc/bareos/bareos-sd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/py2plug-dir/etc/bareos/bareos-sd.d/messages/Standard.conf
rename to systemtests/tests/py3plug-dir/etc/bareos/bareos-sd.d/messages/Standard.conf
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/py3plug-dir/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-dir/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
rename to systemtests/tests/py3plug-dir/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bconsole.conf.in b/systemtests/tests/py3plug-dir/etc/bareos/bconsole.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-dir/etc/bareos/bconsole.conf.in
rename to systemtests/tests/py3plug-dir/etc/bareos/bconsole.conf.in
diff --git a/systemtests/tests/py2plug-dir/lsan-suppressions.txt b/systemtests/tests/py3plug-dir/lsan-suppressions.txt
similarity index 100%
rename from systemtests/tests/py2plug-dir/lsan-suppressions.txt
rename to systemtests/tests/py3plug-dir/lsan-suppressions.txt
diff --git a/systemtests/tests/py2plug-dir/python-modules/BareosDirTest.py b/systemtests/tests/py3plug-dir/python-modules/BareosDirTest.py
similarity index 100%
rename from systemtests/tests/py2plug-dir/python-modules/BareosDirTest.py
rename to systemtests/tests/py3plug-dir/python-modules/BareosDirTest.py
diff --git a/systemtests/tests/py2plug-dir/python-modules/bareos-dir-test.py b/systemtests/tests/py3plug-dir/python-modules/bareos-dir-test.py
similarity index 100%
rename from systemtests/tests/py2plug-dir/python-modules/bareos-dir-test.py
rename to systemtests/tests/py3plug-dir/python-modules/bareos-dir-test.py
diff --git a/systemtests/tests/py2plug-dir/testrunner b/systemtests/tests/py3plug-dir/testrunner
similarity index 100%
rename from systemtests/tests/py2plug-dir/testrunner
rename to systemtests/tests/py3plug-dir/testrunner
diff --git a/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql
deleted file mode 120000
index 971c11940e3..00000000000
--- a/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql
+++ /dev/null
@@ -1 +0,0 @@
-py2plug-fd-contrib-bareos_tasks_mysql
\ No newline at end of file
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/CMakeLists.txt b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/CMakeLists.txt
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/CMakeLists.txt
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/CMakeLists.txt
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/fileset/bareos_mysql_dump.conf.in b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/fileset/bareos_mysql_dump.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/fileset/bareos_mysql_dump.conf.in
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/fileset/bareos_mysql_dump.conf.in
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/fileset/bareos_tasks_mysql.conf.in b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/fileset/bareos_tasks_mysql.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/fileset/bareos_tasks_mysql.conf.in
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/fileset/bareos_tasks_mysql.conf.in
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/messages/Daemon.conf.in b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/messages/Standard.conf.in b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/messages/Standard.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/messages/Standard.conf.in
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/messages/Standard.conf.in
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/pool/Differential.conf b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/pool/Differential.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/pool/Differential.conf
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/pool/Differential.conf
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/pool/Full.conf b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/pool/Full.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/pool/Full.conf
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/pool/Full.conf
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/pool/Incremental.conf b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/pool/Incremental.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/pool/Incremental.conf
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/pool/Incremental.conf
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/pool/Scratch.conf b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/pool/Scratch.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/pool/Scratch.conf
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/pool/Scratch.conf
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/profile/operator.conf b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/profile/operator.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/profile/operator.conf
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/profile/operator.conf
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/storage/File.conf.in b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/storage/File.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/storage/File.conf.in
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-dir.d/storage/File.conf.in
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-fd.d/client/myself.conf.in b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-fd.d/client/myself.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-fd.d/client/myself.conf.in
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-fd.d/client/myself.conf.in
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-fd.d/messages/Standard.conf b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-fd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-fd.d/messages/Standard.conf
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-fd.d/messages/Standard.conf
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-sd.d/device/FileStorage.conf b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-sd.d/device/FileStorage.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-sd.d/device/FileStorage.conf
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-sd.d/device/FileStorage.conf
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-sd.d/messages/Standard.conf b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-sd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-sd.d/messages/Standard.conf
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-sd.d/messages/Standard.conf
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bconsole.conf.in b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bconsole.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bconsole.conf.in
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bconsole.conf.in
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/mysqldefaults.in b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/mysqldefaults.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/mysqldefaults.in
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/mysqldefaults.in
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/testrunner b/systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/testrunner
similarity index 100%
rename from systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/testrunner
rename to systemtests/tests/py3plug-fd-contrib-bareos_tasks_mysql/testrunner
diff --git a/systemtests/tests/py3plug-fd-ldap/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in b/systemtests/tests/py3plug-fd-ldap/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
new file mode 100644
index 00000000000..c7cdc433fe1
--- /dev/null
+++ b/systemtests/tests/py3plug-fd-ldap/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
@@ -0,0 +1,11 @@
+FileSet {
+  Name = "Catalog"
+  Description = "Backup the catalog dump and Bareos configuration files."
+  Include {
+    Options {
+      signature = MD5
+    }
+    File = "@working_dir@/@db_name@.sql" # database dump
+    File = "@confdir@"                   # configuration
+  }
+}
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/tray-monitor.d/client/FileDaemon-local.conf.in b/systemtests/tests/py3plug-fd-ldap/etc/bareos/tray-monitor.d/client/FileDaemon-local.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/tray-monitor.d/client/FileDaemon-local.conf.in
rename to systemtests/tests/py3plug-fd-ldap/etc/bareos/tray-monitor.d/client/FileDaemon-local.conf.in
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/tray-monitor.d/director/Director-local.conf b/systemtests/tests/py3plug-fd-ldap/etc/bareos/tray-monitor.d/director/Director-local.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/tray-monitor.d/director/Director-local.conf
rename to systemtests/tests/py3plug-fd-ldap/etc/bareos/tray-monitor.d/director/Director-local.conf
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/tray-monitor.d/storage/StorageDaemon-local.conf.in b/systemtests/tests/py3plug-fd-ldap/etc/bareos/tray-monitor.d/storage/StorageDaemon-local.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/tray-monitor.d/storage/StorageDaemon-local.conf.in
rename to systemtests/tests/py3plug-fd-ldap/etc/bareos/tray-monitor.d/storage/StorageDaemon-local.conf.in
diff --git a/systemtests/tests/py3plug-fd-libcloud b/systemtests/tests/py3plug-fd-libcloud
deleted file mode 120000
index b0f980e182e..00000000000
--- a/systemtests/tests/py3plug-fd-libcloud
+++ /dev/null
@@ -1 +0,0 @@
-py2plug-fd-libcloud
\ No newline at end of file
diff --git a/systemtests/tests/py2plug-fd-libcloud/CMakeLists.txt b/systemtests/tests/py3plug-fd-libcloud/CMakeLists.txt
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/CMakeLists.txt
rename to systemtests/tests/py3plug-fd-libcloud/CMakeLists.txt
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/fileset/PluginTest.conf.in b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/fileset/PluginTest.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/fileset/PluginTest.conf.in
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/fileset/PluginTest.conf.in
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/messages/Daemon.conf.in b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/messages/Standard.conf.in b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/messages/Standard.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/messages/Standard.conf.in
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/messages/Standard.conf.in
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/pool/Differential.conf b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/pool/Differential.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/pool/Differential.conf
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/pool/Differential.conf
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/pool/Full.conf b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/pool/Full.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/pool/Full.conf
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/pool/Full.conf
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/pool/Incremental.conf b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/pool/Incremental.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/pool/Incremental.conf
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/pool/Incremental.conf
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/pool/Scratch.conf b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/pool/Scratch.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/pool/Scratch.conf
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/pool/Scratch.conf
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/profile/operator.conf b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/profile/operator.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/profile/operator.conf
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/profile/operator.conf
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/storage/File.conf.in b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/storage/File.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-dir.d/storage/File.conf.in
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-dir.d/storage/File.conf.in
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-fd.d/client/myself.conf.in b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-fd.d/client/myself.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-fd.d/client/myself.conf.in
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-fd.d/client/myself.conf.in
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-fd.d/messages/Standard.conf b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-fd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-fd.d/messages/Standard.conf
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-fd.d/messages/Standard.conf
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-sd.d/device/FileStorage.conf.in b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-sd.d/device/FileStorage.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-sd.d/device/FileStorage.conf.in
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-sd.d/device/FileStorage.conf.in
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-sd.d/messages/Standard.conf b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-sd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-sd.d/messages/Standard.conf
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-sd.d/messages/Standard.conf
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bconsole.conf.in b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/bconsole.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/bareos/bconsole.conf.in
rename to systemtests/tests/py3plug-fd-libcloud/etc/bareos/bconsole.conf.in
diff --git a/systemtests/tests/py3plug-fd-libcloud/etc/bareos/tray-monitor.d/client/FileDaemon-local.conf.in b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/tray-monitor.d/client/FileDaemon-local.conf.in
new file mode 100644
index 00000000000..dd00dd9f103
--- /dev/null
+++ b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/tray-monitor.d/client/FileDaemon-local.conf.in
@@ -0,0 +1,5 @@
+Client {
+  Name = @basename@-fd
+  Address = localhost
+  Password = "@mon_fd_password@"          # password for FileDaemon
+}
diff --git a/systemtests/tests/py3plug-fd-libcloud/etc/bareos/tray-monitor.d/director/Director-local.conf b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/tray-monitor.d/director/Director-local.conf
new file mode 100644
index 00000000000..55dae492250
--- /dev/null
+++ b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/tray-monitor.d/director/Director-local.conf
@@ -0,0 +1,4 @@
+Director {
+  Name = bareos-dir
+  Address = localhost
+}
diff --git a/systemtests/tests/py3plug-fd-libcloud/etc/bareos/tray-monitor.d/storage/StorageDaemon-local.conf.in b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/tray-monitor.d/storage/StorageDaemon-local.conf.in
new file mode 100644
index 00000000000..6538f4fd248
--- /dev/null
+++ b/systemtests/tests/py3plug-fd-libcloud/etc/bareos/tray-monitor.d/storage/StorageDaemon-local.conf.in
@@ -0,0 +1,5 @@
+Storage {
+  Name = bareos-sd
+  Address = localhost
+  Password = "@mon_sd_password@"          # password for StorageDaemon
+}
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/libcloud_config.ini.in b/systemtests/tests/py3plug-fd-libcloud/etc/libcloud_config.ini.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/libcloud_config.ini.in
rename to systemtests/tests/py3plug-fd-libcloud/etc/libcloud_config.ini.in
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/s3cfg.in b/systemtests/tests/py3plug-fd-libcloud/etc/s3cfg.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/etc/s3cfg.in
rename to systemtests/tests/py3plug-fd-libcloud/etc/s3cfg.in
diff --git a/systemtests/tests/py2plug-fd-libcloud/testrunner b/systemtests/tests/py3plug-fd-libcloud/testrunner
similarity index 100%
rename from systemtests/tests/py2plug-fd-libcloud/testrunner
rename to systemtests/tests/py3plug-fd-libcloud/testrunner
diff --git a/systemtests/tests/py3plug-fd-local-fileset-basic b/systemtests/tests/py3plug-fd-local-fileset-basic
deleted file mode 120000
index 5bdd8cc870b..00000000000
--- a/systemtests/tests/py3plug-fd-local-fileset-basic
+++ /dev/null
@@ -1 +0,0 @@
-py2plug-fd-local-fileset-basic
\ No newline at end of file
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/CMakeLists.txt b/systemtests/tests/py3plug-fd-local-fileset-basic/CMakeLists.txt
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/CMakeLists.txt
rename to systemtests/tests/py3plug-fd-local-fileset-basic/CMakeLists.txt
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/fileset/PluginTest.conf.in b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/fileset/PluginTest.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/fileset/PluginTest.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/fileset/PluginTest.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/fileset/PluginTest_do_io_in_core.conf.in b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/fileset/PluginTest_do_io_in_core.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/fileset/PluginTest_do_io_in_core.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/fileset/PluginTest_do_io_in_core.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/messages/Daemon.conf.in b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/messages/Standard.conf.in b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/messages/Standard.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/messages/Standard.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/messages/Standard.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/pool/Differential.conf b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/pool/Differential.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/pool/Differential.conf
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/pool/Differential.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/pool/Full.conf b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/pool/Full.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/pool/Full.conf
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/pool/Full.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/pool/Incremental.conf b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/pool/Incremental.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/pool/Incremental.conf
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/pool/Incremental.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/pool/Scratch.conf b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/pool/Scratch.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/pool/Scratch.conf
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/pool/Scratch.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/profile/operator.conf b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/profile/operator.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/profile/operator.conf
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/profile/operator.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/storage/File.conf.in b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/storage/File.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/storage/File.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/storage/File.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-fd.d/client/myself.conf.in b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-fd.d/client/myself.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-fd.d/client/myself.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-fd.d/client/myself.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-fd.d/messages/Standard.conf b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-fd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-fd.d/messages/Standard.conf
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-fd.d/messages/Standard.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/device/FileStorage.conf b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/device/FileStorage.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/device/FileStorage.conf
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/device/FileStorage.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/messages/Standard.conf b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/messages/Standard.conf
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/messages/Standard.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bconsole.conf.in b/systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bconsole.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bconsole.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-basic/etc/bareos/bconsole.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/python-modules/BareosFdPluginLocalFilesetAclXattr.py b/systemtests/tests/py3plug-fd-local-fileset-basic/python-modules/BareosFdPluginLocalFilesetAclXattr.py
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/python-modules/BareosFdPluginLocalFilesetAclXattr.py
rename to systemtests/tests/py3plug-fd-local-fileset-basic/python-modules/BareosFdPluginLocalFilesetAclXattr.py
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/python-modules/bareos-fd-local-fileset-acl-xattr.py b/systemtests/tests/py3plug-fd-local-fileset-basic/python-modules/bareos-fd-local-fileset-acl-xattr.py
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/python-modules/bareos-fd-local-fileset-acl-xattr.py
rename to systemtests/tests/py3plug-fd-local-fileset-basic/python-modules/bareos-fd-local-fileset-acl-xattr.py
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/test-cleanup b/systemtests/tests/py3plug-fd-local-fileset-basic/test-cleanup
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/test-cleanup
rename to systemtests/tests/py3plug-fd-local-fileset-basic/test-cleanup
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/test-setup b/systemtests/tests/py3plug-fd-local-fileset-basic/test-setup
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/test-setup
rename to systemtests/tests/py3plug-fd-local-fileset-basic/test-setup
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/testrunner-basic b/systemtests/tests/py3plug-fd-local-fileset-basic/testrunner-basic
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/testrunner-basic
rename to systemtests/tests/py3plug-fd-local-fileset-basic/testrunner-basic
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/testrunner-io_in_core b/systemtests/tests/py3plug-fd-local-fileset-basic/testrunner-io_in_core
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-basic/testrunner-io_in_core
rename to systemtests/tests/py3plug-fd-local-fileset-basic/testrunner-io_in_core
diff --git a/systemtests/tests/py3plug-fd-local-fileset-restoreobject b/systemtests/tests/py3plug-fd-local-fileset-restoreobject
deleted file mode 120000
index befa7eebc3d..00000000000
--- a/systemtests/tests/py3plug-fd-local-fileset-restoreobject
+++ /dev/null
@@ -1 +0,0 @@
-py2plug-fd-local-fileset-restoreobject
\ No newline at end of file
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/CMakeLists.txt b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/CMakeLists.txt
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/CMakeLists.txt
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/CMakeLists.txt
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/fileset/PluginTest.conf.in b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/fileset/PluginTest.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/fileset/PluginTest.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/fileset/PluginTest.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/messages/Daemon.conf.in b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/messages/Standard.conf.in b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/messages/Standard.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/messages/Standard.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/messages/Standard.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/pool/Differential.conf b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/pool/Differential.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/pool/Differential.conf
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/pool/Differential.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/pool/Full.conf b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/pool/Full.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/pool/Full.conf
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/pool/Full.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/pool/Incremental.conf b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/pool/Incremental.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/pool/Incremental.conf
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/pool/Incremental.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/pool/Scratch.conf b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/pool/Scratch.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/pool/Scratch.conf
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/pool/Scratch.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/profile/operator.conf b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/profile/operator.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/profile/operator.conf
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/profile/operator.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/storage/File.conf.in b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/storage/File.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/storage/File.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-dir.d/storage/File.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-fd.d/client/myself.conf.in b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-fd.d/client/myself.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-fd.d/client/myself.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-fd.d/client/myself.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-fd.d/messages/Standard.conf b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-fd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-fd.d/messages/Standard.conf
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-fd.d/messages/Standard.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-sd.d/device/FileStorage.conf b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-sd.d/device/FileStorage.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-sd.d/device/FileStorage.conf
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-sd.d/device/FileStorage.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-sd.d/messages/Standard.conf b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-sd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-sd.d/messages/Standard.conf
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-sd.d/messages/Standard.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bconsole.conf.in b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bconsole.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bconsole.conf.in
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/etc/bareos/bconsole.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/python-modules/BareosFdPluginLocalFilesetWithRestoreObjects.py b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/python-modules/BareosFdPluginLocalFilesetWithRestoreObjects.py
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/python-modules/BareosFdPluginLocalFilesetWithRestoreObjects.py
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/python-modules/BareosFdPluginLocalFilesetWithRestoreObjects.py
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/python-modules/bareos-fd-local-fileset-with-restoreobjects.py b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/python-modules/bareos-fd-local-fileset-with-restoreobjects.py
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/python-modules/bareos-fd-local-fileset-with-restoreobjects.py
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/python-modules/bareos-fd-local-fileset-with-restoreobjects.py
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/testrunner b/systemtests/tests/py3plug-fd-local-fileset-restoreobject/testrunner
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset-restoreobject/testrunner
rename to systemtests/tests/py3plug-fd-local-fileset-restoreobject/testrunner
diff --git a/systemtests/tests/py3plug-fd-mariabackup b/systemtests/tests/py3plug-fd-mariabackup
deleted file mode 120000
index c80900b5a43..00000000000
--- a/systemtests/tests/py3plug-fd-mariabackup
+++ /dev/null
@@ -1 +0,0 @@
-py2plug-fd-mariabackup
\ No newline at end of file
diff --git a/systemtests/tests/py2plug-fd-mariabackup/CMakeLists.txt b/systemtests/tests/py3plug-fd-mariabackup/CMakeLists.txt
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/CMakeLists.txt
rename to systemtests/tests/py3plug-fd-mariabackup/CMakeLists.txt
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/fileset/MariabackupTest.conf.in b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/fileset/MariabackupTest.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/fileset/MariabackupTest.conf.in
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/fileset/MariabackupTest.conf.in
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/messages/Daemon.conf.in b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/messages/Standard.conf.in b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/messages/Standard.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/messages/Standard.conf.in
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/messages/Standard.conf.in
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/pool/Differential.conf b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/pool/Differential.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/pool/Differential.conf
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/pool/Differential.conf
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/pool/Full.conf b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/pool/Full.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/pool/Full.conf
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/pool/Full.conf
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/pool/Incremental.conf b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/pool/Incremental.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/pool/Incremental.conf
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/pool/Incremental.conf
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/pool/Scratch.conf b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/pool/Scratch.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/pool/Scratch.conf
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/pool/Scratch.conf
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/profile/operator.conf b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/profile/operator.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/profile/operator.conf
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/profile/operator.conf
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/storage/File.conf.in b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/storage/File.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-dir.d/storage/File.conf.in
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-dir.d/storage/File.conf.in
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-fd.d/client/myself.conf.in b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-fd.d/client/myself.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-fd.d/client/myself.conf.in
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-fd.d/client/myself.conf.in
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-fd.d/messages/Standard.conf b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-fd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-fd.d/messages/Standard.conf
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-fd.d/messages/Standard.conf
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-sd.d/device/FileStorage.conf b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-sd.d/device/FileStorage.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-sd.d/device/FileStorage.conf
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-sd.d/device/FileStorage.conf
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-sd.d/messages/Standard.conf b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-sd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-sd.d/messages/Standard.conf
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-sd.d/messages/Standard.conf
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bconsole.conf.in b/systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bconsole.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bconsole.conf.in
rename to systemtests/tests/py3plug-fd-mariabackup/etc/bareos/bconsole.conf.in
diff --git a/systemtests/tests/py2plug-fd-mariabackup/mysqldefaults.in b/systemtests/tests/py3plug-fd-mariabackup/mysqldefaults.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/mysqldefaults.in
rename to systemtests/tests/py3plug-fd-mariabackup/mysqldefaults.in
diff --git a/systemtests/tests/py2plug-fd-mariabackup/testrunner b/systemtests/tests/py3plug-fd-mariabackup/testrunner
similarity index 100%
rename from systemtests/tests/py2plug-fd-mariabackup/testrunner
rename to systemtests/tests/py3plug-fd-mariabackup/testrunner
diff --git a/systemtests/tests/py3plug-fd-ovirt b/systemtests/tests/py3plug-fd-ovirt
deleted file mode 120000
index 767308e2f8b..00000000000
--- a/systemtests/tests/py3plug-fd-ovirt
+++ /dev/null
@@ -1 +0,0 @@
-py2plug-fd-ovirt
\ No newline at end of file
diff --git a/systemtests/tests/py2plug-fd-ovirt/CMakeLists.txt b/systemtests/tests/py3plug-fd-ovirt/CMakeLists.txt
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/CMakeLists.txt
rename to systemtests/tests/py3plug-fd-ovirt/CMakeLists.txt
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/fileset/OvirtTest.conf.in b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/fileset/OvirtTest.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/fileset/OvirtTest.conf.in
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/fileset/OvirtTest.conf.in
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/messages/Daemon.conf.in b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/messages/Standard.conf.in b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/messages/Standard.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/messages/Standard.conf.in
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/messages/Standard.conf.in
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/pool/Differential.conf b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/pool/Differential.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/pool/Differential.conf
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/pool/Differential.conf
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/pool/Full.conf b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/pool/Full.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/pool/Full.conf
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/pool/Full.conf
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/pool/Incremental.conf b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/pool/Incremental.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/pool/Incremental.conf
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/pool/Incremental.conf
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/pool/Scratch.conf b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/pool/Scratch.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/pool/Scratch.conf
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/pool/Scratch.conf
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/profile/operator.conf b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/profile/operator.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/profile/operator.conf
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/profile/operator.conf
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/storage/File.conf.in b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/storage/File.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-dir.d/storage/File.conf.in
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-dir.d/storage/File.conf.in
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-fd.d/client/myself.conf.in b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-fd.d/client/myself.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-fd.d/client/myself.conf.in
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-fd.d/client/myself.conf.in
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-fd.d/messages/Standard.conf b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-fd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-fd.d/messages/Standard.conf
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-fd.d/messages/Standard.conf
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-sd.d/device/FileStorage.conf b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-sd.d/device/FileStorage.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-sd.d/device/FileStorage.conf
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-sd.d/device/FileStorage.conf
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-sd.d/messages/Standard.conf b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-sd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-sd.d/messages/Standard.conf
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-sd.d/messages/Standard.conf
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bconsole.conf.in b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/bconsole.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/bconsole.conf.in
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/bconsole.conf.in
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/ovirt-plugin.ini.in b/systemtests/tests/py3plug-fd-ovirt/etc/bareos/ovirt-plugin.ini.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/etc/bareos/ovirt-plugin.ini.in
rename to systemtests/tests/py3plug-fd-ovirt/etc/bareos/ovirt-plugin.ini.in
diff --git a/systemtests/tests/py2plug-fd-ovirt/testrunner.in b/systemtests/tests/py3plug-fd-ovirt/testrunner.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-ovirt/testrunner.in
rename to systemtests/tests/py3plug-fd-ovirt/testrunner.in
diff --git a/systemtests/tests/py3plug-fd-percona-xtrabackup b/systemtests/tests/py3plug-fd-percona-xtrabackup
deleted file mode 120000
index 4bd2f2740a4..00000000000
--- a/systemtests/tests/py3plug-fd-percona-xtrabackup
+++ /dev/null
@@ -1 +0,0 @@
-py2plug-fd-percona-xtrabackup
\ No newline at end of file
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/CMakeLists.txt b/systemtests/tests/py3plug-fd-percona-xtrabackup/CMakeLists.txt
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/CMakeLists.txt
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/CMakeLists.txt
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/fileset/PerconaXtraBackupTest.conf.in b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/fileset/PerconaXtraBackupTest.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/fileset/PerconaXtraBackupTest.conf.in
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/fileset/PerconaXtraBackupTest.conf.in
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/messages/Daemon.conf.in b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/messages/Standard.conf.in b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/messages/Standard.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/messages/Standard.conf.in
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/messages/Standard.conf.in
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/pool/Differential.conf b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/pool/Differential.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/pool/Differential.conf
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/pool/Differential.conf
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/pool/Full.conf b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/pool/Full.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/pool/Full.conf
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/pool/Full.conf
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/pool/Incremental.conf b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/pool/Incremental.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/pool/Incremental.conf
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/pool/Incremental.conf
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/pool/Scratch.conf b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/pool/Scratch.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/pool/Scratch.conf
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/pool/Scratch.conf
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/profile/operator.conf b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/profile/operator.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/profile/operator.conf
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/profile/operator.conf
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/storage/File.conf.in b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/storage/File.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/storage/File.conf.in
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-dir.d/storage/File.conf.in
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-fd.d/client/myself.conf.in b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-fd.d/client/myself.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-fd.d/client/myself.conf.in
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-fd.d/client/myself.conf.in
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-fd.d/messages/Standard.conf b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-fd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-fd.d/messages/Standard.conf
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-fd.d/messages/Standard.conf
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-sd.d/device/FileStorage.conf b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-sd.d/device/FileStorage.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-sd.d/device/FileStorage.conf
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-sd.d/device/FileStorage.conf
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-sd.d/messages/Standard.conf b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-sd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-sd.d/messages/Standard.conf
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-sd.d/messages/Standard.conf
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bconsole.conf.in b/systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bconsole.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bconsole.conf.in
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/etc/bareos/bconsole.conf.in
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/mysqldefaults.in b/systemtests/tests/py3plug-fd-percona-xtrabackup/mysqldefaults.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/mysqldefaults.in
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/mysqldefaults.in
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/testrunner b/systemtests/tests/py3plug-fd-percona-xtrabackup/testrunner
similarity index 100%
rename from systemtests/tests/py2plug-fd-percona-xtrabackup/testrunner
rename to systemtests/tests/py3plug-fd-percona-xtrabackup/testrunner
diff --git a/systemtests/tests/py3plug-fd-vmware b/systemtests/tests/py3plug-fd-vmware
deleted file mode 120000
index a43d01ee18b..00000000000
--- a/systemtests/tests/py3plug-fd-vmware
+++ /dev/null
@@ -1 +0,0 @@
-py2plug-fd-vmware
\ No newline at end of file
diff --git a/systemtests/tests/py2plug-fd-vmware/CMakeLists.txt b/systemtests/tests/py3plug-fd-vmware/CMakeLists.txt
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/CMakeLists.txt
rename to systemtests/tests/py3plug-fd-vmware/CMakeLists.txt
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/VMwareTest.ini.in b/systemtests/tests/py3plug-fd-vmware/etc/bareos/VMwareTest.ini.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/VMwareTest.ini.in
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/VMwareTest.ini.in
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/fileset/VMwareTest.conf.in b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/fileset/VMwareTest.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/fileset/VMwareTest.conf.in
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/fileset/VMwareTest.conf.in
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/messages/Daemon.conf.in b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/messages/Standard.conf.in b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/messages/Standard.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/messages/Standard.conf.in
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/messages/Standard.conf.in
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/pool/Differential.conf b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/pool/Differential.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/pool/Differential.conf
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/pool/Differential.conf
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/pool/Full.conf b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/pool/Full.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/pool/Full.conf
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/pool/Full.conf
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/pool/Incremental.conf b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/pool/Incremental.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/pool/Incremental.conf
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/pool/Incremental.conf
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/pool/Scratch.conf b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/pool/Scratch.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/pool/Scratch.conf
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/pool/Scratch.conf
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/profile/operator.conf b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/profile/operator.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/profile/operator.conf
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/profile/operator.conf
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/storage/File.conf.in b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/storage/File.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-dir.d/storage/File.conf.in
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-dir.d/storage/File.conf.in
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-fd.d/client/myself.conf.in b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-fd.d/client/myself.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-fd.d/client/myself.conf.in
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-fd.d/client/myself.conf.in
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-fd.d/messages/Standard.conf b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-fd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-fd.d/messages/Standard.conf
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-fd.d/messages/Standard.conf
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-sd.d/device/FileStorage.conf b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-sd.d/device/FileStorage.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-sd.d/device/FileStorage.conf
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-sd.d/device/FileStorage.conf
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-sd.d/messages/Standard.conf b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-sd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-sd.d/messages/Standard.conf
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-sd.d/messages/Standard.conf
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bconsole.conf.in b/systemtests/tests/py3plug-fd-vmware/etc/bareos/bconsole.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/etc/bareos/bconsole.conf.in
rename to systemtests/tests/py3plug-fd-vmware/etc/bareos/bconsole.conf.in
diff --git a/systemtests/tests/py2plug-fd-vmware/python-modules/BareosFdPluginVMware.py b/systemtests/tests/py3plug-fd-vmware/python-modules/BareosFdPluginVMware.py
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/python-modules/BareosFdPluginVMware.py
rename to systemtests/tests/py3plug-fd-vmware/python-modules/BareosFdPluginVMware.py
diff --git a/systemtests/tests/py2plug-fd-vmware/python-modules/bareos-fd-vmware.py b/systemtests/tests/py3plug-fd-vmware/python-modules/bareos-fd-vmware.py
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/python-modules/bareos-fd-vmware.py
rename to systemtests/tests/py3plug-fd-vmware/python-modules/bareos-fd-vmware.py
diff --git a/systemtests/tests/py2plug-fd-vmware/reset_cbt.sh.in b/systemtests/tests/py3plug-fd-vmware/reset_cbt.sh.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/reset_cbt.sh.in
rename to systemtests/tests/py3plug-fd-vmware/reset_cbt.sh.in
diff --git a/systemtests/tests/py2plug-fd-vmware/testrunner b/systemtests/tests/py3plug-fd-vmware/testrunner
similarity index 100%
rename from systemtests/tests/py2plug-fd-vmware/testrunner
rename to systemtests/tests/py3plug-fd-vmware/testrunner
diff --git a/systemtests/tests/py3plug-sd b/systemtests/tests/py3plug-sd
deleted file mode 120000
index f2095de8722..00000000000
--- a/systemtests/tests/py3plug-sd
+++ /dev/null
@@ -1 +0,0 @@
-py2plug-sd
\ No newline at end of file
diff --git a/systemtests/tests/py2plug-sd/CMakeLists.txt b/systemtests/tests/py3plug-sd/CMakeLists.txt
similarity index 100%
rename from systemtests/tests/py2plug-sd/CMakeLists.txt
rename to systemtests/tests/py3plug-sd/CMakeLists.txt
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in b/systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
rename to systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in b/systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
rename to systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in b/systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
rename to systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in b/systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
rename to systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in b/systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
rename to systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in b/systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in
rename to systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in b/systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
rename to systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/messages/Daemon.conf.in b/systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
rename to systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/messages/Standard.conf.in b/systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/messages/Standard.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/messages/Standard.conf.in
rename to systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/messages/Standard.conf.in
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/pool/Differential.conf b/systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/pool/Differential.conf
similarity index 100%
rename from systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/pool/Differential.conf
rename to systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/pool/Differential.conf
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/pool/Full.conf b/systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/pool/Full.conf
similarity index 100%
rename from systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/pool/Full.conf
rename to systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/pool/Full.conf
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/pool/Incremental.conf b/systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/pool/Incremental.conf
similarity index 100%
rename from systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/pool/Incremental.conf
rename to systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/pool/Incremental.conf
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/pool/Scratch.conf b/systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/pool/Scratch.conf
similarity index 100%
rename from systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/pool/Scratch.conf
rename to systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/pool/Scratch.conf
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/profile/operator.conf b/systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/profile/operator.conf
similarity index 100%
rename from systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/profile/operator.conf
rename to systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/profile/operator.conf
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/storage/File.conf.in b/systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/storage/File.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-sd/etc/bareos/bareos-dir.d/storage/File.conf.in
rename to systemtests/tests/py3plug-sd/etc/bareos/bareos-dir.d/storage/File.conf.in
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bareos-fd.d/client/myself.conf.in b/systemtests/tests/py3plug-sd/etc/bareos/bareos-fd.d/client/myself.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-sd/etc/bareos/bareos-fd.d/client/myself.conf.in
rename to systemtests/tests/py3plug-sd/etc/bareos/bareos-fd.d/client/myself.conf.in
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-sd/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-sd/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-sd/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bareos-fd.d/messages/Standard.conf b/systemtests/tests/py3plug-sd/etc/bareos/bareos-fd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/py2plug-sd/etc/bareos/bareos-fd.d/messages/Standard.conf
rename to systemtests/tests/py3plug-sd/etc/bareos/bareos-fd.d/messages/Standard.conf
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bareos-sd.d/device/FileStorage.conf b/systemtests/tests/py3plug-sd/etc/bareos/bareos-sd.d/device/FileStorage.conf
similarity index 100%
rename from systemtests/tests/py2plug-sd/etc/bareos/bareos-sd.d/device/FileStorage.conf
rename to systemtests/tests/py3plug-sd/etc/bareos/bareos-sd.d/device/FileStorage.conf
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in b/systemtests/tests/py3plug-sd/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-sd/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
rename to systemtests/tests/py3plug-sd/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bareos-sd.d/messages/Standard.conf b/systemtests/tests/py3plug-sd/etc/bareos/bareos-sd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/py2plug-sd/etc/bareos/bareos-sd.d/messages/Standard.conf
rename to systemtests/tests/py3plug-sd/etc/bareos/bareos-sd.d/messages/Standard.conf
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/py3plug-sd/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-sd/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
rename to systemtests/tests/py3plug-sd/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bconsole.conf.in b/systemtests/tests/py3plug-sd/etc/bareos/bconsole.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-sd/etc/bareos/bconsole.conf.in
rename to systemtests/tests/py3plug-sd/etc/bareos/bconsole.conf.in
diff --git a/systemtests/tests/py2plug-sd/python-modules/BareosSdTest.py b/systemtests/tests/py3plug-sd/python-modules/BareosSdTest.py
similarity index 100%
rename from systemtests/tests/py2plug-sd/python-modules/BareosSdTest.py
rename to systemtests/tests/py3plug-sd/python-modules/BareosSdTest.py
diff --git a/systemtests/tests/py2plug-sd/python-modules/bareos-sd-test.py b/systemtests/tests/py3plug-sd/python-modules/bareos-sd-test.py
similarity index 100%
rename from systemtests/tests/py2plug-sd/python-modules/bareos-sd-test.py
rename to systemtests/tests/py3plug-sd/python-modules/bareos-sd-test.py
diff --git a/systemtests/tests/py2plug-sd/testrunner b/systemtests/tests/py3plug-sd/testrunner
similarity index 100%
rename from systemtests/tests/py2plug-sd/testrunner
rename to systemtests/tests/py3plug-sd/testrunner