diff --git a/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/AutomatedIntegrationSuite.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/AutomatedIntegrationSuite.java
index 79093b226e8..7233b65c959 100644
--- a/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/AutomatedIntegrationSuite.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/AutomatedIntegrationSuite.java
@@ -34,6 +34,7 @@ import org.eclipse.cdt.codan.core.internal.checkers.SuspiciousSemicolonCheckerTe
 import org.eclipse.cdt.codan.core.internal.checkers.UnusedSymbolInFileScopeCheckerTest;
 import org.eclipse.cdt.codan.internal.checkers.ui.quickfix.AssignmentInConditionQuickFixTest;
 import org.eclipse.cdt.codan.internal.checkers.ui.quickfix.CaseBreakQuickFixTest;
+import org.eclipse.cdt.codan.internal.checkers.ui.quickfix.CaseBreakQuickFixCommentTest;
 import org.eclipse.cdt.codan.internal.checkers.ui.quickfix.CatchByReferenceQuickFixTest;
 import org.eclipse.cdt.codan.internal.checkers.ui.quickfix.CreateLocalVariableQuickFixTest;
 import org.eclipse.cdt.codan.internal.checkers.ui.quickfix.SuggestedParenthesisQuickFixTest;
@@ -81,6 +82,7 @@ public class AutomatedIntegrationSuite extends TestSuite {
 		suite.addTestSuite(SuggestedParenthesisQuickFixTest.class);
 		suite.addTestSuite(CatchByReferenceQuickFixTest.class);
 		suite.addTestSuite(CaseBreakQuickFixTest.class);
+		suite.addTestSuite(CaseBreakQuickFixCommentTest.class);
 		suite.addTestSuite(AssignmentInConditionQuickFixTest.class);
 		return suite;
 	}
diff --git a/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixCommentTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixCommentTest.java
new file mode 100644
index 00000000000..8015ceba847
--- /dev/null
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixCommentTest.java
@@ -0,0 +1,44 @@
+package org.eclipse.cdt.codan.internal.checkers.ui.quickfix;
+
+import org.eclipse.cdt.codan.ui.AbstractCodanCMarkerResolution;
+
+public class CaseBreakQuickFixCommentTest extends QuickFixTestCase {
+	@SuppressWarnings("restriction")
+	@Override
+	protected AbstractCodanCMarkerResolution createQuickFix() {
+		return new CaseBreakQuickFixComment();
+	}
+
+	//void hello() {}
+	//void func() {
+	//	int a;
+	//	switch(a) {
+	//	case 1:
+	//		hello();
+	//	case 2:
+	//		break;
+	//	}
+	//}
+	public void testSimpleCase_515814() throws Exception {
+		loadcode(getAboveComment(), true);
+		String result = runQuickFixOneFile();
+		assertContainedIn("/* no break */\tcase 2:", result);
+	}
+
+	//void hello() {}
+	//void func() {
+	//	int a;
+	//	switch(a) {
+	//	case 1: {
+	//		hello();
+	//	}
+	//	case 2:
+	//		break;
+	//	}
+	//}
+	public void testCompositeCase_515814() throws Exception {
+		loadcode(getAboveComment(), true);
+		String result = runQuickFixOneFile();
+		assertContainedIn("/* no break */\tcase 2:", result);
+	}
+}