diff --git a/test/Hydrator/NamingStrategy/UnderscoreNamingStrategyTest.php b/test/Hydrator/NamingStrategy/UnderscoreNamingStrategyTest.php
index 2162ef5bd..ad3a790d0 100644
--- a/test/Hydrator/NamingStrategy/UnderscoreNamingStrategyTest.php
+++ b/test/Hydrator/NamingStrategy/UnderscoreNamingStrategyTest.php
@@ -29,4 +29,15 @@ public function testNameExtractsToUnderscore()
         $strategy = new UnderscoreNamingStrategy();
         $this->assertEquals('foo_bar_baz', $strategy->extract('fooBarBaz'));
     }
+
+    /**
+     * @group 6422
+     * @group 6420
+     */
+    public function testNameHydratesToStudlyCaps()
+    {
+        $strategy = new UnderscoreNamingStrategy();
+
+        $this->assertEquals('fooBarBaz', $strategy->hydrate('Foo_Bar_Baz'));
+    }
 }