1 files changed, 20 insertions, 17 deletions
diff --git a/src/unittests/utils/xmlutils.cc b/src/unittests/utils/xmlutils.cc
index e665cb6e5..23df65a10 100644
--- a/src/unittests/utils/xmlutils.cc
+++ b/src/unittests/utils/xmlutils.cc
@@ -56,6 +56,12 @@ TEST_CASE("xmlutils readXmlIntVector 1", "")
 
     mainGraphics = new SDLGraphics;
     imageHelper = new SDLImageHelper();
+
+    Dirs::initHomeDir();
+
+    setBrandingDefaults(branding);
+    ConfigManager::initConfiguration();
+
 #ifdef USE_SDL2
     SDLImageHelper::setRenderer(graphicsManager.createRenderer(
         graphicsManager.createWindow(640, 480, 0,
@@ -68,11 +74,6 @@ TEST_CASE("xmlutils readXmlIntVector 1", "")
     userPalette = new UserPalette;
 
     Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    setBrandingDefaults(branding);
-    ConfigManager::initConfiguration();
-
     theme = new Theme;
     Theme::selectSkin();
 
@@ -114,6 +115,13 @@ TEST_CASE("xmlutils readXmlStringMap 1", "")
 
     mainGraphics = new SDLGraphics;
     imageHelper = new SDLImageHelper();
+
+    Dirs::initRootDir();
+    Dirs::initHomeDir();
+
+    setBrandingDefaults(branding);
+    ConfigManager::initConfiguration();
+
 #ifdef USE_SDL2
     SDLImageHelper::setRenderer(graphicsManager.createRenderer(
         graphicsManager.createWindow(640, 480, 0,
@@ -125,12 +133,6 @@ TEST_CASE("xmlutils readXmlStringMap 1", "")
 
     userPalette = new UserPalette;
 
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    setBrandingDefaults(branding);
-    ConfigManager::initConfiguration();
-
     theme = new Theme;
     Theme::selectSkin();
 
@@ -173,6 +175,13 @@ TEST_CASE("xmlutils readXmlIntMap 1", "")
 
     mainGraphics = new SDLGraphics;
     imageHelper = new SDLImageHelper();
+
+    Dirs::initRootDir();
+    Dirs::initHomeDir();
+
+    setBrandingDefaults(branding);
+    ConfigManager::initConfiguration();
+
 #ifdef USE_SDL2
     SDLImageHelper::setRenderer(graphicsManager.createRenderer(
         graphicsManager.createWindow(640, 480, 0,
@@ -184,12 +193,6 @@ TEST_CASE("xmlutils readXmlIntMap 1", "")
 
     userPalette = new UserPalette;
 
-    Dirs::initRootDir();
-    Dirs::initHomeDir();
-
-    setBrandingDefaults(branding);
-    ConfigManager::initConfiguration();
-
     theme = new Theme;
     Theme::selectSkin();