diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
index ba7b111abcb8..de59b09721f5 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
@@ -37,6 +37,7 @@ import com.intellij.psi.filters.classes.AssignableFromContextFilter;
 import com.intellij.psi.filters.element.ModifierFilter;
 import com.intellij.psi.filters.getters.ExpectedTypesGetter;
 import com.intellij.psi.filters.getters.JavaMembersGetter;
+import com.intellij.psi.impl.PsiImplUtil;
 import com.intellij.psi.impl.java.stubs.index.JavaAutoModuleNameIndex;
 import com.intellij.psi.impl.java.stubs.index.JavaModuleNameIndex;
 import com.intellij.psi.impl.source.PsiJavaCodeReferenceElementImpl;
@@ -136,7 +137,8 @@ public class JavaCompletionContributor extends CompletionContributor {
     if (CATCH_OR_FINALLY.accepts(position) ||
         JavaKeywordCompletion.START_SWITCH.accepts(position) ||
         JavaKeywordCompletion.isInstanceofPlace(position) ||
-        JavaKeywordCompletion.isAfterPrimitiveOrArrayType(position)) {
+        JavaKeywordCompletion.isAfterPrimitiveOrArrayType(position) ||
+        LabelReferenceCompletion.isValueBreakPosition(position) == Boolean.FALSE) {
       return null;
     }
 
@@ -478,8 +480,16 @@ public class JavaCompletionContributor extends CompletionContributor {
             }
           }
         }
+
+        // break <label>
+        if (LabelReferenceCompletion.isValueBreakPosition(position) == Boolean.FALSE) {
+          items.putValues(result1, LabelReferenceCompletion.processLabelVariants(PsiImplUtil.findAllEnclosingLabels(position)));
+        }
+
         return;
       }
