diff --git a/plugins/android/testData/dom/animator/tn.xml b/plugins/android/testData/dom/animator/tn.xml
index 08b12f84389d..d140b3e3aa5f 100644
--- a/plugins/android/testData/dom/animator/tn.xml
+++ b/plugins/android/testData/dom/animator/tn.xml
@@ -1,3 +1,3 @@
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-  <anima<caret>
+<set>
+  <objectAnima<caret>
 </set>
\ No newline at end of file
diff --git a/plugins/android/testData/dom/animator/tn_after.xml b/plugins/android/testData/dom/animator/tn_after.xml
index fc3a90601664..4b3cf6678b1d 100644
--- a/plugins/android/testData/dom/animator/tn_after.xml
+++ b/plugins/android/testData/dom/animator/tn_after.xml
@@ -1,3 +1,3 @@
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-  <animator
+<set>
+  <objectAnimator
 </set>
\ No newline at end of file
diff --git a/plugins/android/testData/dom/layout/commonPrefixIdea63531.xml b/plugins/android/testData/dom/layout/commonPrefixIdea63531.xml
index 54487a0754d5..dc847c6057d8 100644
--- a/plugins/android/testData/dom/layout/commonPrefixIdea63531.xml
+++ b/plugins/android/testData/dom/layout/commonPrefixIdea63531.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView lay<caret>
+<LinearLayout>
+    <ImageView layou<caret>
 </LinearLayout>
 
diff --git a/plugins/android/testData/dom/layout/commonPrefixIdea63531_after.xml b/plugins/android/testData/dom/layout/commonPrefixIdea63531_after.xml
index 3d464ae0a3f5..bba0b9ce06d7 100644
--- a/plugins/android/testData/dom/layout/commonPrefixIdea63531_after.xml
+++ b/plugins/android/testData/dom/layout/commonPrefixIdea63531_after.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:lay<caret>
+    <ImageView android:layout_<caret>
 </LinearLayout>
 
diff --git a/plugins/android/testData/dom/layout/tn11.xml b/plugins/android/testData/dom/layout/tn11.xml
index 049791003b8f..38f423fa6026 100644
--- a/plugins/android/testData/dom/layout/tn11.xml
+++ b/plugins/android/testData/dom/layout/tn11.xml
@@ -1,3 +1,3 @@
 <LinearLayout>
-    <android.widget.Butt<caret>
+    <android.widget.RadioBut<caret>
 </LinearLayout>
\ No newline at end of file
diff --git a/plugins/android/testData/dom/layout/tn11_after.xml b/plugins/android/testData/dom/layout/tn11_after.xml
index 84a50e48b7fd..ccb498fea843 100644
--- a/plugins/android/testData/dom/layout/tn11_after.xml
+++ b/plugins/android/testData/dom/layout/tn11_after.xml
@@ -1,3 +1,3 @@
 <LinearLayout>
-    <android.widget.Button
+    <android.widget.RadioButton
 </LinearLayout>
\ No newline at end of file
diff --git a/plugins/android/testData/dom/layout/tn7.xml b/plugins/android/testData/dom/layout/tn7.xml
index 5f1cce2cec97..a5786a66ee69 100644
--- a/plugins/android/testData/dom/layout/tn7.xml
+++ b/plugins/android/testData/dom/layout/tn7.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<android.widget.Butt<caret> xmlns:android="http://schemas.android.com/apk/res/android">
\ No newline at end of file
+<android.widget.RadioButt<caret> xmlns:android="http://schemas.android.com/apk/res/android">
\ No newline at end of file
diff --git a/plugins/android/testData/dom/layout/tn7_after.xml b/plugins/android/testData/dom/layout/tn7_after.xml
index 634ac574c361..a1ef56f658eb 100644
--- a/plugins/android/testData/dom/layout/tn7_after.xml
+++ b/plugins/android/testData/dom/layout/tn7_after.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<android.widget.Button xmlns:android="http://schemas.android.com/apk/res/android">
\ No newline at end of file
+<android.widget.RadioButton>
\ No newline at end of file
diff --git a/plugins/android/testData/dom/layout/tn9.xml b/plugins/android/testData/dom/layout/tn9.xml
index 8676f1408d46..d13a66af949a 100644
--- a/plugins/android/testData/dom/layout/tn9.xml
+++ b/plugins/android/testData/dom/layout/tn9.xml
@@ -1,3 +1,3 @@
 <LinearLayout>
