diff --git a/autotests/unittestenv/config-postgresql-fs.xml b/autotests/unittestenv/config-postgresql-fs.xml
deleted file mode 100644
index 283f56f..0000000
--- a/autotests/unittestenv/config-postgresql-fs.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<config>
-  <confighome>xdgconfig-postgresql.fs</confighome>
-  <datahome>xdglocal</datahome>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
-  <envvar name="TESTRUNNER_DB_ENVIRONMENT">postgresql</envvar>
-  <envvar name="AKONADI_OVERRIDE_SEARCHPLUGIN">akonadi_test_searchplugin</envvar>
-</config>
diff --git a/autotests/unittestenv/config-sqlite-db.xml b/autotests/unittestenv/config-sqlite-db.xml
deleted file mode 100644
index 0a82ce4..0000000
--- a/autotests/unittestenv/config-sqlite-db.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<config>
-  <confighome>xdgconfig-sqlite.db</confighome>
-  <datahome>xdglocal</datahome>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
-  <envvar name="TESTRUNNER_DB_ENVIRONMENT">sqlite</envvar>
-  <envvar name="AKONADI_OVERRIDE_SEARCHPLUGIN">akonadi_test_searchplugin</envvar>
-</config>
diff --git a/autotests/unittestenv/config-mysql-fs.xml b/autotests/unittestenv/config.xml
similarity index 70%
rename from autotests/unittestenv/config-mysql-fs.xml
rename to autotests/unittestenv/config.xml
index 9d6791f..464422c 100644
--- a/autotests/unittestenv/config-mysql-fs.xml
+++ b/autotests/unittestenv/config.xml
@@ -1,8 +1,6 @@
 <config>
-  <confighome>xdgconfig-mysql.fs</confighome>
   <datahome>xdglocal</datahome>
   <agent synchronize="true">akonadi_knut_resource</agent>
   <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
-  <envvar name="TESTRUNNER_DB_ENVIRONMENT">mysql</envvar>
   <envvar name="AKONADI_OVERRIDE_SEARCHPLUGIN">akonadi_test_searchplugin</envvar>
 </config>
diff --git a/autotests/unittestenv/xdgconfig-mysql.fs/akonadi/akonadiserverrc b/autotests/unittestenv/xdgconfig-mysql.fs/akonadi/akonadiserverrc
deleted file mode 100644
index a7bb0c2..0000000
--- a/autotests/unittestenv/xdgconfig-mysql.fs/akonadi/akonadiserverrc
+++ /dev/null
@@ -1,6 +0,0 @@
-[%General]
-SizeThreshold=0
-ExternalPayload=true
-
-[Search]
-Manager=Dummy
diff --git a/autotests/unittestenv/xdgconfig-postgresql.fs/akonadi/akonadiserverrc b/autotests/unittestenv/xdgconfig-postgresql.fs/akonadi/akonadiserverrc
deleted file mode 100644
index 8333c73..0000000
--- a/autotests/unittestenv/xdgconfig-postgresql.fs/akonadi/akonadiserverrc
+++ /dev/null
@@ -1,10 +0,0 @@
-[%General]
-Driver=QPSQL
-SizeThreshold=0
-ExternalPayload=true
-
-[Search]
-Manager=Dummy
-
-[QPSQL]
-StartServer=true
diff --git a/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc b/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc
deleted file mode 100644
index 33e7f81..0000000
--- a/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc
+++ /dev/null
@@ -1,10 +0,0 @@
-[%General]
-# This is a slightly adjusted version of the QSQLITE driver from Qt
-# It is provided by akonadi itself
-Driver=QSQLITE3
-
-[Debug]
-Tracer=null
-
-[Search]
-Manager=Dummy
diff --git a/src/filter/autotests/CMakeLists.txt b/src/filter/autotests/CMakeLists.txt
index cd7755e..8b37e20 100644
--- a/src/filter/autotests/CMakeLists.txt
+++ b/src/filter/autotests/CMakeLists.txt
@@ -5,7 +5,7 @@ set(mailcommon_filter_test_LIBS Qt5::Test Qt5::Gui KF5::AkonadiCore KF5::Akonadi
 )
 
 macro(add_mailcommon_filter_test _name)
