diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/NewMethodRefHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/NewMethodRefHighlightingTest.java
index b206ca7452cc..ac5b122527c5 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/NewMethodRefHighlightingTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/NewMethodRefHighlightingTest.java
@@ -156,7 +156,8 @@ public class NewMethodRefHighlightingTest extends LightDaemonAnalyzerTestCase {
   public void testGetClassReturnTypeInMethodReference() { doTest(); }
   public void testCaptureTypeOfNewArrayExpression() { doTest(); }
   public void testIDEA152659() { doTest(); }
-  public void testRegistryOptionToSkipUnsoundCaptureConversionInMethodReferenceReturnType() { doTest(); }
+  //removing one unsound capture conversion is not enough to leave the system consistent
+  public void _testRegistryOptionToSkipUnsoundCaptureConversionInMethodReferenceReturnType() { doTest(); }
   public void testFreshVariableLowerBoundsDuringSuperTypeChecks() { doTest(); }
   public void testTypeParameterInstantiation() { doTest(); }
   public void testIgnoreForeignVariables() { doTest(); }
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 68da6cf5e03f..85e05f82e07b 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -809,7 +809,7 @@ javac.fresh.variables.for.captured.wildcards.only=true
 javac.fresh.variables.for.captured.wildcards.only.description=JLS 18.5.2: if R \u03B8 is a parameterized type, G<A1, ..., An>, and one of A1, ..., An is a wildcard, then, for fresh inference variables \u03B21, ..., \u03B2n ... \
   Javac creates fresh variables only for i: Ai is a wildcard
 
-unsound.capture.conversion.java.spec.change=true
+unsound.capture.conversion.java.spec.change=false
 unsound.capture.conversion.java.spec.change.description=Capture in method reference return type is unsound and the spec would be changed, see https://bugs.openjdk.java.net/browse/JDK-8170887
 
 check.power.supply.for.mbp=false