diff --git a/idea/tests/org/jetbrains/kotlin/idea/RegisteredFindersTest.kt b/idea/tests/org/jetbrains/kotlin/idea/RegisteredFindersTest.kt
index 813d350437f..d5e778bab0a 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/RegisteredFindersTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/RegisteredFindersTest.kt
@@ -27,18 +27,27 @@ class RegisteredFindersTest : KotlinLightCodeInsightFixtureTestCase() {
     override fun getProjectDescriptor() = LightCodeInsightFixtureTestCase.JAVA_LATEST
 
     fun testKnownNonClasspathFinder() {
-        val expectedFindersNames = setOf("GantClassFinder", "GradleClassFinder", "KotlinScriptDependenciesClassFinder", "AlternativeJreClassFinder").toMutableSet()
-        val optionalFindersNames = setOf("AlternativeJreClassFinder").toMutableSet()
+        val expectedFindersNames = setOf(
+                "GantClassFinder",
+                "GradleClassFinder",
+                "KotlinScriptDependenciesClassFinder"
+        ).toMutableSet()
+
+        val optionalFindersNames = setOf(
+                "AlternativeJreClassFinder",
+                "IdeaOpenApiClassFinder",
+                "BundledGroovyClassFinder")
 
         project.getExtensions<PsiElementFinder>(PsiElementFinder.EP_NAME).forEach { finder ->
             if (finder is NonClasspathClassFinder) {
                 val name = finder::class.java.simpleName
-                val removed = expectedFindersNames.remove(name)
+                val isKnown = expectedFindersNames.remove(name) || optionalFindersNames.contains(name)
                 Assert.assertTrue("Unknown finder found: $finder, class name: $name, search in $expectedFindersNames.\n" +
                                   "Consider updating ${KotlinJavaPsiFacade::class.java}",
-                                  removed)
+                                  isKnown)
             }
         }
+
         expectedFindersNames.removeAll(optionalFindersNames)
 
         Assert.assertTrue("Some finders wasn't found: $expectedFindersNames", expectedFindersNames.isEmpty())