diff --git a/tests/features/CucumberTests.cmake b/tests/features/CucumberTests.cmake
--- a/tests/features/CucumberTests.cmake
+++ b/tests/features/CucumberTests.cmake
@@ -6,7 +6,7 @@
 
         # cucumber with akonadi fake rules
         configure_file(cucumber-run.sh.in ${_testsuite}/cucumber-run.sh)
-        set(cucumber-run-cmd sh ${CMAKE_CURRENT_BINARY_DIR}/${_testsuite}/cucumber-run.sh ${CMAKE_CURRENT_SOURCE_DIR}/testenv/kdehome/testdata.xml)
+        set(cucumber-run-cmd sh ${CMAKE_CURRENT_BINARY_DIR}/${_testsuite}/cucumber-run.sh ${CMAKE_CURRENT_SOURCE_DIR}/testenv/data/testdata.xml)
 
         add_custom_target(cucumber-run-${_testsuite}
                           COMMAND ${cucumber-run-cmd}
diff --git a/tests/features/testenv/config.xml b/tests/features/testenv/config.xml
--- a/tests/features/testenv/config.xml
+++ b/tests/features/testenv/config.xml
@@ -1,7 +1,6 @@
 <config>
-  <kdehome>kdehome</kdehome>
   <confighome>config</confighome>
   <datahome>data</datahome>
   <agent synchronize="true">akonadi_knut_resource</agent>
   <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
-</config>
\ No newline at end of file
+</config>
diff --git a/tests/features/testenv/kdehome/share/config/akonadi-firstrunrc b/tests/features/testenv/config/akonadi-firstrunrc
rename from tests/features/testenv/kdehome/share/config/akonadi-firstrunrc
rename to tests/features/testenv/config/akonadi-firstrunrc
diff --git a/tests/features/testenv/config/akonadi_knut_resource_0rc b/tests/features/testenv/config/akonadi_knut_resource_0rc
new file mode 100644
--- /dev/null
+++ b/tests/features/testenv/config/akonadi_knut_resource_0rc
@@ -0,0 +1,2 @@
+[General]
+DataFile[$e]=$XDG_DATA_HOME/testdata.xml
diff --git a/tests/features/testenv/config/empty b/tests/features/testenv/config/empty
deleted file mode 100644
diff --git a/tests/features/testenv/data/empty b/tests/features/testenv/data/empty
deleted file mode 100644
diff --git a/tests/features/testenv/kdehome/testdata.xml b/tests/features/testenv/data/testdata.xml
rename from tests/features/testenv/kdehome/testdata.xml
rename to tests/features/testenv/data/testdata.xml
diff --git a/tests/features/testenv/kdehome/share/config/akonadi_knut_resource_0rc b/tests/features/testenv/kdehome/share/config/akonadi_knut_resource_0rc
deleted file mode 100644
--- a/tests/features/testenv/kdehome/share/config/akonadi_knut_resource_0rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[General]
-DataFile[$e]=$KDEHOME/testdata.xml
diff --git a/tests/features/testenv/kdehome/share/config/kdedrc b/tests/features/testenv/kdehome/share/config/kdedrc
deleted file mode 100644
--- a/tests/features/testenv/kdehome/share/config/kdedrc
+++ /dev/null
@@ -1,3 +0,0 @@
-[General]
-CheckSycoca=false
-CheckFileStamps=false
\ No newline at end of file
diff --git a/tests/units/akonadi/testenv/config.xml b/tests/units/akonadi/testenv/config.xml
--- a/tests/units/akonadi/testenv/config.xml
+++ b/tests/units/akonadi/testenv/config.xml
@@ -1,7 +1,6 @@
 <config>
-  <kdehome>kdehome</kdehome>
   <confighome>config</confighome>
   <datahome>data</datahome>
   <agent synchronize="true">akonadi_knut_resource</agent>
   <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
-</config>
\ No newline at end of file
+</config>
diff --git a/tests/units/akonadi/testenv/kdehome/share/config/akonadi-firstrunrc b/tests/units/akonadi/testenv/config/akonadi-firstrunrc
rename from tests/units/akonadi/testenv/kdehome/share/config/akonadi-firstrunrc
rename to tests/units/akonadi/testenv/config/akonadi-firstrunrc
diff --git a/tests/units/akonadi/testenv/config/akonadi_knut_resource_0rc b/tests/units/akonadi/testenv/config/akonadi_knut_resource_0rc
new file mode 100644
--- /dev/null
+++ b/tests/units/akonadi/testenv/config/akonadi_knut_resource_0rc
@@ -0,0 +1,2 @@
+[General]
+DataFile[$e]=$XDG_DATA_HOME/testdata.xml
diff --git a/tests/units/akonadi/testenv/config/empty b/tests/units/akonadi/testenv/config/empty
deleted file mode 100644
diff --git a/tests/units/akonadi/testenv/data/empty b/tests/units/akonadi/testenv/data/empty
deleted file mode 100644
diff --git a/tests/units/akonadi/testenv/kdehome/testdata.xml b/tests/units/akonadi/testenv/data/testdata.xml
rename from tests/units/akonadi/testenv/kdehome/testdata.xml
rename to tests/units/akonadi/testenv/data/testdata.xml
diff --git a/tests/units/akonadi/testenv/kdehome/share/config/akonadi_knut_resource_0rc b/tests/units/akonadi/testenv/kdehome/share/config/akonadi_knut_resource_0rc
deleted file mode 100644
--- a/tests/units/akonadi/testenv/kdehome/share/config/akonadi_knut_resource_0rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[General]
-DataFile[$e]=$KDEHOME/testdata.xml
diff --git a/tests/units/akonadi/testenv/kdehome/share/config/kdedrc b/tests/units/akonadi/testenv/kdehome/share/config/kdedrc
deleted file mode 100644
--- a/tests/units/akonadi/testenv/kdehome/share/config/kdedrc
+++ /dev/null
@@ -1,3 +0,0 @@
-[General]
-CheckSycoca=false
-CheckFileStamps=false
\ No newline at end of file
diff --git a/tests/units/migrator/testenv/config.xml b/tests/units/migrator/testenv/config.xml
--- a/tests/units/migrator/testenv/config.xml
+++ b/tests/units/migrator/testenv/config.xml
@@ -1,7 +1,6 @@
 <config>
-  <kdehome>kdehome</kdehome>
   <confighome>config</confighome>
   <datahome>data</datahome>
   <agent synchronize="true">akonadi_knut_resource</agent>
   <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
-</config>
\ No newline at end of file
+</config>
diff --git a/tests/units/migrator/testenv/kdehome/share/config/akonadi-firstrunrc b/tests/units/migrator/testenv/config/akonadi-firstrunrc
rename from tests/units/migrator/testenv/kdehome/share/config/akonadi-firstrunrc
rename to tests/units/migrator/testenv/config/akonadi-firstrunrc
diff --git a/tests/units/migrator/testenv/config/akonadi_knut_resource_0rc b/tests/units/migrator/testenv/config/akonadi_knut_resource_0rc
new file mode 100644
--- /dev/null
+++ b/tests/units/migrator/testenv/config/akonadi_knut_resource_0rc
@@ -0,0 +1,2 @@
+[General]
+DataFile[$e]=$XDG_DATA_HOME/testdata.xml
diff --git a/tests/units/migrator/testenv/config/empty b/tests/units/migrator/testenv/config/empty
deleted file mode 100644
diff --git a/tests/units/migrator/testenv/data/empty b/tests/units/migrator/testenv/data/empty
deleted file mode 100644
diff --git a/tests/units/migrator/testenv/kdehome/testdata.xml b/tests/units/migrator/testenv/data/testdata.xml
rename from tests/units/migrator/testenv/kdehome/testdata.xml
rename to tests/units/migrator/testenv/data/testdata.xml
diff --git a/tests/units/migrator/testenv/kdehome/share/config/akonadi_knut_resource_0rc b/tests/units/migrator/testenv/kdehome/share/config/akonadi_knut_resource_0rc
deleted file mode 100644
--- a/tests/units/migrator/testenv/kdehome/share/config/akonadi_knut_resource_0rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[General]
-DataFile[$e]=$KDEHOME/testdata.xml
diff --git a/tests/units/migrator/testenv/kdehome/share/config/kdedrc b/tests/units/migrator/testenv/kdehome/share/config/kdedrc
deleted file mode 100644
--- a/tests/units/migrator/testenv/kdehome/share/config/kdedrc
+++ /dev/null
@@ -1,3 +0,0 @@
-[General]
-CheckSycoca=false
-CheckFileStamps=false
\ No newline at end of file