diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt
index fa6e301127f..0c82333a23b 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt
@@ -72,8 +72,7 @@ object KeywordCompletion {
             FINALLY_KEYWORD to "fun foo() { try {\n}\nfinally{\ncaret\n}",
             DO_KEYWORD to "fun foo() { do {\ncaret\n}",
             INIT_KEYWORD to "class C { init {\ncaret\n}",
-            CONSTRUCTOR_KEYWORD to "class C { constructor(caret)",
-            COMPANION_KEYWORD to "class C { companion object {\ncaret\n}"
+            CONSTRUCTOR_KEYWORD to "class C { constructor(caret)"
     )
 
     private val NO_SPACE_AFTER = listOf(THIS_KEYWORD,
diff --git a/idea/idea-completion/testData/handlers/keywords/CompanionObject.kt.after b/idea/idea-completion/testData/handlers/keywords/CompanionObject.kt.after
index 44bca97a302..bc65038821d 100644
--- a/idea/idea-completion/testData/handlers/keywords/CompanionObject.kt.after
+++ b/idea/idea-completion/testData/handlers/keywords/CompanionObject.kt.after
@@ -1,5 +1,3 @@
 class C {
-    companion object {
-        <caret>
-    }
+    companion object<caret>
 }
\ No newline at end of file
diff --git a/idea/idea-completion/testData/keywords/AfterClassProperty.kt b/idea/idea-completion/testData/keywords/AfterClassProperty.kt
index 546004a1b2b..3b91f33681d 100644
--- a/idea/idea-completion/testData/keywords/AfterClassProperty.kt
+++ b/idea/idea-completion/testData/keywords/AfterClassProperty.kt
@@ -29,7 +29,7 @@ class MouseMovedEventArgs
 // EXIST:  var
 // EXIST:  constructor
 // EXIST:  init
-// EXIST: { itemText: "companion object", tailText: " {...}" }
+// EXIST:  companion object
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
diff --git a/idea/idea-completion/testData/keywords/AfterFuns.kt b/idea/idea-completion/testData/keywords/AfterFuns.kt
index 088ea6d7b06..72d1124b00c 100644
--- a/idea/idea-completion/testData/keywords/AfterFuns.kt
+++ b/idea/idea-completion/testData/keywords/AfterFuns.kt
@@ -28,7 +28,7 @@ class A {
 // EXIST:  var
 // EXIST:  constructor
 // EXIST:  init
-// EXIST: { itemText: "companion object", tailText: " {...}" }
+// EXIST:  companion object
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
diff --git a/idea/idea-completion/testData/keywords/CompanionObjectBeforeObject.kt b/idea/idea-completion/testData/keywords/CompanionObjectBeforeObject.kt
index de17a952034..336cb258073 100644
--- a/idea/idea-completion/testData/keywords/CompanionObjectBeforeObject.kt
+++ b/idea/idea-completion/testData/keywords/CompanionObjectBeforeObject.kt
@@ -3,4 +3,4 @@ class TestClass {
     object O {}
 }
 
-// EXIST: { itemText: "companion object", tailText: " {...}" }
+// EXIST: companion object
diff --git a/idea/idea-completion/testData/keywords/InClassBeforeFun.kt b/idea/idea-completion/testData/keywords/InClassBeforeFun.kt
index b85e3b547d3..dd2fc9bc8c0 100644
--- a/idea/idea-completion/testData/keywords/InClassBeforeFun.kt
+++ b/idea/idea-completion/testData/keywords/InClassBeforeFun.kt
@@ -26,7 +26,7 @@ public class Test {
 // EXIST:  var
 // EXIST:  constructor
 // EXIST:  init
-// EXIST: { itemText: "companion object", tailText: " {...}" }
+// EXIST:  companion object
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
diff --git a/idea/idea-completion/testData/keywords/InClassScope.kt b/idea/idea-completion/testData/keywords/InClassScope.kt
index d93ad5a1fef..95243e84462 100644
--- a/idea/idea-completion/testData/keywords/InClassScope.kt
+++ b/idea/idea-completion/testData/keywords/InClassScope.kt
@@ -20,7 +20,7 @@ class TestClass {
 // EXIST:  var
 // EXIST:  constructor
 // EXIST:  init
-// EXIST:  { itemText: "companion object", tailText: " {...}" }
+// EXIST:  companion object
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
diff --git a/idea/idea-completion/testData/keywords/InEnumScope2.kt b/idea/idea-completion/testData/keywords/InEnumScope2.kt
index b61f79a002e..1abd8c62bd7 100644
--- a/idea/idea-completion/testData/keywords/InEnumScope2.kt
+++ b/idea/idea-completion/testData/keywords/InEnumScope2.kt
@@ -14,7 +14,7 @@ enum class Test {
 // EXIST:  private
 // EXIST:  protected
 // EXIST:  public
-// EXIST: { itemText: "companion object", tailText: " {...}" }
+// EXIST:  companion object
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
diff --git a/idea/idea-completion/testData/keywords/InInterfaceScope.kt b/idea/idea-completion/testData/keywords/InInterfaceScope.kt
index 3ee6f264ee9..2ad6488304f 100644
--- a/idea/idea-completion/testData/keywords/InInterfaceScope.kt
+++ b/idea/idea-completion/testData/keywords/InInterfaceScope.kt
@@ -16,7 +16,7 @@ interface Test {
 // EXIST:  var
 // EXIST:  constructor
 // EXIST:  init
-// EXIST: { itemText: "companion object", tailText: " {...}" }
+// EXIST:  companion object
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
diff --git a/idea/idea-completion/testData/keywords/PropertyAccessors.kt b/idea/idea-completion/testData/keywords/PropertyAccessors.kt
index 34f65a51e0c..d1758778c9c 100644
--- a/idea/idea-completion/testData/keywords/PropertyAccessors.kt
+++ b/idea/idea-completion/testData/keywords/PropertyAccessors.kt
@@ -28,7 +28,7 @@ class Some {
 // EXIST:  var
 // EXIST:  constructor
 // EXIST:  init
-// EXIST: { itemText: "companion object", tailText: " {...}" }
+// EXIST:  companion object
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
diff --git a/idea/idea-completion/testData/keywords/PropertyAccessors2.kt b/idea/idea-completion/testData/keywords/PropertyAccessors2.kt
index c9ff6e1f7d6..9f01eddbc37 100644
--- a/idea/idea-completion/testData/keywords/PropertyAccessors2.kt
+++ b/idea/idea-completion/testData/keywords/PropertyAccessors2.kt
@@ -28,7 +28,7 @@ class Some {
 // EXIST:  var
 // EXIST:  constructor
 // EXIST:  init
-// EXIST: { itemText: "companion object", tailText: " {...}" }
+// EXIST:  companion object
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
diff --git a/idea/idea-completion/testData/keywords/PropertySetter.kt b/idea/idea-completion/testData/keywords/PropertySetter.kt
index 01217882bfb..ce9344613a1 100644
--- a/idea/idea-completion/testData/keywords/PropertySetter.kt
+++ b/idea/idea-completion/testData/keywords/PropertySetter.kt
@@ -26,7 +26,7 @@ class Some {
 // EXIST:  var
 // EXIST:  constructor
 // EXIST:  init
-// EXIST: { itemText: "companion object", tailText: " {...}" }
+// EXIST:  companion object
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class