diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 8d0956027f6..108426074ca 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -1530,6 +1530,8 @@
     <filetype.decompiler filetype="kotlin_builtins" implementationClass="com.intellij.psi.impl.compiled.ClassFileDecompiler"/>
 
     <pathMacroExpandableProtocol protocol="kotlin-js-meta"/>
+
+    <deadCode implementation="org.jetbrains.kotlin.idea.inspections.KotlinJUnitStaticEntryPoint"/>
   </extensions>
 
   <xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinJUnitStaticEntryPoint.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinJUnitStaticEntryPoint.kt
new file mode 100644
index 00000000000..9c05b31b6ae
--- /dev/null
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinJUnitStaticEntryPoint.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2010-2016 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.
+ */
+
+@file:Suppress("DEPRECATION")
+
+package org.jetbrains.kotlin.idea.inspections
+
+import com.intellij.codeInsight.AnnotationUtil
+import com.intellij.codeInspection.reference.EntryPoint
+import com.intellij.codeInspection.reference.RefElement
+import com.intellij.execution.junit.JUnitUtil
+import com.intellij.openapi.util.DefaultJDOMExternalizer
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiMethod
+import org.jdom.Element
+
+class KotlinJUnitStaticEntryPoint(private var wasSelected: Boolean = true) : EntryPoint() {
+    override fun getDisplayName() = "JUnit static methods"
+
+    override fun isSelected() = wasSelected
+
+    override fun isEntryPoint(refElement: RefElement, psiElement: PsiElement) = isEntryPoint(psiElement)
+
+    private val staticJUnitAnnotations = listOf(JUnitUtil.BEFORE_CLASS_ANNOTATION_NAME, JUnitUtil.AFTER_CLASS_ANNOTATION_NAME,
+                                                JUnitUtil.PARAMETRIZED_PARAMETERS_ANNOTATION_NAME)
+
+    override fun isEntryPoint(psiElement: PsiElement) = psiElement is PsiMethod &&
+            AnnotationUtil.isAnnotated(psiElement, staticJUnitAnnotations) &&
+            AnnotationUtil.isAnnotated(psiElement, listOf("kotlin.jvm.JvmStatic"))
+
+    override fun readExternal(element: Element) {
+        DefaultJDOMExternalizer.readExternal(this, element)
+    }
+
+    override fun setSelected(selected: Boolean) {
+        this.wasSelected = selected
+    }
+
+    override fun writeExternal(element: Element) {
+        if (!wasSelected) {
+            DefaultJDOMExternalizer.writeExternal(this, element)
+        }
+    }
+}
\ No newline at end of file