diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/after8.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/after8.java
deleted file mode 100644
index 06cc7b7973bb..000000000000
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/after8.java
+++ /dev/null
@@ -1,16 +0,0 @@
-// "Replace with <>" "true"
-class Test {
-
-    void test() {
-        class Foo<X extends Number> {
-            Foo() {}
-            Foo(X x) {}
-        }
-        Foo<Number> f1 = new Foo<Number>(1);
-        Foo<?> f2 = new Foo<Number>();
-        Foo<?> f3 = new Foo<Integer>();
-        Foo<Number> f4 = new Foo<Number>(1) {};
-        Foo<?> f5 = new Foo<>() {};
-        Foo<?> f6 = new Foo<Integer>() {};
-    }
-}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/after9.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/after9.java
deleted file mode 100644
index 550518376f67..000000000000
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/after9.java
+++ /dev/null
@@ -1,16 +0,0 @@
-// "Replace with <>" "true"
-class Test {
-
-    void test() {
-        class Foo<X extends Number> {
-            Foo() {}
-            Foo(X x) {}
-        }
-        Foo<Number> f1 = new Foo<Number>(1);
-        Foo<?> f2 = new Foo<Number>();
-        Foo<?> f3 = new Foo<Integer>();
-        Foo<Number> f4 = new Foo<Number>(1) {};
-        Foo<?> f5 = new Foo<Number>() {};
-        Foo<?> f6 = new Foo<>() {};
-    }
-}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/before8.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/before8.java
index 0ce27b5983a4..ec6b60133232 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/before8.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/before8.java
@@ -1,4 +1,4 @@
-// "Replace with <>" "true"
+// "Replace with <>" "false"
 class Test {
 
     void test() {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/before9.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/before9.java
index cd3b71989f5c..48bff64ca234 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/before9.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/before9.java
@@ -1,4 +1,4 @@
-// "Replace with <>" "true"
+// "Replace with <>" "false"
 class Test {
 
     void test() {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/beforeInAnonymousInner1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/beforeInAnonymousInner1.java
new file mode 100644
index 000000000000..00b852d657af
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/beforeInAnonymousInner1.java
@@ -0,0 +1,6 @@
+// "Replace with <>" "false"
+class Test<T> {
+    Test<String> s = new Test<St<caret>ring>(){
+    }; // anonymous inner class
+
+}
diff --git a/java/openapi/src/com/intellij/psi/PsiDiamondType.java b/java/openapi/src/com/intellij/psi/PsiDiamondType.java
index e8bd7f27911e..d857cb120e8f 100644
--- a/java/openapi/src/com/intellij/psi/PsiDiamondType.java
+++ b/java/openapi/src/com/intellij/psi/PsiDiamondType.java
@@ -104,7 +104,7 @@ public class PsiDiamondType extends PsiType {
     final PsiAnonymousClass anonymousClass = newExpression.getAnonymousClass();
     if (anonymousClass != null) {
       final PsiElement resolve = anonymousClass.getBaseClassReference().resolve();
-      if (resolve instanceof PsiClass && ((PsiClass)resolve).getContainingClass() != null) {
+      if (resolve instanceof PsiClass) {
         return PsiDiamondType.DiamondInferenceResult.ANONYMOUS_INNER_RESULT;
       }
     }