diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceAssertBooleanWithAssertEqualityInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceAssertBooleanWithAssertEqualityInspection.kt
index 9f830c62f0d..da93b7e26d2 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceAssertBooleanWithAssertEqualityInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceAssertBooleanWithAssertEqualityInspection.kt
@@ -5,9 +5,12 @@
 
 package org.jetbrains.kotlin.idea.inspections
 
+import com.intellij.codeInsight.actions.OptimizeImportsProcessor
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.idea.core.ShortenReferences
+import org.jetbrains.kotlin.idea.core.replaced
 import org.jetbrains.kotlin.idea.intentions.getCallableDescriptor
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.name.FqName
@@ -31,18 +34,22 @@ class ReplaceAssertBooleanWithAssertEqualityInspection : AbstractApplicabilityBa
 
     override fun applyTo(element: PsiElement, project: Project, editor: Editor?) {
         val expression = element as? KtCallExpression ?: return
-        val condition = expression.valueArguments.first().getArgumentExpression() as? KtBinaryExpression ?: return
+        val valueArguments = expression.valueArguments
+        val condition = valueArguments.firstOrNull()?.getArgumentExpression() as? KtBinaryExpression ?: return
         val left = condition.left ?: return
         val right = condition.right ?: return
         val assertion = expression.replaceableAssertion() ?: return
-        val factory = KtPsiFactory(project)
 
-        if (expression.valueArguments.size == 1) {
-            expression.replace(factory.createExpressionByPattern("$assertion($0, $1)", left, right))
-        } else if (expression.valueArguments.size == 2) {
-            val message = expression.valueArguments[1].getArgumentExpression() ?: return
-            expression.replace(factory.createExpressionByPattern("$assertion($0, $1, $2)", left, right, message))
+        val file = expression.containingKtFile
+        val factory = KtPsiFactory(project)
+        val replaced = if (valueArguments.size == 2) {
+            val message = valueArguments[1].getArgumentExpression() ?: return
+            expression.replaced(factory.createExpressionByPattern("$assertion($0, $1, $2)", left, right, message))
+        } else {
+            expression.replaced(factory.createExpressionByPattern("$assertion($0, $1)", left, right))
         }
+        ShortenReferences.DEFAULT.process(replaced)
+        OptimizeImportsProcessor(project, file).run()
     }
 
     private fun KtCallExpression.replaceableAssertion(): String? {
@@ -51,7 +58,7 @@ class ReplaceAssertBooleanWithAssertEqualityInspection : AbstractApplicabilityBa
             return null
         }
 
-        if (getCallableDescriptor()?.containingDeclaration?.fqNameSafe != FqName("kotlin.test")) {
+        if (getCallableDescriptor()?.containingDeclaration?.fqNameSafe != FqName(kotlinTestPackage)) {
             return null
         }
 
@@ -63,13 +70,15 @@ class ReplaceAssertBooleanWithAssertEqualityInspection : AbstractApplicabilityBa
     }
 
     companion object {
+        private const val kotlinTestPackage = "kotlin.test"
+
         private val assertions = setOf("assertTrue", "assertFalse")
 
         private val assertionMap = mapOf(
-            Pair("assertTrue", KtTokens.EQEQ) to "assertEquals",
-            Pair("assertTrue", KtTokens.EQEQEQ) to "assertSame",
-            Pair("assertFalse", KtTokens.EQEQ) to "assertNotEquals",
-            Pair("assertFalse", KtTokens.EQEQEQ) to "assertNotSame"
+            Pair("assertTrue", KtTokens.EQEQ) to "$kotlinTestPackage.assertEquals",
+            Pair("assertTrue", KtTokens.EQEQEQ) to "$kotlinTestPackage.assertSame",
+            Pair("assertFalse", KtTokens.EQEQ) to "$kotlinTestPackage.assertNotEquals",
+            Pair("assertFalse", KtTokens.EQEQEQ) to "$kotlinTestPackage.assertNotSame"
         )
     }
 }
\ No newline at end of file
diff --git a/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertFalseEQEQ.kt.after b/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertFalseEQEQ.kt.after
index 41fefb75779..b2081fed552 100644
--- a/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertFalseEQEQ.kt.after
+++ b/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertFalseEQEQ.kt.after
@@ -1,6 +1,6 @@
 // RUNTIME_WITH_KOTLIN_TEST
 
