diff --git a/idea/resources/inspectionDescriptions/TestFunctionName.html b/idea/resources/inspectionDescriptions/TestFunctionName.html
new file mode 100644
index 00000000000..915355e253c
--- /dev/null
+++ b/idea/resources/inspectionDescriptions/TestFunctionName.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+Reports test function names that do not follow the recommended naming conventions.
+</body>
+</html>
\ No newline at end of file
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index bf9a50f0b32..8d6dc28f4b5 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -2392,6 +2392,14 @@
                      displayName="Function naming convention"
                      level="WEAK WARNING"/>
 
+    <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.TestFunctionNameInspection"
+                     language="kotlin"
+                     groupPath="Kotlin"
+                     groupName="Naming conventions"
+                     enabledByDefault="true"
+                     displayName="Test function naming convention"
+                     level="WEAK WARNING"/>
+
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.PropertyNameInspection"
                      language="kotlin"
                      groupPath="Kotlin"
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/NamingConventionInspections.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/NamingConventionInspections.kt
index bc817feb0e4..67e1c703d9f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/NamingConventionInspections.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/NamingConventionInspections.kt
@@ -127,7 +127,27 @@ class FunctionNameInspection : NamingConventionInspection(
     override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor {
         return object : KtVisitorVoid() {
             override fun visitNamedFunction(function: KtNamedFunction) {
-                if (TestUtils.isInTestSourceContent(function) && function.nameIdentifier?.text?.startsWith("`") == true) {
+                if (TestUtils.isInTestSourceContent(function)) {
+                    return
+                }
+                verifyName(function, holder)
+            }
+        }
+    }
+}
+
+class TestFunctionNameInspection : NamingConventionInspection(
+    "Test function",
+    "[a-z][A-Za-z_\\d]*",
+    START_LOWER
+) {
+    override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor {
+        return object : KtVisitorVoid() {
+            override fun visitNamedFunction(function: KtNamedFunction) {
+                if (!TestUtils.isInTestSourceContent(function)) {
+                    return
+                }
+                if (function.nameIdentifier?.text?.startsWith("`") == true) {
                     return
                 }
                 verifyName(function, holder)
