diff --git a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/ReplaceTagEmptyBodyTest.java b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/ReplaceTagEmptyBodyTest.java
new file mode 100644
index 000000000000..8688ad33553d
--- /dev/null
+++ b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/ReplaceTagEmptyBodyTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2000-2015 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.codeInsight.daemon.quickFix;
+
+import com.intellij.codeInspection.LocalInspectionTool;
+import com.intellij.testFramework.PlatformTestUtil;
+import com.intellij.xml.util.CheckTagEmptyBodyInspection;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+
+public class ReplaceTagEmptyBodyTest extends LightQuickFixParameterizedTestCase {
+
+  public void test() throws Exception {
+    doAllTests();
+  }
+
+  @NotNull
+  @Override
+  protected LocalInspectionTool[] configureLocalInspectionTools() {
+    return new LocalInspectionTool[] {
+      new CheckTagEmptyBodyInspection()
+    };
+  }
+
+  @Override
+  protected String getBasePath() {
+    return "/quickFix/replaceTagEmptyBodyWithEmptyEnd";
+  }
+
+  @NotNull
+  @Override
+  protected String getTestDataPath() {
+    return PlatformTestUtil.getCommunityPath().replace(File.separatorChar, '/') + "/xml/tests/testData/";
+  }
+}
\ No newline at end of file
diff --git a/xml/tests/testData/quickFix/replaceTagEmptyBodyWithEmptyEnd/after1.html b/xml/tests/testData/quickFix/replaceTagEmptyBodyWithEmptyEnd/after1.html
new file mode 100644
index 000000000000..636b2ff0edbd
--- /dev/null
+++ b/xml/tests/testData/quickFix/replaceTagEmptyBodyWithEmptyEnd/after1.html
@@ -0,0 +1,2 @@
+<!-- "Collapse empty tag" "false" -->
+<script></script>
\ No newline at end of file
diff --git a/xml/tests/testData/quickFix/replaceTagEmptyBodyWithEmptyEnd/after1.xml b/xml/tests/testData/quickFix/replaceTagEmptyBodyWithEmptyEnd/after1.xml
new file mode 100644
index 000000000000..3d5a6d602fe8
--- /dev/null
+++ b/xml/tests/testData/quickFix/replaceTagEmptyBodyWithEmptyEnd/after1.xml
@@ -0,0 +1,2 @@
+<!-- "Collapse empty tag" "true" -->
+<aaa/>
\ No newline at end of file
diff --git a/xml/tests/testData/quickFix/replaceTagEmptyBodyWithEmptyEnd/after2.html b/xml/tests/testData/quickFix/replaceTagEmptyBodyWithEmptyEnd/after2.html
new file mode 100644
index 000000000000..548df66e29e4
--- /dev/null
+++ b/xml/tests/testData/quickFix/replaceTagEmptyBodyWithEmptyEnd/after2.html
@@ -0,0 +1,2 @@
+<!-- "Collapse empty tag" "false" -->
+<d<caret>iv></div>
\ No newline at end of file
diff --git a/xml/tests/testData/quickFix/replaceTagEmptyBodyWithEmptyEnd/before1.html b/xml/tests/testData/quickFix/replaceTagEmptyBodyWithEmptyEnd/before1.html
new file mode 100644
index 000000000000..2d47015642f3
--- /dev/null
+++ b/xml/tests/testData/quickFix/replaceTagEmptyBodyWithEmptyEnd/before1.html
@@ -0,0 +1,2 @@
+<!-- "Collapse empty tag" "false" -->
+<scr<caret>ipt></script>
\ No newline at end of file
diff --git a/xml/tests/testData/quickFix/replaceTagEmptyBodyWithEmptyEnd/before1.xml b/xml/tests/testData/quickFix/replaceTagEmptyBodyWithEmptyEnd/before1.xml
new file mode 100644
index 000000000000..e6eca4cc2cc2
--- /dev/null
+++ b/xml/tests/testData/quickFix/replaceTagEmptyBodyWithEmptyEnd/before1.xml
@@ -0,0 +1,2 @@
+<!-- "Collapse empty tag" "true" -->
+<aa<caret>a></aaa>
\ No newline at end of file
diff --git a/xml/tests/testData/quickFix/replaceTagEmptyBodyWithEmptyEnd/before2.html b/xml/tests/testData/quickFix/replaceTagEmptyBodyWithEmptyEnd/before2.html
new file mode 100644
index 000000000000..548df66e29e4
--- /dev/null
+++ b/xml/tests/testData/quickFix/replaceTagEmptyBodyWithEmptyEnd/before2.html
@@ -0,0 +1,2 @@
+<!-- "Collapse empty tag" "false" -->
+<d<caret>iv></div>
\ No newline at end of file