+
+      // continue <label>
       if (reference instanceof PsiLabelReference) {
         items.putValues(result1, LabelReferenceCompletion.processLabelReference((PsiLabelReference)reference));
         return;
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java
index 161c636b0f43..474413f15d42 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java
@@ -253,7 +253,7 @@ public class JavaKeywordCompletion {
     addMethodHeaderKeywords();
 
     addPrimitiveTypes(this::addKeyword, myPosition, mySession);
-    
+
     addVar();
 
     addClassLiteral();
@@ -379,11 +379,10 @@ public class JavaKeywordCompletion {
         !AFTER_DOT.accepts(myPosition)) {
       addKeyword(TailTypeDecorator.withTail(createKeyword(PsiKeyword.FINAL), TailType.HUMBLE_SPACE_BEFORE_WORD));
     }
-
   }
 
   private void addThisSuper() {
-    if (SUPER_OR_THIS_PATTERN.accepts(myPosition)) {
+    if (SUPER_OR_THIS_PATTERN.accepts(myPosition) && LabelReferenceCompletion.isValueBreakPosition(myPosition) != Boolean.FALSE) {
       final boolean afterDot = AFTER_DOT.accepts(myPosition);
       final boolean insideQualifierClass = isInsideQualifierClass();
       final boolean insideInheritorClass = PsiUtil.isLanguageLevel8OrHigher(myPosition) && isInsideInheritorClass();
@@ -537,7 +536,7 @@ public class JavaKeywordCompletion {
       if (psiElement().insideStarting(psiElement(PsiLocalVariable.class, PsiExpressionStatement.class)).accepts(myPosition)) {
         addKeyword(new OverridableSpace(createKeyword(PsiKeyword.CLASS), TailType.HUMBLE_SPACE_BEFORE_WORD));
       }
-      if (PsiTreeUtil.getParentOfType(myPosition, PsiExpression.class, true, PsiMember.class) == null && 
+      if (PsiTreeUtil.getParentOfType(myPosition, PsiExpression.class, true, PsiMember.class) == null &&
           PsiTreeUtil.getParentOfType(myPosition, PsiCodeBlock.class, true, PsiMember.class) == null) {
         addKeyword(new OverridableSpace(createKeyword(PsiKeyword.CLASS), TailType.HUMBLE_SPACE_BEFORE_WORD));
         addKeyword(new OverridableSpace(createKeyword(PsiKeyword.INTERFACE), TailType.HUMBLE_SPACE_BEFORE_WORD));
@@ -593,7 +592,7 @@ public class JavaKeywordCompletion {
   }
 
   private static boolean isExpressionPosition(PsiElement position) {
-    return EXPR_KEYWORDS.accepts(position) ||
+    return EXPR_KEYWORDS.accepts(position) && LabelReferenceCompletion.isValueBreakPosition(position) != Boolean.FALSE ||
            psiElement().insideStarting(psiElement(PsiClassObjectAccessExpression.class)).accepts(position);
   }
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/LabelReferenceCompletion.java b/java/java-impl/src/com/intellij/codeInsight/completion/LabelReferenceCompletion.java
index 7eef977ba64a..41dee2a00bb6 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/LabelReferenceCompletion.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/LabelReferenceCompletion.java
@@ -1,18 +1,4 @@
-/*
- * 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.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.codeInsight.completion;
 
 import com.intellij.codeInsight.TailType;
@@ -20,14 +6,16 @@ import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.codeInsight.lookup.TailTypeDecorator;
 import com.intellij.patterns.ElementPattern;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiKeyword;
-import com.intellij.psi.PsiReference;
+import com.intellij.psi.*;
+import com.intellij.psi.impl.PsiImplUtil;
 import com.intellij.psi.impl.source.PsiLabelReference;
 import com.intellij.util.ProcessingContext;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 
 import static com.intellij.patterns.PlatformPatterns.psiElement;
@@ -38,17 +26,37 @@ import static com.intellij.patterns.PlatformPatterns.psiElement;
 class LabelReferenceCompletion extends CompletionProvider<CompletionParameters> {
   static final ElementPattern<PsiElement> LABEL_REFERENCE = psiElement().afterLeaf(PsiKeyword.BREAK, PsiKeyword.CONTINUE);
 
+  static @Nullable Boolean isValueBreakPosition(@NotNull PsiElement position) {
+    PsiElement parent = position.getParent();
+    if (parent instanceof PsiReferenceExpression && ((PsiReferenceExpression)parent).getQualifierExpression() == null) {
+      PsiElement grand = parent.getParent();
+      if (grand instanceof PsiBreakStatement) {
+        return ((PsiBreakStatement)grand).findExitedElement() instanceof PsiSwitchExpression;
+      }
+    }
+
+    return null;
+  }
+
   static List<LookupElement> processLabelReference(PsiLabelReference ref) {
-    return ContainerUtil.map(ref.getVariants(), s -> TailTypeDecorator.withTail(LookupElementBuilder.create(s), TailType.SEMICOLON));
+    return processLabelVariants(Arrays.asList(ref.getVariants()));
+  }
+
+  static List<LookupElement> processLabelVariants(Collection<?> variants) {
+    return ContainerUtil.map(variants, s -> TailTypeDecorator.withTail(LookupElementBuilder.create(s), TailType.SEMICOLON));
   }
 
   @Override
   protected void addCompletions(@NotNull CompletionParameters parameters,
                                 @NotNull ProcessingContext context,
                                 @NotNull CompletionResultSet result) {
-    PsiReference ref = parameters.getPosition().getContainingFile().findReferenceAt(parameters.getOffset());
+    PsiElement position = parameters.getPosition();
+    PsiReference ref = position.getContainingFile().findReferenceAt(parameters.getOffset());
     if (ref instanceof PsiLabelReference) {
       result.addAllElements(processLabelReference((PsiLabelReference)ref));
     }
+    else if (isValueBreakPosition(position) == Boolean.FALSE) {
+      result.addAllElements(processLabelVariants(PsiImplUtil.findAllEnclosingLabels(position)));
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java
index 634fa4d266c3..4353da245d3d 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java
@@ -37,6 +37,7 @@ import com.intellij.psi.util.PsiUtil;
 import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.PairFunction;
+import com.intellij.util.SmartList;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NonNls;
@@ -662,6 +663,17 @@ public class PsiImplUtil {
     return null;
   }
 
+  @NotNull
+  public static List<String> findAllEnclosingLabels(@NotNull PsiElement start) {
+    List<String> result = new SmartList<>();
+    for (PsiElement context = start; !isCodeBoundary(context); context = context.getContext()) {
+      if (context instanceof PsiLabeledStatement) {
+        result.add(((PsiLabeledStatement)context).getName());
+      }
+    }
+    return result;
+  }
+
   private static boolean isCodeBoundary(@Nullable PsiElement e) {
     return e == null || e instanceof PsiMethod || e instanceof PsiClassInitializer || e instanceof PsiLambdaExpression;
   }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiLabelReference.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiLabelReference.java
index e05e436d5173..76184406a4d9 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiLabelReference.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiLabelReference.java
@@ -6,11 +6,8 @@ import com.intellij.psi.*;
 import com.intellij.psi.impl.PsiImplUtil;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.IncorrectOperationException;
-import com.intellij.util.SmartList;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.List;
-
 public class PsiLabelReference implements PsiReference {
   private final PsiStatement myStatement;
   private PsiIdentifier myIdentifier;
@@ -70,13 +67,7 @@ public class PsiLabelReference implements PsiReference {
   @NotNull
   @Override
   public String[] getVariants() {
-    List<String> result = new SmartList<>();
-    for (PsiElement context = myStatement; context != null; context = context.getContext()) {
-      if (context instanceof PsiLabeledStatement) {
-        result.add(((PsiLabeledStatement)context).getName());
-      }
-    }
-    return ArrayUtil.toStringArray(result);
+    return ArrayUtil.toStringArray(PsiImplUtil.findAllEnclosingLabels(myStatement));
   }
 
   @Override
diff --git a/java/java-tests/testData/codeInsight/completion/normal/ContinueLabel.java b/java/java-tests/testData/codeInsight/completion/normal/ContinueLabel.java
deleted file mode 100644
index 27341ba94f2f..000000000000
--- a/java/java-tests/testData/codeInsight/completion/normal/ContinueLabel.java
+++ /dev/null
@@ -1,7 +0,0 @@
-public class Util {
-  void foo(int a, int b) {
-    Outer: for (int i = 0; i < 239; i++) {
-      conti<caret>
-    }
-  }
-}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/normal/ContinueLabel_after.java b/java/java-tests/testData/codeInsight/completion/normal/ContinueLabel_after.java
deleted file mode 100644
index c1b9a66e71bb..000000000000
--- a/java/java-tests/testData/codeInsight/completion/normal/ContinueLabel_after.java
+++ /dev/null
@@ -1,7 +0,0 @@
-public class Util {
-  void foo(int a, int b) {
-    Outer: for (int i = 0; i < 239; i++) {
-      continue <caret>
-    }
-  }
-}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/smartType/BreakLabel-out.java b/java/java-tests/testData/codeInsight/completion/smartType/BreakLabel-out.java
deleted file mode 100644
index 5b484ac6fe54..000000000000
--- a/java/java-tests/testData/codeInsight/completion/smartType/BreakLabel-out.java
+++ /dev/null
@@ -1,8 +0,0 @@
-public class Util {
-  void foo(int labInt) {
-    label:
-    while (true) {
-      break label;<caret>
-    }
-  }
-}
diff --git a/java/java-tests/testData/codeInsight/completion/smartType/BreakLabel.java b/java/java-tests/testData/codeInsight/completion/smartType/BreakLabel.java
deleted file mode 100644
index c3ddefc7a180..000000000000
--- a/java/java-tests/testData/codeInsight/completion/smartType/BreakLabel.java
+++ /dev/null
@@ -1,8 +0,0 @@
-public class Util {
-  void foo(int labInt) {
-    label:
-    while (true) {
-      break l<caret>
-    }
-  }
-}
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/NormalCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/NormalCompletionTest.groovy
index 015d5e09ef1d..4fec852a1541 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/NormalCompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/NormalCompletionTest.groovy
@@ -1,18 +1,4 @@
-/*
- * 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.
- * 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.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.java.codeInsight.completion
 
 import com.intellij.codeInsight.CodeInsightSettings
@@ -546,7 +532,35 @@ public class Outer {
     checkResult()
   }
 
-  void testContinueLabel() throws Throwable { doTest() }
+  void testBreakLabel() {
+    myFixture.configureByText("a.java", """
+      class a {{
+        foo: while (true) break <caret>
+      }}""".stripIndent())
+    complete()
+    assert myItems.length == 1
+  }
+
+  void testContinueLabel() {
+    myFixture.configureByText("a.java", """
+      class a {{
+        foo: while (true) continue <caret>
+      }}""".stripIndent())
+    complete()
+    assert myItems.length == 1
+  }
+
+  void testContinueLabelTail() {
+    myFixture.configureByText("a.java", """
+      class a {{
+        foo: while (true) con<caret>
+      }}""".stripIndent())
+    complete()
+    myFixture.checkResult("""
+      class a {{
+        foo: while (true) continue <caret>
+      }}""".stripIndent())
+  }
 
   void testAnonymousProcess() {
     myFixture.addClass 'package java.lang; public class Process {}'
@@ -1218,7 +1232,7 @@ public class ListUtils {
   void testInstanceMagicMethod() throws Exception { doTest() }
 
   void testNoDotOverwrite() throws Exception { doTest('.') }
-  
+
   void testNoModifierListOverwrite() { doTest('\t') }
 
   void testStaticInnerExtendingOuter() throws Exception { doTest() }
@@ -1722,7 +1736,7 @@ class Bar {
     myFixture.addClass("package pkg; public class PathUtil { public static String toSystemDependentName() {} }")
     doTest('\n')
   }
-  
+
   void testPairAngleBracketDisabled() {
     CodeInsightSettings.instance.AUTOINSERT_PAIR_BRACKET = false
     doTest('<')
@@ -1737,7 +1751,7 @@ class Bar {
     configure()
     assert myFixture.lookupElements.collect { LookupElementPresentation.renderElement(it).itemText } == ['Bar.valueOf', 'Foo.valueOf', 'Enum.valueOf']
   }
-  
+
   void testTypeArgumentInCast() {
     configure()
     myFixture.assertPreferredCompletionItems 0, 'String'
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/SmartTypeCompletionTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/SmartTypeCompletionTest.java
index 4fa6040d0071..a5e67ad2ece2 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/SmartTypeCompletionTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/SmartTypeCompletionTest.java
@@ -14,7 +14,6 @@ import com.intellij.codeInsight.template.Template;
 import com.intellij.codeInsight.template.TemplateContextType;
 import com.intellij.codeInsight.template.TemplateManager;
 import com.intellij.codeInsight.template.impl.TemplateImpl;
-import com.intellij.idea.Bombed;
 import com.intellij.lang.java.JavaLanguage;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.psi.PsiClass;
@@ -24,8 +23,6 @@ import com.intellij.psi.codeStyle.JavaCodeStyleSettings;
 import com.intellij.testFramework.fixtures.CodeInsightTestUtil;
 import com.intellij.util.containers.ContainerUtil;
 
-import java.util.Calendar;
-
 public class SmartTypeCompletionTest extends LightFixtureCompletionTestCase {
 
   @Override
@@ -1047,8 +1044,32 @@ public class SmartTypeCompletionTest extends LightFixtureCompletionTestCase {
   }
 
   public void testEnumAsDefaultAnnotationParam() { doTest(); }
-  @Bombed(user = "roman.shevchenko@jetbrains.com", day = 22, month = Calendar.NOVEMBER)
-  public void testBreakLabel() { doTest(); }
+
+  public void testBreakLabel() {
+    myFixture.configureByText(
+      "a.java",
+      "class a{{\n" +
+      "  foo: while (true) break <caret>\n" +
+      "}}");
+    complete();
+    myFixture.checkResult(
+      "class a{{\n" +
+      "  foo: while (true) break foo;<caret>\n" +
+      "}}");
+  }
+
+  public void testContinueLabel() {
+    myFixture.configureByText(
+      "a.java",
+      "class a{{\n" +
+      "  foo: while (true) continue <caret>\n" +
+      "}}");
+    complete();
+    myFixture.checkResult(
+      "class a{{\n" +
+      "  foo: while (true) continue foo;<caret>\n" +
+      "}}");
+  }
 
   public void testNewAbstractInsideAnonymous() { doTest(); }