diff --git a/tests/Eccube/Tests/Form/Type/Admin/OrderTypeTest.php b/tests/Eccube/Tests/Form/Type/Admin/OrderTypeTest.php
index ed094d5a2a5..eef73585303 100644
--- a/tests/Eccube/Tests/Form/Type/Admin/OrderTypeTest.php
+++ b/tests/Eccube/Tests/Form/Type/Admin/OrderTypeTest.php
@@ -88,7 +88,14 @@ public function testInvalidPhoneNumberBlank()
     {
         $this->formData['phone_number'] = '';
         $this->form->submit($this->formData);
-        $this->assertFalse($this->form->isValid());
+        $this->assertFalse($this->form['phone_number']->isValid());
+    }
+
+    public function testInvalidPhoneNumberTooLong() {
+        $this->formData['phone_number'] = '0123456789012345';
+
+        $this->form->submit($this->formData);
+        $this->assertFalse($this->form['phone_number']->isValid());
     }
 
     public function testInvalidDiscountOverMaxLength()
@@ -96,7 +103,7 @@ public function testInvalidDiscountOverMaxLength()
         $this->formData['discount'] = '12345678910'; //Max 9
 
         $this->form->submit($this->formData);
-        $this->assertFalse($this->form->isValid());
+        $this->assertFalse($this->form['discount']->isValid());
     }
 
     public function testInvalidDiscountNotNumeric()
@@ -104,7 +111,7 @@ public function testInvalidDiscountNotNumeric()
         $this->formData['discount'] = 'abcde';
 
         $this->form->submit($this->formData);
-        $this->assertFalse($this->form->isValid());
+        $this->assertFalse($this->form['discount']->isValid());
     }
 
     public function testInValidDiscountHasMinus()
@@ -112,7 +119,7 @@ public function testInValidDiscountHasMinus()
         $this->formData['discount'] = '-12345';
 
         $this->form->submit($this->formData);
-        $this->assertFalse($this->form->isValid());
+        $this->assertFalse($this->form['discount']->isValid());
     }
 
     public function testInvalidDeliveryFeeTotalOverMaxLength()
@@ -120,7 +127,7 @@ public function testInvalidDeliveryFeeTotalOverMaxLength()
         $this->formData['delivery_fee_total'] = '12345678910'; //Max 9
 
         $this->form->submit($this->formData);
-        $this->assertFalse($this->form->isValid());
+        $this->assertFalse($this->form['delivery_fee_total']->isValid());
     }
 
     public function testInvalidDeliveryFeeTotalNotNumeric()
@@ -128,7 +135,7 @@ public function testInvalidDeliveryFeeTotalNotNumeric()
         $this->formData['delivery_fee_total'] = 'abcde';
 
         $this->form->submit($this->formData);
-        $this->assertFalse($this->form->isValid());
+        $this->assertFalse($this->form['delivery_fee_total']->isValid());
     }
 
     public function testInValidDeliveryFeeTotalHasMinus()
@@ -136,7 +143,7 @@ public function testInValidDeliveryFeeTotalHasMinus()
         $this->formData['delivery_fee_total'] = '-12345';
 
         $this->form->submit($this->formData);
-        $this->assertFalse($this->form->isValid());
+        $this->assertFalse($this->form['delivery_fee_total']->isValid());
     }
 
     public function testInvalidChargeOverMaxLength()
@@ -144,7 +151,7 @@ public function testInvalidChargeOverMaxLength()
         $this->formData['charge'] = '12345678910'; //Max 9
 
         $this->form->submit($this->formData);
-        $this->assertFalse($this->form->isValid());
+        $this->assertFalse($this->form['charge']->isValid());
     }
 
     public function testInvalidChargeNotNumeric()
@@ -152,7 +159,7 @@ public function testInvalidChargeNotNumeric()
         $this->formData['charge'] = 'abcde';
 
         $this->form->submit($this->formData);
-        $this->assertFalse($this->form->isValid());
+        $this->assertFalse($this->form['charge']->isValid());
     }
 
     public function testInValidChargeHasMinus()
@@ -160,13 +167,6 @@ public function testInValidChargeHasMinus()
         $this->formData['charge'] = '-12345';
 
         $this->form->submit($this->formData);
-        $this->assertFalse($this->form->isValid());
-    }
-
-    public function testInvalidPhoneNumberTooLong() {
-        $this->formData['phone_number'] = '0123456789012345';
-
-        $this->form->submit($this->formData);
-        $this->assertFalse($this->form['phone_number']->isValid());
+        $this->assertFalse($this->form['charge']->isValid());
     }
 }