diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CamelHumpMatcher.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CamelHumpMatcher.java
index b18be5f4c57b..fb274985ebf9 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CamelHumpMatcher.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CamelHumpMatcher.java
@@ -4,6 +4,7 @@ package com.intellij.codeInsight.completion.impl;
 import com.intellij.codeInsight.CodeInsightSettings;
 import com.intellij.codeInsight.completion.PrefixMatcher;
 import com.intellij.codeInsight.lookup.LookupElement;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.codeStyle.NameUtil;
@@ -75,7 +76,7 @@ public class CamelHumpMatcher extends PrefixMatcher {
   }
 
   public static String applyMiddleMatching(String prefix) {
-    if (Registry.is("ide.completion.middle.matching") && !prefix.isEmpty()) {
+    if (Registry.is("ide.completion.middle.matching") && !prefix.isEmpty() && !ApplicationManager.getApplication().isUnitTestMode()) {
       return " " + StringUtil.replace(prefix, ".", ". ").trim();
     }
     return prefix;
diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties
index 51db7ac1bef9..bedc8621d1f4 100644
--- a/platform/platform-resources-en/src/misc/registry.properties
+++ b/platform/platform-resources-en/src/misc/registry.properties
@@ -195,7 +195,7 @@ projectView.hide.dot.idea=true
 show.live.templates.in.completion=false
 documentation.component.editor.font=false
 
-ide.completion.middle.matching=false
+ide.completion.middle.matching=true
 ide.completion.middle.matching.description=Suggest items in completion that contain the entered string somewhere in the middle
 
 ide.goto.middle.matching=false