diff --git a/java/java-indexing-api/src/com/intellij/psi/search/PsiShortNamesCache.java b/java/java-indexing-api/src/com/intellij/psi/search/PsiShortNamesCache.java
index 3f00a980f25e..872fc0ab07be 100644
--- a/java/java-indexing-api/src/com/intellij/psi/search/PsiShortNamesCache.java
+++ b/java/java-indexing-api/src/com/intellij/psi/search/PsiShortNamesCache.java
@@ -12,7 +12,7 @@ import com.intellij.util.ArrayUtilRt;
 import com.intellij.util.CommonProcessors;
 import com.intellij.util.Processor;
 import com.intellij.util.containers.ContainerUtil;
-import com.intellij.util.containers.HashSet;
+import java.util.HashSet;
 import com.intellij.util.indexing.IdFilter;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
diff --git a/java/java-tests/testData/actions/reformatFileInEditor/formatOptimizeVcsChanges_revision.java b/java/java-tests/testData/actions/reformatFileInEditor/formatOptimizeVcsChanges_revision.java
index 0818983f8e7d..761e6d3b3d23 100644
--- a/java/java-tests/testData/actions/reformatFileInEditor/formatOptimizeVcsChanges_revision.java
+++ b/java/java-tests/testData/actions/reformatFileInEditor/formatOptimizeVcsChanges_revision.java
@@ -1,4 +1,4 @@
-import com.intellij.util.containers.HashSet;
+import java.util.HashSet;
 
 import java.util.Set;
 import java.util.HashSet;