diff --git a/community-tests/src/tests/testGroups.properties b/community-tests/src/tests/testGroups.properties
index 5dbc7b6b8554..8e589e9645b2 100644
--- a/community-tests/src/tests/testGroups.properties
+++ b/community-tests/src/tests/testGroups.properties
@@ -155,6 +155,7 @@ org.jetbrains.idea.maven.project.importing.*
 org.jetbrains.idea.maven.compiler.*
 org.jetbrains.idea.maven.dom.*
 org.jetbrains.idea.maven.indices.*
+org.jetbrains.idea.maven.inspections.dom.*
 
 [TASKS_INTEGRATION_TESTS]
 com.intellij.tasks.integration.*
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/plugins/surefire/MavenSurefirePluginTest.groovy b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenSurefirePluginTest.groovy
similarity index 98%
rename from plugins/maven/src/test/java/org/jetbrains/idea/maven/plugins/surefire/MavenSurefirePluginTest.groovy
rename to plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenSurefirePluginTest.groovy
index b57b52837249..c688f2762f18 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/plugins/surefire/MavenSurefirePluginTest.groovy
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenSurefirePluginTest.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jetbrains.idea.maven.plugins.surefire
+package org.jetbrains.idea.maven.dom
 
 import org.jetbrains.idea.maven.MavenImportingTestCase
 import org.jetbrains.idea.maven.dom.MavenDomTestCase
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/MavenDuplicatedDependencyInspectionTest.groovy b/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/dom/MavenDuplicatedDependencyInspectionTest.groovy
similarity index 98%
rename from plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/MavenDuplicatedDependencyInspectionTest.groovy
rename to plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/dom/MavenDuplicatedDependencyInspectionTest.groovy
index 6cdd39313a6c..2cb18460c4eb 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/MavenDuplicatedDependencyInspectionTest.groovy
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/dom/MavenDuplicatedDependencyInspectionTest.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jetbrains.idea.maven.inspections
+package org.jetbrains.idea.maven.inspections.dom
 
 import org.jetbrains.idea.maven.dom.MavenDomTestCase
 import org.jetbrains.idea.maven.dom.inspections.MavenDuplicateDependenciesInspection
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/MavenDuplicatedPluginInspectionTest.groovy b/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/dom/MavenDuplicatedPluginInspectionTest.groovy
similarity index 94%
rename from plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/MavenDuplicatedPluginInspectionTest.groovy
rename to plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/dom/MavenDuplicatedPluginInspectionTest.groovy
index 4ed63c970b75..32355c0f3dea 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/MavenDuplicatedPluginInspectionTest.groovy
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/dom/MavenDuplicatedPluginInspectionTest.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jetbrains.idea.maven.inspections
+package org.jetbrains.idea.maven.inspections.dom
 
 import org.jetbrains.idea.maven.dom.MavenDomTestCase
 import org.jetbrains.idea.maven.dom.inspections.MavenDuplicatePluginInspection
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/MavenRedundantGroupIdTest.groovy b/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/dom/MavenRedundantGroupIdTest.groovy
similarity index 96%
rename from plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/MavenRedundantGroupIdTest.groovy
rename to plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/dom/MavenRedundantGroupIdTest.groovy
index 83625dca6ae5..423dcd2fea1c 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/MavenRedundantGroupIdTest.groovy
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/dom/MavenRedundantGroupIdTest.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jetbrains.idea.maven.inspections
+package org.jetbrains.idea.maven.inspections.dom
 
 import com.intellij.codeInsight.intention.IntentionAction
 import com.intellij.psi.impl.source.PostprocessReformattingAspect