diff --git a/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php b/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php
index bc5499166cd061f17548ab4fe1d1c8833c5f34fa..e844d62b7d840199cd200112a946810c1db01e6d 100644
--- a/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php
@@ -123,8 +123,9 @@ class DataTest extends \PHPUnit_Framework_TestCase
             );
 
         $this->_checkoutSession = $arguments['checkoutSession'];
-        $localeDate = $arguments['localeDate'];
-        $localeDate->expects($this->any())->method('date')->will($this->returnValue('Oct 02, 2013'));
+        $arguments['localeDate']->expects($this->any())
+            ->method('formatDateTime')
+            ->willReturn('Oct 02, 2013');
 
         $this->_transportBuilder = $arguments['transportBuilder'];
 
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/EditPostTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/EditPostTest.php
index fe474d3c814471f4631b7af9a0bfdf5e20aefc8f..86113cef969df40aa3c6f1f1f1603acca0f148b2 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Account/EditPostTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Account/EditPostTest.php
@@ -252,13 +252,13 @@ class EditPostTest extends \PHPUnit_Framework_TestCase
         $this->customerAccountManagement
             ->expects($this->once())
             ->method('changePassword')
-            ->willThrowException(new \Magento\Framework\Exception\AuthenticationException('Error'));
+            ->willThrowException(new \Magento\Framework\Exception\AuthenticationException(__('Error')));
         $this->messageManager
             ->expects($this->once())
             ->method('addError')
             ->with('Error');
 
-        $exception = new \Magento\Framework\Exception\InputException('Error');
+        $exception = new \Magento\Framework\Exception\InputException(__('Error'));
         $this->customerRepository
             ->expects($this->once())
             ->method('save')
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
index 2bd6553b4fb725a8b848497acf89c92e646f6c50..ab75ed3fd336a7bbf4a5c9bbe8232828c24fd67d 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
@@ -233,7 +233,7 @@ class Timezone implements TimezoneInterface
      * @param null $locale
      * @param null $timezone
      * @param string|null $pattern
-     * @return mixed
+     * @return string
      */
     public function formatDateTime(
         \DateTimeInterface $date,
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php b/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php
index 48bbbc73796dba44f8d925ac6e56a61641363d80..75c865b542a0ab78a4d77870f7de12308b2bdec8 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php
@@ -122,7 +122,7 @@ interface TimezoneInterface
      * @param null $locale
      * @param null $timezone
      * @param string|null $pattern
-     * @return mixed
+     * @return string
      */
     public function formatDateTime(
         \DateTimeInterface $date,