diff --git a/UPGRADE-2.1.md b/UPGRADE-2.1.md
index 026d014cf9..8f7d45bd74 100644
--- a/UPGRADE-2.1.md
+++ b/UPGRADE-2.1.md
@@ -628,12 +628,12 @@
   * The following methods in `FormBuilder` were deprecated and have a new
     equivalent:
 
-      * `prependClientTransformer`: `addViewTransformer`
-      * `appendClientTransformer`: no new equivalent, consider using `addViewTransformer`
+      * `prependClientTransformer`: no new equivalent, consider using `addViewTransformer`
+      * `appendClientTransformer`: `addViewTransformer`
       * `getClientTransformers`: `getViewTransformers`
       * `resetClientTransformers`: `resetViewTransformers`
-      * `prependNormTransformer`: no new equivalent, consider using `addModelTransformer`
-      * `appendNormTransformer`: `addModelTransformer`
+      * `prependNormTransformer`: `addModelTransformer`
+      * `appendNormTransformer`: no new equivalent, consider using `addModelTransformer`
       * `getNormTransformers`: `getModelTransformers`
       * `resetNormTransformers`: `resetModelTransformers`
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
index c12ca939a9..9c7cbe6a6f 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
@@ -243,22 +243,4 @@ class DateTimeTypeTest extends LocalizedTestCase
         $view = $form->createView();
         $this->assertEquals('datetime', $view->getVar('type'));
     }
-
-    public function testSubmit_invalidDateTimeSingleText()
-    {
-        $form = $this->factory->create('datetime', null, array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'input' => 'datetime',
-            'widget' => 'single_text',
-            'invalid_message' => 'Customized invalid message',
-        ));
-
-        $form->bind('2012-04-31 03:04:05');
-
-        $this->assertFalse($form->isValid());
-        $this->assertNull($form->getData());
-        $this->assertEquals('2012-04-31 03:04:05', $form->getClientData());
-        $this->assertEquals(array(new FormError('Customized invalid message', array())), $form->getErrors());
-    }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
index 164bb3eb77..2dd30ecc07 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
@@ -547,22 +547,4 @@ class DateTypeTest extends LocalizedTestCase
         $view = $form->createView();
         $this->assertEquals('date', $view->getVar('type'));
     }
-
-    public function testInvalidDateWithSingleTextDateTime()
-    {
-        $form = $this->factory->create('date', null, array(
-            'data_timezone' => 'UTC',
-            'user_timezone' => 'UTC',
-            'widget' => 'single_text',
-            'input' => 'datetime',
-            'invalid_message' => 'Customized invalid message',
-        ));
-
-        $form->bind('31.4.2012');
-
-        $this->assertFalse($form->isValid());
-        $this->assertNull($form->getData());
-        $this->assertEquals('31.4.2012', $form->getClientData());
-        $this->assertEquals(array(new FormError('Customized invalid message', array())), $form->getErrors());
-    }
 }