diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/importDefaultPackage/Test.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/importDefaultPackage/Test.java
deleted file mode 100644
index 6402fa536bbc..000000000000
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/importDefaultPackage/Test.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class Test {
-  public Test(int i) {
-    new x();
-  }
-}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/importDefaultPackage/x.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/importDefaultPackage/x.java
deleted file mode 100644
index 88b90d97d842..000000000000
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/importDefaultPackage/x.java
+++ /dev/null
@@ -1 +0,0 @@
-class x { }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/importDefaultPackage/x/ImportOnDemandUsage.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/importDefaultPackage/x/ImportOnDemandUsage.java
deleted file mode 100644
index 0e2695134701..000000000000
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/importDefaultPackage/x/ImportOnDemandUsage.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package x;
-
-import x.n.*;
-
-class Foos2 {
-  Test t = new Test();
-}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/importDefaultPackage/x/InvalidUse.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/importDefaultPackage/x/InvalidUse.java
deleted file mode 100644
index f02025936521..000000000000
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/importDefaultPackage/x/InvalidUse.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package x;
-
-class InvalidUse {
-  <error descr="Cannot resolve symbol 'Test'">Test</error> t = null;
-}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/importDefaultPackage/x/Usage.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/importDefaultPackage/x/Usage.java
deleted file mode 100644
index cff269b30118..000000000000
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/importDefaultPackage/x/Usage.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package x;
-
-import x.n.Test;
-
-class Foos {
-  Test t = new Test();
-}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/importDefaultPackage/x/n/Test.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/importDefaultPackage/x/n/Test.java
deleted file mode 100644
index 900fe597f84e..000000000000
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/importDefaultPackage/x/n/Test.java
+++ /dev/null
@@ -1,2 +0,0 @@
-package x.n;
-public class Test {}
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/AdvHighlightingTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/AdvHighlightingTest.java
index 886a62130bad..23590b1fcdb7 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/AdvHighlightingTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/AdvHighlightingTest.java
@@ -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-2017 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.daemon;
 
 import com.intellij.analysis.PackagesScopesProvider;
@@ -163,22 +149,6 @@ public class AdvHighlightingTest extends DaemonAnalyzerTestCase {
     doTest(BASE_PATH + "/alreadyImportedClass/pack/AlreadyImportedClass.java", BASE_PATH + "/alreadyImportedClass", false, false);
   }
 
-  public void testImportDefaultPackage1() throws Exception {
-    doTest(BASE_PATH + "/importDefaultPackage/x/Usage.java", BASE_PATH + "/importDefaultPackage", false, false);
-  }
-
-  public void testImportDefaultPackage2() throws Exception {
-    doTest(BASE_PATH + "/importDefaultPackage/x/ImportOnDemandUsage.java", BASE_PATH + "/importDefaultPackage", false, false);
-  }
-
-  public void testImportDefaultPackage3() throws Exception {
-    doTest(BASE_PATH + "/importDefaultPackage/Test.java", BASE_PATH + "/importDefaultPackage", false, false);
-  }
-
-  public void testImportDefaultPackageInvalid() throws Exception {
-    doTest(BASE_PATH + "/importDefaultPackage/x/InvalidUse.java", BASE_PATH + "/importDefaultPackage", false, false);
-  }
-
   public void testScopeBased() {
     NamedScope xScope = new NamedScope("xxx", new PatternPackageSet("x..*", PatternPackageSet.SCOPE_SOURCE, null));
     NamedScope utilScope = new NamedScope("util", new PatternPackageSet("java.util.*", PatternPackageSet.SCOPE_LIBRARY, null));
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/ClassInDefaultPackageHighlightingTest.kt b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/ClassInDefaultPackageHighlightingTest.kt
index d3859fdfdd00..ff15a44d1e2a 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/ClassInDefaultPackageHighlightingTest.kt
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/ClassInDefaultPackageHighlightingTest.kt
@@ -8,6 +8,11 @@ import java.util.*
 class ClassInDefaultPackageHighlightingTest : LightCodeInsightFixtureTestCase() {
   override fun setUp() {
     super.setUp()
+    myFixture.addClass("""
+        public class conflict { }""".trimIndent())
+    myFixture.addClass("""
+        package conflict;
+        public class C { }""".trimIndent())
     myFixture.addClass("""
         public class MyConstants {
           public static final int CONSTANT = 1;
@@ -16,6 +21,32 @@ class ClassInDefaultPackageHighlightingTest : LightCodeInsightFixtureTestCase()
           }""".trimIndent())
   }
 
+  fun testClassPackageConflictInImport() {
+    doTest("""
+        package conflict;
+        import conflict.C;
+        class Test {
+          C c = new C();
+        }""".trimIndent())
+  }
+
+  fun testClassPackageConflictInOnDemandImport() {
+    doTest("""
+        package conflict;
+        import conflict.*;
+        class Test {
+          C c = new C();
+        }""".trimIndent())
+  }
+
+  fun testClassPackageConflictInFQRefs() {
+    doTest("""
+        class Test {{
+          new conflict();
+          new conflict.C();
+        }}""".trimIndent())
+  }
+
   fun testAccessFromDefaultPackage() {
     doTest("""
         class C {