diff --git a/xml/tests/testData/xml/MavenValidation.xml b/plugins/maven/src/test/data/MavenValidation.xml
similarity index 100%
rename from xml/tests/testData/xml/MavenValidation.xml
rename to plugins/maven/src/test/data/MavenValidation.xml
diff --git a/xml/tests/testData/xml/maven-4.0.0.xsd b/plugins/maven/src/test/data/maven-4.0.0.xsd
similarity index 100%
rename from xml/tests/testData/xml/maven-4.0.0.xsd
rename to plugins/maven/src/test/data/maven-4.0.0.xsd
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenCustomRepositoryHelper.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenCustomRepositoryHelper.java
index 4f88c2f496e9..a1f83ecd1c1d 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenCustomRepositoryHelper.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenCustomRepositoryHelper.java
@@ -45,7 +45,7 @@ public class MavenCustomRepositoryHelper {
     LocalFileSystem.getInstance().refreshIoFiles(Collections.singleton(to));
   }
 
-  private static String getOriginalTestDataPath() {
+  public static String getOriginalTestDataPath() {
     String sourcesDir = System.getProperty("maven.sources.dir", PluginPathManager.getPluginHomePath("maven"));
     return FileUtil.toSystemIndependentName(sourcesDir + "/src/test/data");
   }
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenXmlHighlightingTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenXmlHighlightingTest.kt
new file mode 100644
index 000000000000..85bcf08938ac
--- /dev/null
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenXmlHighlightingTest.kt
@@ -0,0 +1,22 @@
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.idea.maven.dom
+
+import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase
+import com.intellij.openapi.vfs.LocalFileSystem
+import org.jetbrains.idea.maven.MavenCustomRepositoryHelper
+import org.jetbrains.idea.maven.server.MavenDistributionsCache
+import java.io.File
+
+class MavenXmlHighlightingTest : DaemonAnalyzerTestCase() {
+  override fun setUp() {
+    super.setUp()
+    MavenDistributionsCache.resolveEmbeddedMavenHome()
+  }
+
+  @Throws(Exception::class)
+  fun testMavenValidation() {
+    val file = File(MavenCustomRepositoryHelper.getOriginalTestDataPath()).resolve("MavenValidation.xml")
+    doTest(LocalFileSystem.getInstance().findFileByIoFile(file)!!, false, false)
+  }
+
+}
\ No newline at end of file
diff --git a/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java b/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java
index e1984da71fb6..9339f691cd74 100644
--- a/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java
@@ -791,11 +791,6 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     doTest(new VirtualFile[]{findVirtualFile(getFullRelativeTestName()), findVirtualFile(BASE_PATH + location)}, false, false);
   }
 
-  @IJIgnore(issue = "IDEA-356247")
-  public void testMavenValidation() throws Exception {
-    doTest(getFullRelativeTestName(), false, false);
-  }
-
   public void testResolveEntityUrl() throws Throwable {
     doTest(new VirtualFile[] {
       findVirtualFile(getFullRelativeTestName()),