-    <Butt<caret>
+    <RadioButt<caret>
 </LinearLayout>
\ No newline at end of file
diff --git a/plugins/android/testData/dom/layout/tn9_after.xml b/plugins/android/testData/dom/layout/tn9_after.xml
index d1af13841cae..e9cd9b74d661 100644
--- a/plugins/android/testData/dom/layout/tn9_after.xml
+++ b/plugins/android/testData/dom/layout/tn9_after.xml
@@ -1,3 +1,3 @@
 <LinearLayout>
-    <Button
+    <RadioButton
 </LinearLayout>
\ No newline at end of file
diff --git a/plugins/android/testData/dom/resources/attrs1.xml b/plugins/android/testData/dom/resources/attrs1.xml
index c0274b825b88..aeba1330b7f4 100644
--- a/plugins/android/testData/dom/resources/attrs1.xml
+++ b/plugins/android/testData/dom/resources/attrs1.xml
@@ -2,6 +2,6 @@
 
 <resources>
      <declare-styleable name="LabelView">
-        <attr name="text" format="s<caret>"/>
+        <attr name="text" format="st<caret>"/>
     </declare-styleable>
 </resources>
diff --git a/plugins/android/testSrc/org/jetbrains/android/dom/AndroidAnimatorDomTest.java b/plugins/android/testSrc/org/jetbrains/android/dom/AndroidAnimatorDomTest.java
index 12827802f54d..0de83d10b752 100644
--- a/plugins/android/testSrc/org/jetbrains/android/dom/AndroidAnimatorDomTest.java
+++ b/plugins/android/testSrc/org/jetbrains/android/dom/AndroidAnimatorDomTest.java
@@ -17,7 +17,6 @@
 package org.jetbrains.android.dom;
 
 import com.android.sdklib.SdkConstants;
