diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 3b219163759..98d56d7a786 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -2055,7 +2055,7 @@
                      language="kotlin"
     />
 
-    <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.RemoveSetterParameterTypeInspection"
+    <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.RemoveSetterParameterTypeInspection"
                      displayName="Redundant setter parameter type"
                      groupPath="Kotlin"
                      groupName="Redundant constructs"
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/RemoveSetterParameterTypeInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/RemoveSetterParameterTypeInspection.kt
new file mode 100644
index 00000000000..3a3b0c21145
--- /dev/null
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/RemoveSetterParameterTypeInspection.kt
@@ -0,0 +1,42 @@
+/*
+ * 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.idea.intentions.RemoveExplicitTypeIntention
+import org.jetbrains.kotlin.idea.intentions.isSetterParameter
+import org.jetbrains.kotlin.psi.KtDeclaration
+import org.jetbrains.kotlin.psi.KtParameter
+import org.jetbrains.kotlin.psi.KtVisitorVoid
+
+class RemoveSetterParameterTypeInspection : AbstractKotlinInspection() {
+    override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor {
+        return object : KtVisitorVoid() {
+            override fun visitDeclaration(dcl: KtDeclaration) {
+                if (dcl is KtParameter && dcl.typeReference != null && dcl.isSetterParameter) {
+                    holder.registerProblem(dcl,
+                                           "Redundant setter parameter type",
+                                           ProblemHighlightType.LIKE_UNUSED_SYMBOL,
+                                           IntentionWrapper(RemoveExplicitTypeIntention(), dcl.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 c79f4064c06..b863adbff66 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeIntention.kt
@@ -16,33 +16,15 @@
 
 package org.jetbrains.kotlin.idea.intentions
 
-import com.intellij.codeInspection.*
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
-import com.intellij.psi.PsiElementVisitor
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
-import org.jetbrains.kotlin.idea.inspections.AbstractKotlinInspection
 import org.jetbrains.kotlin.idea.search.usagesSearch.descriptor
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 import org.jetbrains.kotlin.types.typeUtil.isUnit
 
-class RemoveSetterParameterTypeInspection : AbstractKotlinInspection() {
-    override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor {
-        return object : KtVisitorVoid() {
-            override fun visitDeclaration(dcl: KtDeclaration) {
-                if (dcl is KtParameter && dcl.typeReference != null && dcl.isSetterParameter) {
-                    holder.registerProblem(dcl,
-                                           "Redundant setter parameter type",
-                                           ProblemHighlightType.LIKE_UNUSED_SYMBOL,
-                                           IntentionWrapper(RemoveExplicitTypeIntention(), dcl.containingKtFile))
-                }
-            }
-        }
-    }
-}
-
 class RemoveExplicitTypeIntention : SelfTargetingRangeIntention<KtCallableDeclaration>(
         KtCallableDeclaration::class.java,
         "Remove explicit type specification"
@@ -81,4 +63,4 @@ class RemoveExplicitTypeIntention : SelfTargetingRangeIntention<KtCallableDeclar
     }
 }
 
-private val KtParameter.isSetterParameter: Boolean get() = (parent.parent as? KtPropertyAccessor)?.isSetter ?: false
\ No newline at end of file
+internal val KtParameter.isSetterParameter: Boolean get() = (parent.parent as? KtPropertyAccessor)?.isSetter ?: false
\ No newline at end of file
diff --git a/idea/testData/inspections/removeSetterParameterType/inspectionData/inspections.test b/idea/testData/inspections/removeSetterParameterType/inspectionData/inspections.test
index c9fadde5ed8..bd50fe5a85d 100644
--- a/idea/testData/inspections/removeSetterParameterType/inspectionData/inspections.test
+++ b/idea/testData/inspections/removeSetterParameterType/inspectionData/inspections.test
@@ -1 +1 @@
-// INSPECTION_CLASS: org.jetbrains.kotlin.idea.intentions.RemoveSetterParameterTypeInspection
+// INSPECTION_CLASS: org.jetbrains.kotlin.idea.inspections.RemoveSetterParameterTypeInspection