diff --git a/codeception/acceptance/EA07BasicinfoCest.php b/codeception/acceptance/EA07BasicinfoCest.php
index 13029500861..8481c26bd7f 100644
--- a/codeception/acceptance/EA07BasicinfoCest.php
+++ b/codeception/acceptance/EA07BasicinfoCest.php
@@ -81,7 +81,7 @@ public function basicinfo_支払方法入れ替え(AcceptanceTester $I)
 
     public function basicinfo_支払方法登録(AcceptanceTester $I)
     {
-        $I->getScenario()->skip('EA0705-UC01-T01 支払方法 登録');
+        $I->getScenario()->incomplete('EA0705-UC01-T01 支払方法 登録');
         $I->wantTo('EA0705-UC01-T01 支払方法 登録');
 
         // 表示
@@ -105,7 +105,7 @@ public function basicinfo_支払方法登録(AcceptanceTester $I)
 
     public function basicinfo_支払方法編集(AcceptanceTester $I)
     {
-        $I->getScenario()->skip('EA0705-UC01-T01 支払方法 登録');
+        $I->getScenario()->incomplete('EA0705-UC01-T01 支払方法 登録');
         $I->wantTo('EA0705-UC02-T01 支払方法 編集');
 
         // 表示
diff --git a/codeception/acceptance/EA08SysteminfoCest.php b/codeception/acceptance/EA08SysteminfoCest.php
index 8c4aa8997a3..22645f6176e 100644
--- a/codeception/acceptance/EA08SysteminfoCest.php
+++ b/codeception/acceptance/EA08SysteminfoCest.php
@@ -287,7 +287,7 @@ public function systeminfo_セキュリティ管理SSL(AcceptanceTester $I)
     {
         $I->wantTo('EA0804-UC01-T04 セキュリティ管理 - SSL強制');
 
-        $I->getScenario()->skip('このテストを通すと以降のテストが通らなくなってしまっているので一時的にスキップ');
+        $I->getScenario()->incomplete('このテストを通すと以降のテストが通らなくなってしまっているので一時的にスキップ');
 
         $httpBaseUrl = $I->getBaseUrl();
         $I->amOnUrl($httpBaseUrl);
diff --git a/codeception/acceptance/EF02ProductCest.php b/codeception/acceptance/EF02ProductCest.php
index e21f756a269..845f34336d9 100644
--- a/codeception/acceptance/EF02ProductCest.php
+++ b/codeception/acceptance/EF02ProductCest.php
@@ -40,6 +40,7 @@ public function product_商品一覧初期表示(AcceptanceTester $I)
 
     public function product_商品一覧ヘッダ以外のカテゴリリンク(AcceptanceTester $I)
     {
+        $I->getScenario()->incomplete('テスト項目を要確認');
         $I->wantTo('EF0201-UC01-T02 商品一覧ページ ヘッダ以外のカテゴリリンク');
         $I->amOnPage('/');
 
diff --git a/tests/Eccube/Tests/Command/PluginDevelopEntityFromDbTest.php b/tests/Eccube/Tests/Command/PluginDevelopEntityFromDbTest.php
index d806cd2060c..d8db577eef0 100644
--- a/tests/Eccube/Tests/Command/PluginDevelopEntityFromDbTest.php
+++ b/tests/Eccube/Tests/Command/PluginDevelopEntityFromDbTest.php
@@ -40,7 +40,7 @@ public function testFirst()
     {
         // TODO question helperのunit testの実装方法を変更
         // http://symfony.com/doc/current/components/console/helpers/questionhelper.html
-        $this->markTestSkipped();
+        $this->markTestIncomplete();
 
         $code = 'PluginUnittestSample';
 
diff --git a/tests/Eccube/Tests/Command/PluginDevelopEntityFromYamlTest.php b/tests/Eccube/Tests/Command/PluginDevelopEntityFromYamlTest.php
index 1103bb98949..f6f3d3636fd 100644
--- a/tests/Eccube/Tests/Command/PluginDevelopEntityFromYamlTest.php
+++ b/tests/Eccube/Tests/Command/PluginDevelopEntityFromYamlTest.php
@@ -39,7 +39,7 @@ public function testFirst()
     {
         // TODO question helperのunit testの実装方法を変更
         // http://symfony.com/doc/current/components/console/helpers/questionhelper.html
-        $this->markTestSkipped();
+        $this->markTestIncomplete();
 
         $code = 'PluginUnittestSample';
 
diff --git a/tests/Eccube/Tests/Command/PluginDevelopGenerateTest.php b/tests/Eccube/Tests/Command/PluginDevelopGenerateTest.php
index 65992ac8b93..0bb1777cfc7 100644
--- a/tests/Eccube/Tests/Command/PluginDevelopGenerateTest.php
+++ b/tests/Eccube/Tests/Command/PluginDevelopGenerateTest.php
@@ -39,7 +39,7 @@ public function testFirst()
     {
         // TODO question helperのunit testの実装方法を変更
         // http://symfony.com/doc/current/components/console/helpers/questionhelper.html
-        $this->markTestSkipped();
+        $this->markTestIncomplete();
 
         $code = 'PluginUnittestSample';
 
diff --git a/tests/Eccube/Tests/Form/Type/Admin/LogTypeTest.php b/tests/Eccube/Tests/Form/Type/Admin/LogTypeTest.php
index 9122df64005..92a1251f05a 100644
--- a/tests/Eccube/Tests/Form/Type/Admin/LogTypeTest.php
+++ b/tests/Eccube/Tests/Form/Type/Admin/LogTypeTest.php
@@ -64,7 +64,7 @@ public function tearDown()
     public function testValidData()
     {
         if (!file_exists($this->logTest)) {
-            $this->markTestSkipped('テスト時には'.$this->fileName.'は存在しないのでテストできない');
+            $this->markTestIncomplete('テスト時には'.$this->fileName.'は存在しないのでテストできない');
         }
         $this->form->submit($this->formData);
         $this->assertTrue($this->form->isValid());
diff --git a/tests/Eccube/Tests/Form/Type/Install/Step4TypeTest.php b/tests/Eccube/Tests/Form/Type/Install/Step4TypeTest.php
index 040f8c9af53..e3e790c72e2 100644
--- a/tests/Eccube/Tests/Form/Type/Install/Step4TypeTest.php
+++ b/tests/Eccube/Tests/Form/Type/Install/Step4TypeTest.php
@@ -48,7 +48,7 @@ public function setUp()
     public function testInvalidData()
     {
         // Request に依存しているため WebTest で代替する
-        $this->markTestSkipped('Can not support of FormInterface::submit()');
+        $this->markTestIncomplete('Can not support of FormInterface::submit()');
 
         $this->form->submit($this->formData);
         $this->assertFalse($this->form->isValid());
diff --git a/tests/Eccube/Tests/Service/EntityProxyServiceTest.php b/tests/Eccube/Tests/Service/EntityProxyServiceTest.php
index 944977a7d8e..ffed2217416 100644
--- a/tests/Eccube/Tests/Service/EntityProxyServiceTest.php
+++ b/tests/Eccube/Tests/Service/EntityProxyServiceTest.php
@@ -87,7 +87,7 @@ public function testGenerate()
 
     public function testGenerateFromOriginalFile()
     {
-        $this->markTestSkipped();
+        $this->markTestIncomplete();
 
         $findSequence = static function (Tokens $tokens) {
             return $tokens->findSequence([
diff --git a/tests/Eccube/Tests/Service/MailServiceTest.php b/tests/Eccube/Tests/Service/MailServiceTest.php
index e8131eae841..e2a99b47804 100644
--- a/tests/Eccube/Tests/Service/MailServiceTest.php
+++ b/tests/Eccube/Tests/Service/MailServiceTest.php
@@ -391,7 +391,7 @@ public function testSendPasswordResetCompleteMail()
     public function testConvertMessageISO()
     {
         // TODO  https://github.com/EC-CUBE/ec-cube/issues/2402#issuecomment-362487022
-        $this->markTestSkipped('実装確認中のためスキップ');
+        $this->markTestIncomplete('実装確認中のためスキップ');
         $config = $this->app['config'];
         $config['mail']['charset_iso_2022_jp'] = true;
         $this->app['config'] = $config;
@@ -426,7 +426,7 @@ public function testConvertMessageISO()
     public function testConvertMessageUTF()
     {
         // TODO  https://github.com/EC-CUBE/ec-cube/issues/2402#issuecomment-362487022
-        $this->markTestSkipped('実装確認中のためスキップ');
+        $this->markTestIncomplete('実装確認中のためスキップ');
 
         $config = $this->app['config'];
         $config['mail']['charset_iso_2022_jp'] = false;
@@ -460,7 +460,7 @@ public function testConvertMessageUTF()
      */
     public function testSendShippingNotifyMail()
     {
-        $this->markTestSkipped('実装確認中のためスキップ');
+        $this->markTestIncomplete('実装確認中のためスキップ');
         $Order = $this->Order;
         /** @var Shipping $Shipping */
         $Shipping = $Order->getShippings()->first();
diff --git a/tests/Eccube/Tests/Service/Payment/PaymentMethodTest.php b/tests/Eccube/Tests/Service/Payment/PaymentMethodTest.php
index 7b4270d94d4..ff4b371c54e 100644
--- a/tests/Eccube/Tests/Service/Payment/PaymentMethodTest.php
+++ b/tests/Eccube/Tests/Service/Payment/PaymentMethodTest.php
@@ -19,7 +19,7 @@ class PaymentMethodTest extends EccubeTestCase
 {
     public function testConstructorInjection()
     {
-        $this->markTestSkipped();
+        $this->markTestIncomplete();
 
         $Customer = $this->createCustomer();
         $Order = $this->createOrder($Customer);
diff --git a/tests/Eccube/Tests/Web/Admin/Order/EditControllerTest.php b/tests/Eccube/Tests/Web/Admin/Order/EditControllerTest.php
index 0ca7ab42a4c..51322ed6431 100644
--- a/tests/Eccube/Tests/Web/Admin/Order/EditControllerTest.php
+++ b/tests/Eccube/Tests/Web/Admin/Order/EditControllerTest.php
@@ -165,7 +165,7 @@ public function testNotUpdateLastBuyDate()
 
     public function testOrderCustomerInfo()
     {
-        $this->markTestSkipped('顧客の購入回数と購入金額の実装が完了するまでスキップ');
+        $this->markTestIncomplete('顧客の購入回数と購入金額の実装が完了するまでスキップ');
         $this->markTestIncomplete('EditController is not implemented.');
         $Customer = $this->createCustomer();
         $Order = $this->createOrder($Customer);
@@ -304,7 +304,7 @@ public function testOrderProcessingToFrontConfirm()
         $this->actual = $EditedOrder->getOrderStatus()->getId();
         $this->verify();
 
-        $this->markTestSkipped('フロントとのセッション管理の実装が完了するまでスキップ');
+        $this->markTestIncomplete('フロントとのセッション管理の実装が完了するまでスキップ');
         // フロント側から, product_class_id = 1 をカート投入
         $client = $this->createClient();
         $client->request(
diff --git a/tests/Eccube/Tests/Web/Admin/Order/EditControllerWithMultipleTest.php b/tests/Eccube/Tests/Web/Admin/Order/EditControllerWithMultipleTest.php
index 4b7c5607414..3476833e021 100644
--- a/tests/Eccube/Tests/Web/Admin/Order/EditControllerWithMultipleTest.php
+++ b/tests/Eccube/Tests/Web/Admin/Order/EditControllerWithMultipleTest.php
@@ -40,7 +40,7 @@ public function setUp()
 
     public function testRoutingAdminOrderNew()
     {
-        $this->markTestSkipped('新しい配送管理の実装が完了するまでスキップ');
+        $this->markTestIncomplete('新しい配送管理の実装が完了するまでスキップ');
 
         $this->client->request('GET', $this->app->url('admin_order_new'));
         $this->assertTrue($this->client->getResponse()->isSuccessful());
@@ -48,7 +48,7 @@ public function testRoutingAdminOrderNew()
 
     public function testRoutingAdminOrderNewPost()
     {
-        $this->markTestSkipped('新しい配送管理の実装が完了するまでスキップ');
+        $this->markTestIncomplete('新しい配送管理の実装が完了するまでスキップ');
 
         $Shippings = [];
         $Shippings[] = $this->createShipping($this->Product->getProductClasses()->toArray());
@@ -68,7 +68,7 @@ public function testRoutingAdminOrderNewPost()
 
     public function testRoutingAdminOrderEdit()
     {
-        $this->markTestSkipped('新しい配送管理の実装が完了するまでスキップ');
+        $this->markTestIncomplete('新しい配送管理の実装が完了するまでスキップ');
 
         $Customer = $this->createCustomer();
         $Order = $this->createOrder($Customer);
@@ -79,7 +79,7 @@ public function testRoutingAdminOrderEdit()
 
     public function testRoutingAdminOrderEditPost()
     {
-        $this->markTestSkipped('新しい配送管理の実装が完了するまでスキップ');
+        $this->markTestIncomplete('新しい配送管理の実装が完了するまでスキップ');
 
         $Shippings = [];
         $Shippings[] = $this->createShipping($this->Product->getProductClasses()->toArray());
@@ -189,7 +189,7 @@ public function testSearchProduct()
      */
     public function testOrderProcessingToFrontConfirm()
     {
-        $this->markTestSkipped('新しい配送管理の実装が完了するまでスキップ');
+        $this->markTestIncomplete('新しい配送管理の実装が完了するまでスキップ');
 
         $Customer = $this->createCustomer();
         $Order = $this->createOrder($Customer);
@@ -283,7 +283,7 @@ public function testOrderProcessingToFrontConfirm()
      */
     public function testOrderProcessingWithTax()
     {
-        $this->markTestSkipped('新しい配送管理の実装が完了するまでスキップ');
+        $this->markTestIncomplete('新しい配送管理の実装が完了するまでスキップ');
 
         $Shippings = [];
         $Shippings[] = $this->createShipping($this->Product->getProductClasses()->toArray());
@@ -338,7 +338,7 @@ public function testOrderProcessingWithTax()
 
     public function testOrderEditWithShippingItemDelete()
     {
-        $this->markTestSkipped('新しい配送管理の実装が完了するまでスキップ');
+        $this->markTestIncomplete('新しい配送管理の実装が完了するまでスキップ');
 
         $Shippings = [];
         $Shippings[] = $this->createShipping($this->Product->getProductClasses()->toArray());
@@ -398,7 +398,7 @@ public function testOrderEditWithShippingItemDelete()
 
     public function testOrderEditWithShippingDelete()
     {
-        $this->markTestSkipped('新しい配送管理の実装が完了するまでスキップ');
+        $this->markTestIncomplete('新しい配送管理の実装が完了するまでスキップ');
 
         $Shippings = [];
         $Shippings[] = $this->createShipping($this->Product->getProductClasses()->toArray());
diff --git a/tests/Eccube/Tests/Web/Admin/Order/OrderControllerTest.php b/tests/Eccube/Tests/Web/Admin/Order/OrderControllerTest.php
index 85eb2c0b2c4..63fd86a8ed8 100644
--- a/tests/Eccube/Tests/Web/Admin/Order/OrderControllerTest.php
+++ b/tests/Eccube/Tests/Web/Admin/Order/OrderControllerTest.php
@@ -336,7 +336,7 @@ public function testSearchWithEmail()
      */
     public function testBulkOrderStatus($orderStatusId)
     {
-        $this->markTestSkipped('使用していないルーティングのためスキップ.');
+        $this->markTestIncomplete('使用していないルーティングのためスキップ.');
         // case true
         $orderIds = [];
         /** @var Order[] $Orders */
diff --git a/tests/Eccube/Tests/Web/ShoppingControllerTest.php b/tests/Eccube/Tests/Web/ShoppingControllerTest.php
index 3f4f819915f..dc2d4877374 100644
--- a/tests/Eccube/Tests/Web/ShoppingControllerTest.php
+++ b/tests/Eccube/Tests/Web/ShoppingControllerTest.php
@@ -402,7 +402,7 @@ public function testShippingChangeWithPost()
      */
     public function testShippingShippingPost()
     {
-        $this->markTestSkipped('新しい配送管理の実装が完了するまでスキップ');
+        $this->markTestIncomplete('新しい配送管理の実装が完了するまでスキップ');
 
         $faker = $this->getFaker();
         $Customer = $this->logIn();