diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index dea2ec615ea..3b219163759 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -1981,7 +1981,7 @@
                      language="kotlin"
     />
 
-    <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.RedundantUnitReturnTypeInspection"
+    <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.RedundantUnitReturnTypeInspection"
                      displayName="Redundant 'Unit' return type"
                      groupPath="Kotlin"
                      groupName="Redundant constructs"
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantUnitReturnTypeInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantUnitReturnTypeInspection.kt
new file mode 100644
index 00000000000..d9426d66680
--- /dev/null
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantUnitReturnTypeInspection.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.idea.inspections
+
+import com.intellij.codeInspection.IntentionWrapper
+import com.intellij.codeInspection.ProblemHighlightType
+import com.intellij.codeInspection.ProblemsHolder
+import com.intellij.psi.PsiElementVisitor
+import org.jetbrains.kotlin.descriptors.FunctionDescriptor
+import org.jetbrains.kotlin.idea.intentions.RemoveExplicitTypeIntention
+import org.jetbrains.kotlin.idea.search.usagesSearch.descriptor
+import org.jetbrains.kotlin.psi.KtCodeFragment
+import org.jetbrains.kotlin.psi.KtNamedFunction
+import org.jetbrains.kotlin.psi.KtVisitorVoid
+import org.jetbrains.kotlin.types.typeUtil.isUnit
+
+class RedundantUnitReturnTypeInspection : AbstractKotlinInspection() {
+    override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor {
+        return object : KtVisitorVoid() {
+            override fun visitNamedFunction(function: KtNamedFunction) {
+                super.visitNamedFunction(function)
+                if (function.containingFile is KtCodeFragment) return
+                if ((function.descriptor as? FunctionDescriptor)?.returnType?.isUnit() == true) {
+                    function.typeReference?.typeElement?.let {
+                        holder.registerProblem(it,
+                                               "Redundant 'Unit' return type",
+                                               ProblemHighlightType.LIKE_UNUSED_SYMBOL,
+                                               IntentionWrapper(RemoveExplicitTypeIntention(), function.containingKtFile))
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeIntention.kt
index 67842f5f870..c79f4064c06 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeIntention.kt
@@ -43,25 +43,6 @@ class RemoveSetterParameterTypeInspection : AbstractKotlinInspection() {
     }
 }
 
-class RedundantUnitReturnTypeInspection : AbstractKotlinInspection() {
-    override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor {
-        return object : KtVisitorVoid() {
-            override fun visitNamedFunction(function: KtNamedFunction) {
-                super.visitNamedFunction(function)
-                if (function.containingFile is KtCodeFragment) return
-                if ((function.descriptor as? FunctionDescriptor)?.returnType?.isUnit() ?: false) {
-                    function.typeReference?.typeElement?.let {
-                        holder.registerProblem(it,
-                                               "Redundant 'Unit' return type",
-                                               ProblemHighlightType.LIKE_UNUSED_SYMBOL,
-                                               IntentionWrapper(RemoveExplicitTypeIntention(), function.containingKtFile))
-                    }
-                }
-            }
-        }
-    }
-}
-
 class RemoveExplicitTypeIntention : SelfTargetingRangeIntention<KtCallableDeclaration>(
         KtCallableDeclaration::class.java,
         "Remove explicit type specification"
diff --git a/idea/testData/inspections/redundantUnitReturnType/inspectionData/inspections.test b/idea/testData/inspections/redundantUnitReturnType/inspectionData/inspections.test
index ad41598dff6..770eda29a61 100644
--- a/idea/testData/inspections/redundantUnitReturnType/inspectionData/inspections.test
+++ b/idea/testData/inspections/redundantUnitReturnType/inspectionData/inspections.test
@@ -1 +1 @@
-// INSPECTION_CLASS: org.jetbrains.kotlin.idea.intentions.RedundantUnitReturnTypeInspection
\ No newline at end of file
+// INSPECTION_CLASS: org.jetbrains.kotlin.idea.inspections.RedundantUnitReturnTypeInspection
\ No newline at end of file