diff --git a/java/java-tests/testData/codeInsight/completion/normalSorting/ChangePreselectionOnSecondInvocation.java b/java/java-tests/testData/codeInsight/completion/normalSorting/ChangePreselectionOnSecondInvocation.java
index cc05fe89a2fc..9092c5767e75 100644
--- a/java/java-tests/testData/codeInsight/completion/normalSorting/ChangePreselectionOnSecondInvocation.java
+++ b/java/java-tests/testData/codeInsight/completion/normalSorting/ChangePreselectionOnSecondInvocation.java
@@ -1,6 +1,12 @@
 class Util {
   {
-    FooZoo<caret>
+    Another.fooZoo<caret>
   }
 
+}
+
+class Another {
+  private static void fooZoo() {}
+  static void fooZooGoo() {}
+  static void fooZooImpl() {}
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/normalSorting/PreferInterfacesInImplements.java b/java/java-tests/testData/codeInsight/completion/normalSorting/PreferInterfacesInImplements.java
index 03329ee279c7..fd01c2ff7352 100644
--- a/java/java-tests/testData/codeInsight/completion/normalSorting/PreferInterfacesInImplements.java
+++ b/java/java-tests/testData/codeInsight/completion/normalSorting/PreferInterfacesInImplements.java
@@ -1,6 +1,6 @@
-interface FooIntf {}
-class FooClass {}
-class Foo {}
+interface XFooIntf {}
+class XFooClass {}
+class XFoo {}
 
-class Goo implements Fo<caret> {
+class Goo implements XFo<caret> {
 }
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy
index d626cbaf6080..14d7b4791edd 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy
@@ -1289,14 +1289,13 @@ class Foo {
 
   public void testBackspaceShouldShowPreviousVariants() {
     CodeInsightSettings.instance.COMPLETION_CASE_SENSITIVE = CodeInsightSettings.NONE
-    myFixture.addClass("class OuterX { static class TrueLine {} }")
-    myFixture.configureByText 'a.java', 'class Foo{ void foo(int truex) { return tr<caret> }}'
-    type 'ue'
-    assert myFixture.lookupElementStrings == ['true', 'truex']
-    type 'l'
-    assert myFixture.lookupElementStrings == ['TrueLine']
+    myFixture.configureByText 'a.java', 'class Foo{ void foo(int itera, int itex) { it<caret> }}'
+    type 'e'
+    myFixture.assertPreferredCompletionItems 0, 'itera', 'itex'
+    type 'r'
+    myFixture.assertPreferredCompletionItems 0, 'itera', 'iter'
     type '\b'
-    assert myFixture.lookupElementStrings == ['true', 'truex']
+    myFixture.assertPreferredCompletionItems 0, 'itera', 'itex'
   }
 
   public void testBackspaceUntilDot() {
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy
index 05e8febad100..0c07fcb300a5 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy
@@ -261,7 +261,7 @@ public class NormalCompletionOrderingTest extends CompletionSortingTestCase {
   }
 
   public void testPreferInterfacesInImplements() {
-    checkPreferredItems(0, "FooIntf", "Foo", "FooClass");
+    checkPreferredItems(0, "XFooIntf", "XFoo", "XFooClass");
   }
 
   public void testPreferClassesInExtends() {
@@ -445,14 +445,11 @@ import java.lang.annotation.Target;
   }
 
   public void testChangePreselectionOnSecondInvocation() {
-    myFixture.addClass('package foo; public class FooZoo { }')
-    myFixture.addClass('public class FooZooImpl { }')
-    myFixture.addClass('public class FooZooGoo {}')
     configureNoCompletion(getTestName(false) + ".java");
     myFixture.complete(CompletionType.BASIC);
-    assertPreferredItems(0, 'FooZooGoo', 'FooZooImpl');
+    assertPreferredItems(0, 'fooZooGoo', 'fooZooImpl');
     myFixture.complete(CompletionType.BASIC);
-    assertPreferredItems(0, 'FooZoo', 'FooZooGoo', 'FooZooImpl');
+    assertPreferredItems(0, 'fooZoo', 'fooZooGoo', 'fooZooImpl');
   }
 
   public void testUnderscoresDontMakeMatchMiddle() {
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
index 159c7b529246..c37f6396195b 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
@@ -192,7 +192,7 @@ public class NormalCompletionTest extends LightFixtureCompletionTestCase {
   public void testReferenceParameters() throws Exception {
     configureByFile("ReferenceParameters.java");
     assertNotNull(myItems);
-    assert myFixture.lookupElementStrings == ['AAAA', 'AAAB']
+    myFixture.assertPreferredCompletionItems 0, 'AAAA', 'AAAB'
   }
 
   @Override
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyAutoPopupTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyAutoPopupTest.groovy
index 0b428a6347a4..4e60cc2224d0 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyAutoPopupTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyAutoPopupTest.groovy
@@ -228,11 +228,9 @@ Abcdefg <caret>'''
 
   public void testPrivate() {
     CodeInsightSettings.instance.COMPLETION_CASE_SENSITIVE = CodeInsightSettings.NONE
-    myFixture.addClass("package foo; public class PrimaBalerina {}")
     myFixture.configureByText 'a.groovy', 'class Foo { <caret> }'
     type 'pri'
     assert myFixture.lookupElementStrings[0] == 'private'
-    assert !('PrimaBalerina' in myFixture.lookupElementStrings)
   }
 
   public void testFieldTypeNonImported() {
@@ -264,9 +262,9 @@ Abcdefg <caret>'''
     CodeInsightSettings.instance.COMPLETION_CASE_SENSITIVE = CodeInsightSettings.NONE
     myFixture.configureByText 'a.groovy', '<caret>'
     type 'boo'
-    myFixture.assertPreferredCompletionItems 0, 'boolean', 'Boolean'
+    myFixture.assertPreferredCompletionItems 0, 'boolean'
     type '\b\b\bBoo'
-    myFixture.assertPreferredCompletionItems 0, 'Boolean', 'boolean'
+    myFixture.assertPreferredCompletionItems 0, 'Boolean'
   }
 
   public void testPackageQualifier() {