-import com.intellij.codeInsight.completion.impl.CamelHumpMatcher;
 
 /**
  * @author Eugene.Kudelevsky
@@ -43,7 +42,6 @@ public class AndroidAnimatorDomTest extends AndroidDomTest {
   }
 
   public void testTagNames() throws Throwable {
-    CamelHumpMatcher.forceStartMatching(getTestRootDisposable());
     toTestCompletion("tn.xml", "tn_after.xml");
   }
 
diff --git a/plugins/android/testSrc/org/jetbrains/android/dom/AndroidLayoutDomTest.java b/plugins/android/testSrc/org/jetbrains/android/dom/AndroidLayoutDomTest.java
index 229f9af2442b..910276c02a57 100644
--- a/plugins/android/testSrc/org/jetbrains/android/dom/AndroidLayoutDomTest.java
+++ b/plugins/android/testSrc/org/jetbrains/android/dom/AndroidLayoutDomTest.java
@@ -3,7 +3,6 @@ package org.jetbrains.android.dom;
 import com.android.sdklib.SdkConstants;
 import com.intellij.codeInsight.TargetElementUtilBase;
 import com.intellij.codeInsight.completion.CompletionType;
-import com.intellij.codeInsight.completion.impl.CamelHumpMatcher;
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.openapi.application.ApplicationManager;
@@ -33,7 +32,6 @@ public class AndroidLayoutDomTest extends AndroidDomTest {
   @Override
   public void setUp() throws Exception {
     super.setUp();
-    CamelHumpMatcher.forceStartMatching(getTestRootDisposable());
     myFixture.copyFileToProject(SdkConstants.FN_ANDROID_MANIFEST_XML, SdkConstants.FN_ANDROID_MANIFEST_XML);
   }
 
@@ -63,7 +61,10 @@ public class AndroidLayoutDomTest extends AndroidDomTest {
   }
 
   public void testCommonPrefixIdea63531() throws Throwable {
-    toTestCompletion("commonPrefixIdea63531.xml", "commonPrefixIdea63531_after.xml");
+    VirtualFile file = copyFileToProject("commonPrefixIdea63531.xml");
+    myFixture.configureFromExistingVirtualFile(file);
+    myFixture.complete(CompletionType.BASIC);
+    myFixture.checkResultByFile(testFolder + '/' + "commonPrefixIdea63531_after.xml");
   }
 
   public void testHighlighting() throws Throwable {
@@ -220,7 +221,11 @@ public class AndroidLayoutDomTest extends AndroidDomTest {
   }
 
   public void testTagNameCompletion1() throws Throwable {
-    toTestCompletion("tn1.xml", "tn1_after.xml");
+    VirtualFile file = copyFileToProject("tn1.xml");
+    myFixture.configureFromExistingVirtualFile(file);
+    myFixture.complete(CompletionType.BASIC);
+    myFixture.type('\n');
+    myFixture.checkResultByFile(testFolder + '/' + "tn1_after.xml");
   }
 
   public void testFlagCompletion() throws Throwable {
@@ -278,7 +283,10 @@ public class AndroidLayoutDomTest extends AndroidDomTest {
   }
 
   public void testTagNameCompletion3() throws Throwable {
-    doTestCompletionVariants("tn3.xml", "View", "ViewAnimator", "ViewFlipper", "ViewStub", "ViewSwitcher");
+    doTestCompletionVariants("tn3.xml", "AdapterViewFlipper", "AppWidgetHostView", "AutoCompleteTextView", "CalendarView",
+                             "CheckedTextView", "ExpandableListView", "GridView", "HorizontalScrollView", "ImageView", "KeyboardView",
+                             "ListView", "MultiAutoCompleteTextView", "ScrollView", "SearchView", "StackView", "SurfaceView", "TextView",
+                             "TextureView", "VideoView", "View", "ViewAnimator", "ViewFlipper", "ViewStub", "ViewSwitcher");
   }
 
   /*public void testTagNameCompletion4() throws Throwable {
@@ -375,7 +383,8 @@ public class AndroidLayoutDomTest extends AndroidDomTest {
   }
 
   public void testTextViewRootTag_IDEA_62889() throws Throwable {
-    doTestCompletionVariants("textViewRootTag.xml", "TextView", "TextureView");
+    doTestCompletionVariants("textViewRootTag.xml", "AutoCompleteTextView", "CheckedTextView", "MultiAutoCompleteTextView", "TextView",
+                             "TextureView");
   }
 
   public void testRequestFocus() throws Throwable {
diff --git a/plugins/android/testSrc/org/jetbrains/android/dom/AndroidManifestDomTest.java b/plugins/android/testSrc/org/jetbrains/android/dom/AndroidManifestDomTest.java
index b630df8a7149..e6bdbc066778 100644
--- a/plugins/android/testSrc/org/jetbrains/android/dom/AndroidManifestDomTest.java
+++ b/plugins/android/testSrc/org/jetbrains/android/dom/AndroidManifestDomTest.java
@@ -1,7 +1,6 @@
 package org.jetbrains.android.dom;
 
 import com.android.sdklib.SdkConstants;
-import com.intellij.codeInsight.completion.impl.CamelHumpMatcher;
 import org.jetbrains.android.inspections.AndroidElementNotAllowedInspection;
 import org.jetbrains.android.inspections.AndroidUnknownAttributeInspection;
 
@@ -23,8 +22,7 @@ public class AndroidManifestDomTest extends AndroidDomTest {
   }
 
   public void testAttributeNameCompletion2() throws Throwable {
-    CamelHumpMatcher.forceStartMatching(getTestRootDisposable());
-    doTestCompletionVariants("an2.xml", "debuggable", "description");
+    doTestCompletionVariants("an2.xml", "debuggable", "description", "hasCode");
   }
 
   public void testAttributeNameCompletion3() throws Throwable {
diff --git a/plugins/android/testSrc/org/jetbrains/android/dom/AndroidValueResourcesTest.java b/plugins/android/testSrc/org/jetbrains/android/dom/AndroidValueResourcesTest.java
index 9c0d0a54d0a7..0a783435ffea 100644
--- a/plugins/android/testSrc/org/jetbrains/android/dom/AndroidValueResourcesTest.java
+++ b/plugins/android/testSrc/org/jetbrains/android/dom/AndroidValueResourcesTest.java
@@ -18,7 +18,6 @@ package org.jetbrains.android.dom;
 
 import com.android.sdklib.SdkConstants;
 import com.intellij.codeInsight.completion.CompletionType;
-import com.intellij.codeInsight.completion.impl.CamelHumpMatcher;
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.codeInsight.navigation.actions.GotoDeclarationAction;
@@ -89,7 +88,6 @@ public class AndroidValueResourcesTest extends AndroidDomTest {
   }
 
   public void testAttrFormatCompletion() throws Throwable {
-    CamelHumpMatcher.forceStartMatching(getTestRootDisposable());
     toTestCompletion("attrs1.xml", "attrs1_after.xml");
   }
 
diff --git a/plugins/android/testSrc/org/jetbrains/android/dom/AndroidXmlResourcesDomTest.java b/plugins/android/testSrc/org/jetbrains/android/dom/AndroidXmlResourcesDomTest.java
index bca9c7a65591..1c817a740f00 100644
--- a/plugins/android/testSrc/org/jetbrains/android/dom/AndroidXmlResourcesDomTest.java
+++ b/plugins/android/testSrc/org/jetbrains/android/dom/AndroidXmlResourcesDomTest.java
@@ -18,7 +18,6 @@ package org.jetbrains.android.dom;
 
 import com.android.sdklib.SdkConstants;
 import com.intellij.codeInsight.completion.CompletionType;
-import com.intellij.codeInsight.completion.impl.CamelHumpMatcher;
 import com.intellij.openapi.vfs.VirtualFile;
 
 import java.util.List;
@@ -51,7 +50,6 @@ public class AndroidXmlResourcesDomTest extends AndroidDomTest {
   }
 
   public void testPreferenceChildrenCompletion() throws Throwable {
-    CamelHumpMatcher.forceStartMatching(getTestRootDisposable());
     toTestCompletion("pref2.xml", "pref2_after.xml");
   }
 
diff --git a/plugins/android/testSrc/org/jetbrains/android/intentions/AndroidAddStringResourceActionTest.java b/plugins/android/testSrc/org/jetbrains/android/intentions/AndroidAddStringResourceActionTest.java
index 2fc282828aca..64528f23d692 100644
--- a/plugins/android/testSrc/org/jetbrains/android/intentions/AndroidAddStringResourceActionTest.java
+++ b/plugins/android/testSrc/org/jetbrains/android/intentions/AndroidAddStringResourceActionTest.java
@@ -1,6 +1,5 @@
 package org.jetbrains.android.intentions;
 
-import com.intellij.codeInsight.completion.impl.CamelHumpMatcher;
 import com.intellij.codeInsight.template.TemplateManager;
 import com.intellij.codeInsight.template.impl.TemplateManagerImpl;
 import com.intellij.openapi.actionSystem.IdeActions;
@@ -37,7 +36,6 @@ public class AndroidAddStringResourceActionTest extends AndroidTestCase {
   }
 
   public void test1() throws IOException {
-    CamelHumpMatcher.forceStartMatching(getTestRootDisposable());
     doTest();
   }
 
@@ -84,7 +82,6 @@ public class AndroidAddStringResourceActionTest extends AndroidTestCase {
   }
 
   public void test11() throws IOException {
-    CamelHumpMatcher.forceStartMatching(getTestRootDisposable());
     doTest(new Runnable() {
       @Override
       public void run() {