diff --git a/compiler/testData/diagnostics/tests/tailRecursions/functionWithNoTails.kt b/compiler/testData/diagnostics/tests/tailCalls/functionWithNoTails.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/tailRecursions/functionWithNoTails.kt
rename to compiler/testData/diagnostics/tests/tailCalls/functionWithNoTails.kt
diff --git a/compiler/testData/diagnostics/tests/tailRecursions/functionWithNonTailRecursions.kt b/compiler/testData/diagnostics/tests/tailCalls/functionWithNonTailRecursions.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/tailRecursions/functionWithNonTailRecursions.kt
rename to compiler/testData/diagnostics/tests/tailCalls/functionWithNonTailRecursions.kt
diff --git a/compiler/testData/diagnostics/tests/tailRecursions/functionWithoutAnnotation.kt b/compiler/testData/diagnostics/tests/tailCalls/functionWithoutAnnotation.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/tailRecursions/functionWithoutAnnotation.kt
rename to compiler/testData/diagnostics/tests/tailCalls/functionWithoutAnnotation.kt
diff --git a/compiler/testData/diagnostics/tests/tailRecursions/tailRecursionInFinally.kt b/compiler/testData/diagnostics/tests/tailCalls/tailRecursionInFinally.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/tailRecursions/tailRecursionInFinally.kt
rename to compiler/testData/diagnostics/tests/tailCalls/tailRecursionInFinally.kt
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
index 887c35601d8..681e2b7a6e6 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -33,7 +33,7 @@ import org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve;
 @InnerTestClasses({JetDiagnosticsTestGenerated.Tests.class, JetDiagnosticsTestGenerated.Script.class})
 public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEagerResolve {
     @TestMetadata("compiler/testData/diagnostics/tests")
-    @InnerTestClasses({Tests.Annotations.class, Tests.BackingField.class, Tests.CallableReference.class, Tests.Cast.class, Tests.CheckArguments.class, Tests.ClassObjects.class, Tests.ControlFlowAnalysis.class, Tests.ControlStructures.class, Tests.DataClasses.class, Tests.DataFlow.class, Tests.DataFlowInfoTraversal.class, Tests.DeclarationChecks.class, Tests.DelegatedProperty.class, Tests.Deparenthesize.class, Tests.Enum.class, Tests.Evaluate.class, Tests.Extensions.class, Tests.FunctionLiterals.class, Tests.Generics.class, Tests.IncompleteCode.class, Tests.Inference.class, Tests.Infos.class, Tests.Inline.class, Tests.Inner.class, Tests.J_k.class, Tests.Jdk_annotations.class, Tests.Library.class, Tests.NullabilityAndAutoCasts.class, Tests.NullableTypes.class, Tests.Numbers.class, Tests.Objects.class, Tests.OperatorsOverloading.class, Tests.Overload.class, Tests.Override.class, Tests.Recovery.class, Tests.Redeclarations.class, Tests.Regressions.class, Tests.Resolve.class, Tests.Scopes.class, Tests.SenselessComparison.class, Tests.Shadowing.class, Tests.SmartCasts.class, Tests.Substitutions.class, Tests.Subtyping.class, Tests.Suppress.class, Tests.TailRecursions.class, Tests.ThisAndSuper.class, Tests.Varargs.class, Tests.When.class})
+    @InnerTestClasses({Tests.Annotations.class, Tests.BackingField.class, Tests.CallableReference.class, Tests.Cast.class, Tests.CheckArguments.class, Tests.ClassObjects.class, Tests.ControlFlowAnalysis.class, Tests.ControlStructures.class, Tests.DataClasses.class, Tests.DataFlow.class, Tests.DataFlowInfoTraversal.class, Tests.DeclarationChecks.class, Tests.DelegatedProperty.class, Tests.Deparenthesize.class, Tests.Enum.class, Tests.Evaluate.class, Tests.Extensions.class, Tests.FunctionLiterals.class, Tests.Generics.class, Tests.IncompleteCode.class, Tests.Inference.class, Tests.Infos.class, Tests.Inline.class, Tests.Inner.class, Tests.J_k.class, Tests.Jdk_annotations.class, Tests.Library.class, Tests.NullabilityAndAutoCasts.class, Tests.NullableTypes.class, Tests.Numbers.class, Tests.Objects.class, Tests.OperatorsOverloading.class, Tests.Overload.class, Tests.Override.class, Tests.Recovery.class, Tests.Redeclarations.class, Tests.Regressions.class, Tests.Resolve.class, Tests.Scopes.class, Tests.SenselessComparison.class, Tests.Shadowing.class, Tests.SmartCasts.class, Tests.Substitutions.class, Tests.Subtyping.class, Tests.Suppress.class, Tests.TailCalls.class, Tests.ThisAndSuper.class, Tests.Varargs.class, Tests.When.class})
     public static class Tests extends AbstractDiagnosticsTestWithEagerResolve {
         @TestMetadata("Abstract.kt")
         public void testAbstract() throws Exception {
@@ -6456,30 +6456,30 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
             }
         }
         
-        @TestMetadata("compiler/testData/diagnostics/tests/tailRecursions")
-        public static class TailRecursions extends AbstractDiagnosticsTestWithEagerResolve {
-            public void testAllFilesPresentInTailRecursions() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/tailRecursions"), Pattern.compile("^(.+)\\.kt$"), true);
+        @TestMetadata("compiler/testData/diagnostics/tests/tailCalls")
+        public static class TailCalls extends AbstractDiagnosticsTestWithEagerResolve {
+            public void testAllFilesPresentInTailCalls() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/tailCalls"), Pattern.compile("^(.+)\\.kt$"), true);
             }
             
             @TestMetadata("functionWithNoTails.kt")
             public void testFunctionWithNoTails() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/tailRecursions/functionWithNoTails.kt");
+                doTest("compiler/testData/diagnostics/tests/tailCalls/functionWithNoTails.kt");
             }
             
             @TestMetadata("functionWithNonTailRecursions.kt")
             public void testFunctionWithNonTailRecursions() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/tailRecursions/functionWithNonTailRecursions.kt");
+                doTest("compiler/testData/diagnostics/tests/tailCalls/functionWithNonTailRecursions.kt");
             }
             
             @TestMetadata("functionWithoutAnnotation.kt")
             public void testFunctionWithoutAnnotation() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/tailRecursions/functionWithoutAnnotation.kt");
+                doTest("compiler/testData/diagnostics/tests/tailCalls/functionWithoutAnnotation.kt");
             }
             
             @TestMetadata("tailRecursionInFinally.kt")
             public void testTailRecursionInFinally() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/tailRecursions/tailRecursionInFinally.kt");
+                doTest("compiler/testData/diagnostics/tests/tailCalls/tailRecursionInFinally.kt");
             }
             
         }
@@ -6716,7 +6716,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
             suite.addTestSuite(Substitutions.class);
             suite.addTestSuite(Subtyping.class);
             suite.addTest(Suppress.innerSuite());
-            suite.addTestSuite(TailRecursions.class);
+            suite.addTestSuite(TailCalls.class);
             suite.addTestSuite(ThisAndSuper.class);
             suite.addTestSuite(Varargs.class);
             suite.addTestSuite(When.class);