diff --git a/composer.lock b/composer.lock
index 76735ceac..7a6755108 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1211,7 +1211,7 @@
             "source": {
                 "type": "git",
                 "url": "git@github.com:spryker/spryker.git",
-                "reference": "fc0ff1578a9a448a7069fcbe38b5feeee5796676"
+                "reference": "8669c101de99f5c175a33da5a1cafd21bd1c44bf"
             },
             "require": {
                 "everon/criteria-builder": "^1.1.0",
@@ -1742,7 +1742,7 @@
                 "proprietary"
             ],
             "description": "Spryker Framework",
-            "time": "2016-11-08 12:45:11"
+            "time": "2016-11-09 11:13:13"
         },
         {
             "name": "symfony-cmf/routing",
diff --git a/tests/YvesUnit/Pyz/Yves/Assets/Communication/Model/AssetUrlBuilderTest.php b/tests/YvesUnit/Pyz/Yves/Assets/Communication/Model/AssetUrlBuilderTest.php
index 0d001d0be..134b41ac0 100644
--- a/tests/YvesUnit/Pyz/Yves/Assets/Communication/Model/AssetUrlBuilderTest.php
+++ b/tests/YvesUnit/Pyz/Yves/Assets/Communication/Model/AssetUrlBuilderTest.php
@@ -71,7 +71,7 @@ public function testMediaUrlWithTrailingSlashes()
      */
     private function getCacheBusterMock()
     {
-        $mock = $this->getMock(CacheBusterInterface::class);
+        $mock = $this->getMockBuilder(CacheBusterInterface::class)->getMock();
         $mock->expects($this->any())
             ->method('addCacheBust')
             ->will($this->returnArgument(0));
diff --git a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/AddressStepTest.php b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/AddressStepTest.php
index f515e6731..c1a64f560 100644
--- a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/AddressStepTest.php
+++ b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/AddressStepTest.php
@@ -184,7 +184,11 @@ protected function createAddressStep($customerClientMock = null)
             $customerClientMock = $this->createCustomerClientMock();
         }
 
-        $addressStepMock = $this->getMock(AddressStep::class, ['getDataClass'], [$customerClientMock, 'address_step', 'escape_route']);
+        $addressStepMock = $this->getMockBuilder(AddressStep::class)
+            ->setMethods(['getDataClass'])
+            ->setConstructorArgs([$customerClientMock, 'address_step', 'escape_route'])
+            ->getMock();
+
         $addressStepMock->method('getDataClass')->willReturn(new QuoteTransfer());
 
         return $addressStepMock;
@@ -203,7 +207,7 @@ protected function createRequest()
      */
     protected function createCustomerClientMock()
     {
-        return $this->getMock(CustomerClientInterface::class);
+        return $this->getMockBuilder(CustomerClientInterface::class)->getMock();
     }
 
 }
diff --git a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/CustomerStepTest.php b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/CustomerStepTest.php
index 8f4df38c1..4ceb42938 100644
--- a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/CustomerStepTest.php
+++ b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/CustomerStepTest.php
@@ -139,7 +139,7 @@ protected function createCustomerStep($customerClientMock = null, $authHandlerMo
      */
     protected function createAuthHandlerMock()
     {
-        return $this->getMock(StepHandlerPluginInterface::class);
+        return $this->getMockBuilder(StepHandlerPluginInterface::class)->getMock();
     }
 
     /**
@@ -155,7 +155,7 @@ protected function createRequest()
      */
     protected function createCustomerClientMock()
     {
-        return $this->getMock(CustomerClientInterface::class);
+        return $this->getMockBuilder(CustomerClientInterface::class)->getMock();
     }
 
 }