-import kotlin.test.*
+import kotlin.test.assertNotEquals
 
 fun foo() {
     val a = "a"
diff --git a/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertFalseEQEQEQ.kt b/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertFalseEQEQEQ.kt
index 836d6313869..c09c398859e 100644
--- a/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertFalseEQEQEQ.kt
+++ b/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertFalseEQEQEQ.kt
@@ -1,6 +1,6 @@
 // RUNTIME_WITH_KOTLIN_TEST
 
-import kotlin.test.*
+import kotlin.test.assertFalse
 
 fun foo() {
     val a = "a"
diff --git a/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertFalseEQEQEQ.kt.after b/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertFalseEQEQEQ.kt.after
index c6f42a57c99..bc27a0b001b 100644
--- a/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertFalseEQEQEQ.kt.after
+++ b/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertFalseEQEQEQ.kt.after
@@ -1,6 +1,6 @@
 // RUNTIME_WITH_KOTLIN_TEST
 
-import kotlin.test.*
+import kotlin.test.assertNotSame
 
 fun foo() {
     val a = "a"
diff --git a/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertFalseWithMessage.kt b/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertFalseWithMessage.kt
index 2e2a1c3caa7..f2d7f089515 100644
--- a/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertFalseWithMessage.kt
+++ b/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertFalseWithMessage.kt
@@ -1,9 +1,15 @@
 // RUNTIME_WITH_KOTLIN_TEST
 
-import kotlin.test.*
+import kotlin.test.assertFalse
 
 fun foo() {
     val a = "a"
     val b = "b"
     assertFalse(<caret>a == b, "message")
+}
+
+fun bar() {
+    val a = "a"
+    val b = "b"
+    assertFalse(a == b, "message")
 }
\ No newline at end of file
diff --git a/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertFalseWithMessage.kt.after b/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertFalseWithMessage.kt.after
index dc5380969bd..53c459b914f 100644
--- a/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertFalseWithMessage.kt.after
+++ b/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertFalseWithMessage.kt.after
@@ -1,9 +1,16 @@
 // RUNTIME_WITH_KOTLIN_TEST
 
-import kotlin.test.*
+import kotlin.test.assertFalse
+import kotlin.test.assertNotEquals
 
 fun foo() {
     val a = "a"
     val b = "b"
     assertNotEquals(a, b, "message")
+}
+
+fun bar() {
+    val a = "a"
+    val b = "b"
+    assertFalse(a == b, "message")
 }
\ No newline at end of file
diff --git a/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertTrueEQEQ.kt.after b/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertTrueEQEQ.kt.after
index 92086e37e9b..17b0e73c368 100644
--- a/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertTrueEQEQ.kt.after
+++ b/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertTrueEQEQ.kt.after
@@ -1,6 +1,6 @@
 // RUNTIME_WITH_KOTLIN_TEST
 
-import kotlin.test.*
+import kotlin.test.assertEquals
 
 fun foo() {
     val a = "a"
diff --git a/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertTrueEQEQEQ.kt.after b/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertTrueEQEQEQ.kt.after
index 0233b2c3c7a..7b6d658ec9c 100644
--- a/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertTrueEQEQEQ.kt.after
+++ b/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertTrueEQEQEQ.kt.after
@@ -1,6 +1,6 @@
 // RUNTIME_WITH_KOTLIN_TEST
 
-import kotlin.test.*
+import kotlin.test.assertSame
 
 fun foo() {
     val a = "a"
diff --git a/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertTrueWithMessage.kt.after b/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertTrueWithMessage.kt.after
index de36b31fc72..e15ae142046 100644
--- a/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertTrueWithMessage.kt.after
+++ b/idea/testData/inspectionsLocal/replaceAssertBooleanWithAssertEquality/assertTrueWithMessage.kt.after
@@ -1,6 +1,6 @@
 // RUNTIME_WITH_KOTLIN_TEST
 
-import kotlin.test.*
+import kotlin.test.assertEquals
 
 fun foo() {
     val a = "a"