diff --git a/apps/openmw_test_suite/esmloader/esmdata.cpp b/apps/openmw_test_suite/esmloader/esmdata.cpp
index 7e5791561e..a697aae531 100644
--- a/apps/openmw_test_suite/esmloader/esmdata.cpp
+++ b/apps/openmw_test_suite/esmloader/esmdata.cpp
@@ -1,11 +1,11 @@
-#include <components/esm/loadacti.hpp>
-#include <components/esm/loadcell.hpp>
-#include <components/esm/loadcont.hpp>
-#include <components/esm/loaddoor.hpp>
-#include <components/esm/loadgmst.hpp>
-#include <components/esm/loadland.hpp>
-#include <components/esm/loadstat.hpp>
-#include <components/esm/variant.hpp>
+#include <components/esm3/loadacti.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loaddoor.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadland.hpp>
+#include <components/esm3/loadstat.hpp>
+#include <components/esm3/variant.hpp>
 #include <components/esmloader/esmdata.hpp>
 
 #include <gtest/gtest.h>
diff --git a/apps/openmw_test_suite/esmloader/load.cpp b/apps/openmw_test_suite/esmloader/load.cpp
index 048657e65d..d1647d138e 100644
--- a/apps/openmw_test_suite/esmloader/load.cpp
+++ b/apps/openmw_test_suite/esmloader/load.cpp
@@ -1,10 +1,10 @@
-#include <components/esm/loadacti.hpp>
-#include <components/esm/loadcell.hpp>
-#include <components/esm/loadcont.hpp>
-#include <components/esm/loaddoor.hpp>
-#include <components/esm/loadgmst.hpp>
-#include <components/esm/loadland.hpp>
-#include <components/esm/loadstat.hpp>
+#include <components/esm3/loadacti.hpp>
+#include <components/esm3/loadcell.hpp>
+#include <components/esm3/loadcont.hpp>
+#include <components/esm3/loaddoor.hpp>
+#include <components/esm3/loadgmst.hpp>
+#include <components/esm3/loadland.hpp>
+#include <components/esm3/loadstat.hpp>
 #include <components/esmloader/esmdata.hpp>
 #include <components/esmloader/load.hpp>
 #include <components/files/collections.hpp>