diff --git a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/PaymentStepTest.php b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/PaymentStepTest.php
index 8bb090c6e..2c8cb47cc 100644
--- a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/PaymentStepTest.php
+++ b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/PaymentStepTest.php
@@ -99,7 +99,7 @@ protected function createRequest()
      */
     protected function createPaymentPluginMock()
     {
-        return $this->getMock(StepHandlerPluginInterface::class);
+        return $this->getMockBuilder(StepHandlerPluginInterface::class)->getMock();
     }
 
     /**
@@ -107,7 +107,7 @@ protected function createPaymentPluginMock()
      */
     protected function getFlashMessengerMock()
     {
-        return $this->getMock(FlashMessengerInterface::class);
+        return $this->getMockBuilder(FlashMessengerInterface::class)->getMock();
     }
 
 }
diff --git a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/PlaceOrderStepTest.php b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/PlaceOrderStepTest.php
index 302c339be..622882e8c 100644
--- a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/PlaceOrderStepTest.php
+++ b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/PlaceOrderStepTest.php
@@ -152,7 +152,7 @@ protected function createRequest()
      */
     protected function createFlashMessengerMock()
     {
-        return $this->getMock(FlashMessengerInterface::class);
+        return $this->getMockBuilder(FlashMessengerInterface::class)->getMock();
     }
 
     /**
@@ -160,7 +160,7 @@ protected function createFlashMessengerMock()
      */
     protected function createCheckoutClientMock()
     {
-        return $this->getMock(CheckoutClientInterface::class);
+        return $this->getMockBuilder(CheckoutClientInterface::class)->getMock();
     }
 
     /**
@@ -168,7 +168,7 @@ protected function createCheckoutClientMock()
      */
     protected function createShipmentMock()
     {
-        return $this->getMock(StepHandlerPluginInterface::class);
+        return $this->getMockBuilder(StepHandlerPluginInterface::class)->getMock();
     }
 
 }
diff --git a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/ShipmentStepTest.php b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/ShipmentStepTest.php
index cfead1d75..f7cf05d41 100644
--- a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/ShipmentStepTest.php
+++ b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/ShipmentStepTest.php
@@ -102,7 +102,7 @@ protected function createRequest()
      */
     protected function createCalculationClientMock()
     {
-        $calculationMock = $this->getMock(CalculationClientInterface::class);
+        $calculationMock = $this->getMockBuilder(CalculationClientInterface::class)->getMock();
         $calculationMock->method('recalculate')->willReturnArgument(0);
 
         return $calculationMock;
@@ -113,7 +113,7 @@ protected function createCalculationClientMock()
      */
     protected function createShipmentMock()
     {
-        return $this->getMock(StepHandlerPluginInterface::class);
+        return $this->getMockBuilder(StepHandlerPluginInterface::class)->getMock();
     }
 
 }
diff --git a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/SuccessStepTest.php b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/SuccessStepTest.php
index 805cfb1d0..8bd31d2ee 100644
--- a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/SuccessStepTest.php
+++ b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/SuccessStepTest.php
@@ -98,7 +98,7 @@ protected function createRequest()
      */
     protected function createCustomerClientMock()
     {
-        return $this->getMock(CustomerClientInterface::class);
+        return $this->getMockBuilder(CustomerClientInterface::class)->getMock();
     }
 
 }
diff --git a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/SummaryStepTest.php b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/SummaryStepTest.php
index 07e5e2878..80aca319c 100644
--- a/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/SummaryStepTest.php
+++ b/tests/YvesUnit/Pyz/Yves/Checkout/Process/Steps/SummaryStepTest.php
@@ -97,7 +97,7 @@ protected function createRequest()
      */
     protected function createCalculationClientMock()
     {
-        return $this->getMock(CalculationClientInterface::class);
+        return $this->getMockBuilder(CalculationClientInterface::class)->getMock();
     }
 
     /**
@@ -105,7 +105,7 @@ protected function createCalculationClientMock()
      */
     protected function createShipmentMock()
     {
-        return $this->getMock(StepHandlerPluginInterface::class);
+        return $this->getMockBuilder(StepHandlerPluginInterface::class)->getMock();
     }
 
 }