diff --git a/src/Symfony/Component/PropertyAccess/StringUtil.php b/src/Symfony/Component/PropertyAccess/StringUtil.php
index 29da09755cd14..0ca6198019c11 100644
--- a/src/Symfony/Component/PropertyAccess/StringUtil.php
+++ b/src/Symfony/Component/PropertyAccess/StringUtil.php
@@ -111,6 +111,11 @@ class StringUtil
         array('xuae', 4, false, true, 'eau'),
     );
 
+    /**
+     * @var string[]
+     */
+    private static $allowedEes = array('Fleet', 'Street');
+
     /**
      * This class should not be instantiated.
      */
@@ -197,7 +202,7 @@ public static function singularify($plural)
         }
 
         // Convert teeth to tooth, feet to foot
-        if (false !== ($pos = strpos($plural, 'ee')) && strlen($plural) > 3) {
+        if (false !== ($pos = strpos($plural, 'ee')) && strlen($plural) > 3 ! in_array($plural, self::$allowedEes)) {
             return substr_replace($plural, 'oo', $pos, 2);
         }