-    ecm_add_test(${ARGN} 
+    ecm_add_test(${ARGN}
         TEST_NAME ${_name}
         NAME_PREFIX "mailcommon-filter-"
         LINK_LIBRARIES ${mailcommon_filter_test_LIBS}
diff --git a/src/filter/autotests/unittestenv/config-mysql-fs.xml b/src/filter/autotests/unittestenv/config-mysql-fs.xml
deleted file mode 100644
index 7454278..0000000
--- a/src/filter/autotests/unittestenv/config-mysql-fs.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<config>
-  <confighome>xdgconfig-mysql.fs</confighome>
-  <datahome>xdglocal</datahome>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
-  <envvar name="TESTRUNNER_DB_ENVIRONMENT">mysql</envvar>
-  <envvar name="AKONADI_OVERRIDE_SEARCHPLUGIN">akonadi_test_searchplugin</envvar>
-</config>
diff --git a/src/filter/autotests/unittestenv/config-postgresql-fs.xml b/src/filter/autotests/unittestenv/config-postgresql-fs.xml
deleted file mode 100644
index 8b628b8..0000000
--- a/src/filter/autotests/unittestenv/config-postgresql-fs.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<config>
-  <confighome>xdgconfig-postgresql.fs</confighome>
-  <datahome>xdglocal</datahome>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
-  <envvar name="TESTRUNNER_DB_ENVIRONMENT">postgresql</envvar>
-  <envvar name="AKONADI_OVERRIDE_SEARCHPLUGIN">akonadi_test_searchplugin</envvar>
-</config>
diff --git a/src/filter/autotests/unittestenv/config-sqlite-db.xml b/src/filter/autotests/unittestenv/config-sqlite-db.xml
deleted file mode 100644
index 8f793b4..0000000
--- a/src/filter/autotests/unittestenv/config-sqlite-db.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<config>
-  <confighome>xdgconfig-sqlite.db</confighome>
-  <datahome>xdglocal</datahome>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
-  <envvar name="TESTRUNNER_DB_ENVIRONMENT">sqlite</envvar>
-  <envvar name="AKONADI_OVERRIDE_SEARCHPLUGIN">akonadi_test_searchplugin</envvar>
-</config>
diff --git a/src/filter/autotests/unittestenv/config.xml b/src/filter/autotests/unittestenv/config.xml
index 98c2dfa..2b5dd0b 100644
--- a/src/filter/autotests/unittestenv/config.xml
+++ b/src/filter/autotests/unittestenv/config.xml
@@ -1,5 +1,4 @@
 <config>
-  <confighome>xdgconfig</confighome>
   <datahome>xdglocal</datahome>
   <agent synchronize="true">akonadi_knut_resource</agent>
   <agent synchronize="true">akonadi_knut_resource</agent>
diff --git a/src/filter/autotests/unittestenv/xdgconfig-mysql.fs/akonadi/akonadiserverrc b/src/filter/autotests/unittestenv/xdgconfig-mysql.fs/akonadi/akonadiserverrc
deleted file mode 100644
index a7bb0c2..0000000
--- a/src/filter/autotests/unittestenv/xdgconfig-mysql.fs/akonadi/akonadiserverrc
+++ /dev/null
@@ -1,6 +0,0 @@
-[%General]
-SizeThreshold=0
-ExternalPayload=true
-
-[Search]
-Manager=Dummy
diff --git a/src/filter/autotests/unittestenv/xdgconfig-postgresql.fs/akonadi/akonadiserverrc b/src/filter/autotests/unittestenv/xdgconfig-postgresql.fs/akonadi/akonadiserverrc
deleted file mode 100644
index 8333c73..0000000
--- a/src/filter/autotests/unittestenv/xdgconfig-postgresql.fs/akonadi/akonadiserverrc
+++ /dev/null
@@ -1,10 +0,0 @@
-[%General]
-Driver=QPSQL
-SizeThreshold=0
-ExternalPayload=true
-
-[Search]
-Manager=Dummy
-
-[QPSQL]
-StartServer=true
diff --git a/src/filter/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc b/src/filter/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc
deleted file mode 100644
index 33e7f81..0000000
--- a/src/filter/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc
+++ /dev/null
@@ -1,10 +0,0 @@
-[%General]
-# This is a slightly adjusted version of the QSQLITE driver from Qt
-# It is provided by akonadi itself
-Driver=QSQLITE3
-
-[Debug]
-Tracer=null
-
-[Search]
-Manager=Dummy
diff --git a/src/filter/filterimporter/autotests/unittestenv/config-postgresql-fs.xml b/src/filter/filterimporter/autotests/unittestenv/config-postgresql-fs.xml
deleted file mode 100644
index 8b628b8..0000000
--- a/src/filter/filterimporter/autotests/unittestenv/config-postgresql-fs.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<config>
-  <confighome>xdgconfig-postgresql.fs</confighome>
-  <datahome>xdglocal</datahome>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
-  <envvar name="TESTRUNNER_DB_ENVIRONMENT">postgresql</envvar>
-  <envvar name="AKONADI_OVERRIDE_SEARCHPLUGIN">akonadi_test_searchplugin</envvar>
-</config>
diff --git a/src/filter/filterimporter/autotests/unittestenv/config-sqlite-db.xml b/src/filter/filterimporter/autotests/unittestenv/config-sqlite-db.xml
deleted file mode 100644
index 8f793b4..0000000
--- a/src/filter/filterimporter/autotests/unittestenv/config-sqlite-db.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<config>
-  <confighome>xdgconfig-sqlite.db</confighome>
-  <datahome>xdglocal</datahome>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
-  <envvar name="TESTRUNNER_DB_ENVIRONMENT">sqlite</envvar>
-  <envvar name="AKONADI_OVERRIDE_SEARCHPLUGIN">akonadi_test_searchplugin</envvar>
-</config>
diff --git a/src/filter/filterimporter/autotests/unittestenv/config-mysql-fs.xml b/src/filter/filterimporter/autotests/unittestenv/config.xml
similarity index 78%
rename from src/filter/filterimporter/autotests/unittestenv/config-mysql-fs.xml
rename to src/filter/filterimporter/autotests/unittestenv/config.xml
index 7454278..b2bb360 100644
--- a/src/filter/filterimporter/autotests/unittestenv/config-mysql-fs.xml
+++ b/src/filter/filterimporter/autotests/unittestenv/config.xml
@@ -1,10 +1,8 @@
 <config>
-  <confighome>xdgconfig-mysql.fs</confighome>
   <datahome>xdglocal</datahome>
   <agent synchronize="true">akonadi_knut_resource</agent>
   <agent synchronize="true">akonadi_knut_resource</agent>
   <agent synchronize="true">akonadi_knut_resource</agent>
   <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
-  <envvar name="TESTRUNNER_DB_ENVIRONMENT">mysql</envvar>
   <envvar name="AKONADI_OVERRIDE_SEARCHPLUGIN">akonadi_test_searchplugin</envvar>
 </config>
diff --git a/src/filter/filterimporter/autotests/unittestenv/xdgconfig-mysql.fs/akonadi/akonadiserverrc b/src/filter/filterimporter/autotests/unittestenv/xdgconfig-mysql.fs/akonadi/akonadiserverrc
deleted file mode 100644
index a7bb0c2..0000000
--- a/src/filter/filterimporter/autotests/unittestenv/xdgconfig-mysql.fs/akonadi/akonadiserverrc
+++ /dev/null
@@ -1,6 +0,0 @@
-[%General]
-SizeThreshold=0
-ExternalPayload=true
-
-[Search]
-Manager=Dummy
diff --git a/src/filter/filterimporter/autotests/unittestenv/xdgconfig-postgresql.fs/akonadi/akonadiserverrc b/src/filter/filterimporter/autotests/unittestenv/xdgconfig-postgresql.fs/akonadi/akonadiserverrc
deleted file mode 100644
index 8333c73..0000000
--- a/src/filter/filterimporter/autotests/unittestenv/xdgconfig-postgresql.fs/akonadi/akonadiserverrc
+++ /dev/null
@@ -1,10 +0,0 @@
-[%General]
-Driver=QPSQL
-SizeThreshold=0
-ExternalPayload=true
-
-[Search]
-Manager=Dummy
-
-[QPSQL]
-StartServer=true
diff --git a/src/filter/filterimporter/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc b/src/filter/filterimporter/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc
deleted file mode 100644
index 33e7f81..0000000
--- a/src/filter/filterimporter/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc
+++ /dev/null
@@ -1,10 +0,0 @@
-[%General]
-# This is a slightly adjusted version of the QSQLITE driver from Qt
-# It is provided by akonadi itself
-Driver=QSQLITE3
-
-[Debug]
-Tracer=null
-
-[Search]
-Manager=Dummy