diff --git a/Tests/Descriptor/AbstractDescriptorTest.php b/Tests/Descriptor/AbstractDescriptorTestCase.php
similarity index 98%
rename from Tests/Descriptor/AbstractDescriptorTest.php
rename to Tests/Descriptor/AbstractDescriptorTestCase.php
index 55150c3a6..6e0caab54 100644
--- a/Tests/Descriptor/AbstractDescriptorTest.php
+++ b/Tests/Descriptor/AbstractDescriptorTestCase.php
@@ -19,7 +19,7 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\BufferedOutput;
 
-abstract class AbstractDescriptorTest extends TestCase
+abstract class AbstractDescriptorTestCase extends TestCase
 {
     /** @dataProvider getDescribeInputArgumentTestData */
     public function testDescribeInputArgument(InputArgument $argument, $expectedDescription)
diff --git a/Tests/Descriptor/JsonDescriptorTest.php b/Tests/Descriptor/JsonDescriptorTest.php
index 1fbc2e90b..648476dc4 100644
--- a/Tests/Descriptor/JsonDescriptorTest.php
+++ b/Tests/Descriptor/JsonDescriptorTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\Console\Descriptor\JsonDescriptor;
 
-class JsonDescriptorTest extends AbstractDescriptorTest
+class JsonDescriptorTest extends AbstractDescriptorTestCase
 {
     protected function getDescriptor()
     {
diff --git a/Tests/Descriptor/MarkdownDescriptorTest.php b/Tests/Descriptor/MarkdownDescriptorTest.php
index 5067e4c51..295c7acea 100644
--- a/Tests/Descriptor/MarkdownDescriptorTest.php
+++ b/Tests/Descriptor/MarkdownDescriptorTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Console\Tests\Fixtures\DescriptorApplicationMbString;
 use Symfony\Component\Console\Tests\Fixtures\DescriptorCommandMbString;
 
-class MarkdownDescriptorTest extends AbstractDescriptorTest
+class MarkdownDescriptorTest extends AbstractDescriptorTestCase
 {
     public static function getDescribeCommandTestData()
     {
diff --git a/Tests/Descriptor/TextDescriptorTest.php b/Tests/Descriptor/TextDescriptorTest.php
index c0e5942e9..c576ac2d7 100644
--- a/Tests/Descriptor/TextDescriptorTest.php
+++ b/Tests/Descriptor/TextDescriptorTest.php
@@ -16,7 +16,7 @@
 use Symfony\Component\Console\Tests\Fixtures\DescriptorApplicationMbString;
 use Symfony\Component\Console\Tests\Fixtures\DescriptorCommandMbString;
 
-class TextDescriptorTest extends AbstractDescriptorTest
+class TextDescriptorTest extends AbstractDescriptorTestCase
 {
     public static function getDescribeCommandTestData()
     {
diff --git a/Tests/Descriptor/XmlDescriptorTest.php b/Tests/Descriptor/XmlDescriptorTest.php
index d50ac12dd..98f92991a 100644
--- a/Tests/Descriptor/XmlDescriptorTest.php
+++ b/Tests/Descriptor/XmlDescriptorTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\Console\Descriptor\XmlDescriptor;
 
-class XmlDescriptorTest extends AbstractDescriptorTest
+class XmlDescriptorTest extends AbstractDescriptorTestCase
 {
     protected function getDescriptor()
     {
diff --git a/Tests/Helper/AbstractQuestionHelperTest.php b/Tests/Helper/AbstractQuestionHelperTestCase.php
similarity index 93%
rename from Tests/Helper/AbstractQuestionHelperTest.php
rename to Tests/Helper/AbstractQuestionHelperTestCase.php
index 3da121624..66f45c27f 100644
--- a/Tests/Helper/AbstractQuestionHelperTest.php
+++ b/Tests/Helper/AbstractQuestionHelperTestCase.php
@@ -14,7 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Input\StreamableInputInterface;
 
-abstract class AbstractQuestionHelperTest extends TestCase
+abstract class AbstractQuestionHelperTestCase extends TestCase
 {
     protected function createStreamableInputInterfaceMock($stream = null, $interactive = true)
     {
diff --git a/Tests/Helper/QuestionHelperTest.php b/Tests/Helper/QuestionHelperTest.php
index 1297b92f9..d9aef3365 100644
--- a/Tests/Helper/QuestionHelperTest.php
+++ b/Tests/Helper/QuestionHelperTest.php
@@ -30,7 +30,7 @@
 /**
  * @group tty
  */
-class QuestionHelperTest extends AbstractQuestionHelperTest
+class QuestionHelperTest extends AbstractQuestionHelperTestCase
 {
     public function testAskChoice()
     {
diff --git a/Tests/Helper/SymfonyQuestionHelperTest.php b/Tests/Helper/SymfonyQuestionHelperTest.php
index 72c3f879f..c6a5bf88a 100644
--- a/Tests/Helper/SymfonyQuestionHelperTest.php
+++ b/Tests/Helper/SymfonyQuestionHelperTest.php
@@ -23,7 +23,7 @@
 /**
  * @group tty
  */
-class SymfonyQuestionHelperTest extends AbstractQuestionHelperTest
+class SymfonyQuestionHelperTest extends AbstractQuestionHelperTestCase
 {
     public function testAskChoice()
     {