diff --git a/app/code/Magento/Catalog/Model/Product/Link.php b/app/code/Magento/Catalog/Model/Product/Link.php
index 7ca13f75821ec5872e76e0292ad92105f18f3cb8..a088df34cf7dfe0b6c87487b6516425b939cddb5 100644
--- a/app/code/Magento/Catalog/Model/Product/Link.php
+++ b/app/code/Magento/Catalog/Model/Product/Link.php
@@ -49,11 +49,17 @@ class Link extends \Magento\Framework\Model\AbstractModel
      */
     protected $_linkCollectionFactory;
 
+    /**
+     * @var \Magento\CatalogInventory\Helper\Stock
+     */
+    protected $stockHelper;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Catalog\Model\Resource\Product\Link\CollectionFactory $linkCollectionFactory
      * @param \Magento\Catalog\Model\Resource\Product\Link\Product\CollectionFactory $productCollectionFactory
+     * @param \Magento\CatalogInventory\Helper\Stock $stockHelper
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
@@ -63,12 +69,14 @@ class Link extends \Magento\Framework\Model\AbstractModel
         \Magento\Framework\Registry $registry,
         \Magento\Catalog\Model\Resource\Product\Link\CollectionFactory $linkCollectionFactory,
         \Magento\Catalog\Model\Resource\Product\Link\Product\CollectionFactory $productCollectionFactory,
+        \Magento\CatalogInventory\Helper\Stock $stockHelper,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         $this->_linkCollectionFactory = $linkCollectionFactory;
         $this->_productCollectionFactory = $productCollectionFactory;
+        $this->stockHelper = $stockHelper;
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
     }
 
@@ -128,6 +136,7 @@ class Link extends \Magento\Framework\Model\AbstractModel
     public function getProductCollection()
     {
         $collection = $this->_productCollectionFactory->create()->setLinkModel($this);
+        $this->stockHelper->addInStockFilterToCollection($collection);
         return $collection;
     }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/LinkTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/LinkTest.php
index e081f7229468c27f54c578499ccb38e6a1c1f44f..29c855255c00b79cf413785d3aac401e694c435b 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/LinkTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/LinkTest.php
@@ -19,6 +19,16 @@ class LinkTest extends \PHPUnit_Framework_TestCase
      */
     protected $resource;
 
+    /**
+     * @var \Magento\CatalogInventory\Helper\Stock|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $stockHelperMock;
+
+    /**
+     * @var \Magento\Catalog\Model\Resource\Product\Link\Product\Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $productCollection;
+
     protected function setUp()
     {
         $linkCollection = $this->getMockBuilder(
@@ -35,12 +45,12 @@ class LinkTest extends \PHPUnit_Framework_TestCase
         $linkCollectionFactory->expects($this->any())
             ->method('create')
             ->will($this->returnValue($linkCollection));
-        $productCollection = $this->getMockBuilder(
+        $this->productCollection = $this->getMockBuilder(
             'Magento\Catalog\Model\Resource\Product\Link\Product\Collection'
         )->disableOriginalConstructor()->setMethods(
             ['setLinkModel']
         )->getMock();
-        $productCollection->expects($this->any())->method('setLinkModel')->will($this->returnSelf());
+        $this->productCollection->expects($this->any())->method('setLinkModel')->will($this->returnSelf());
         $productCollectionFactory = $this->getMockBuilder(
             'Magento\Catalog\Model\Resource\Product\Link\Product\CollectionFactory'
         )->disableOriginalConstructor()->setMethods(
@@ -48,7 +58,7 @@ class LinkTest extends \PHPUnit_Framework_TestCase
         )->getMock();
         $productCollectionFactory->expects($this->any())
             ->method('create')
-            ->will($this->returnValue($productCollection));
+            ->will($this->returnValue($this->productCollection));
 
         $this->resource = $this->getMock(
             'Magento\Framework\Model\Resource\AbstractResource',
@@ -63,11 +73,19 @@ class LinkTest extends \PHPUnit_Framework_TestCase
             ]
         );
 
+        $this->stockHelperMock = $this->getMockBuilder('Magento\CatalogInventory\Helper\Stock')
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->model = $objectManager->getObject(
             'Magento\Catalog\Model\Product\Link',
-            ['linkCollectionFactory' => $linkCollectionFactory, 'productCollectionFactory' => $productCollectionFactory,
-                'resource' => $this->resource]
+            [
+                'linkCollectionFactory' => $linkCollectionFactory,
+                'productCollectionFactory' => $productCollectionFactory,
+                'resource' => $this->resource,
+                'stockHelper' => $this->stockHelperMock
+            ]
         );
     }
 
@@ -109,6 +127,10 @@ class LinkTest extends \PHPUnit_Framework_TestCase
 
     public function testGetProductCollection()
     {
+        $this->stockHelperMock
+            ->expects($this->once())
+            ->method('addInStockFilterToCollection')
+            ->with($this->productCollection);
         $this->assertInstanceOf(
             'Magento\Catalog\Model\Resource\Product\Link\Product\Collection',
             $this->model->getProductCollection()
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Product/Plugin/Import.php b/app/code/Magento/CatalogUrlRewrite/Model/Product/Plugin/Import.php
index d83d347f4b65ea687b61254cb8195b3e0c6fa739..45ac3244d56e2757656c499951124707a40f2a4d 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Product/Plugin/Import.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Product/Plugin/Import.php
@@ -320,12 +320,14 @@ class Import
         $urls = [];
         foreach ($this->products as $productId => $productsByStores) {
             foreach ($productsByStores as $storeId => $product) {
-                $urls[] = $this->urlRewriteFactory->create()
-                    ->setEntityType(ProductUrlRewriteGenerator::ENTITY_TYPE)
-                    ->setEntityId($productId)
-                    ->setRequestPath($this->productUrlPathGenerator->getUrlPathWithSuffix($product, $storeId))
-                    ->setTargetPath($this->productUrlPathGenerator->getCanonicalUrlPath($product))
-                    ->setStoreId($storeId);
+                if ($this->productUrlPathGenerator->getUrlPath($product)) {
+                    $urls[] = $this->urlRewriteFactory->create()
+                        ->setEntityType(ProductUrlRewriteGenerator::ENTITY_TYPE)
+                        ->setEntityId($productId)
+                        ->setRequestPath($this->productUrlPathGenerator->getUrlPathWithSuffix($product, $storeId))
+                        ->setTargetPath($this->productUrlPathGenerator->getCanonicalUrlPath($product))
+                        ->setStoreId($storeId);
+                }
             }
         }
 
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Product/Plugin/ImportTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Product/Plugin/ImportTest.php
index 296a19e9374dac89b3c39fef8ab6c8f2df8275b4..b462b7b658031d59211567a0ee31d0d6166f2d27 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Product/Plugin/ImportTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Product/Plugin/ImportTest.php
@@ -670,7 +670,7 @@ class ImportTest extends \PHPUnit_Framework_TestCase
     /**
      * Cover canonicalUrlRewriteGenerate().
      */
-    public function testCanonicalUrlRewriteGenerate()
+    public function testCanonicalUrlRewriteGenerateWithUrlPath()
     {
         $productId = 'product_id';
         $requestPath = 'simple-product.html';
@@ -691,6 +691,10 @@ class ImportTest extends \PHPUnit_Framework_TestCase
             ->expects($this->once())
             ->method('getUrlPathWithSuffix')
             ->will($this->returnValue($requestPath));
+        $this->productUrlPathGenerator
+            ->expects($this->once())
+            ->method('getUrlPath')
+            ->will($this->returnValue('urlPath'));
         $this->productUrlPathGenerator
             ->expects($this->once())
             ->method('getCanonicalUrlPath')
@@ -734,6 +738,36 @@ class ImportTest extends \PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * Cover canonicalUrlRewriteGenerate().
+     */
+    public function testCanonicalUrlRewriteGenerateWithEmptyUrlPath()
+    {
+        $productId = 'product_id';
+        $storeId = 10;
+        $product = $this
+            ->getMockBuilder('Magento\Catalog\Model\Product')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $productsByStores = [$storeId => $product];
+        $products = [
+            $productId => $productsByStores,
+        ];
+
+        $this->setPropertyValue($this->import, 'products', $products);
+
+        $this->productUrlPathGenerator
+            ->expects($this->once())
+            ->method('getUrlPath')
+            ->will($this->returnValue(''));
+        $this->urlRewriteFactory
+            ->expects($this->never())
+            ->method('create');
+
+        $actualResult = $this->invokeMethod($this->import, 'canonicalUrlRewriteGenerate');
+        $this->assertEquals([], $actualResult);
+    }
+
     /**
      * Cover categoriesUrlRewriteGenerate().
      */
diff --git a/app/code/Magento/Checkout/Block/Cart/Crosssell.php b/app/code/Magento/Checkout/Block/Cart/Crosssell.php
index 2eb54a9bbddd1f97bd53816b149833a7b8e350a8..ba11d5c4aad2a22dd40d45f17b68ffe044af8445 100644
--- a/app/code/Magento/Checkout/Block/Cart/Crosssell.php
+++ b/app/code/Magento/Checkout/Block/Cart/Crosssell.php
@@ -199,8 +199,6 @@ class Crosssell extends \Magento\Catalog\Block\Product\AbstractProduct
         );
         $this->_addProductAttributesAndPrices($collection);
 
-        $this->stockHelper->addInStockFilterToCollection($collection);
-
         return $collection;
     }
 }
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/Bootstrap/WebapiDocBlock.php b/dev/tests/api-functional/framework/Magento/TestFramework/Bootstrap/WebapiDocBlock.php
index b8f7c54ad70f11f951c24391b0efedb099ca198e..831becca6f3d2e645e9908f29bd7485fd339c50a 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/Bootstrap/WebapiDocBlock.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/Bootstrap/WebapiDocBlock.php
@@ -18,7 +18,7 @@ class WebapiDocBlock extends \Magento\TestFramework\Bootstrap\DocBlock
     protected function _getSubscribers(\Magento\TestFramework\Application $application)
     {
         $subscribers = parent::_getSubscribers($application);
-        array_unshift($subscribers, new \Magento\TestFramework\Annotation\ApiDataFixture($this->_fixturesBaseDir));
+        $subscribers[] = new \Magento\TestFramework\Annotation\ApiDataFixture($this->_fixturesBaseDir);
         return $subscribers;
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductLinkManagementInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductLinkManagementInterfaceTest.php
index 3aa38f8cdb53f505a5f2b7b530b176c47fac6a69..ff7e2abfbe54f57d705ad65da425bab15b5521ff 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductLinkManagementInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductLinkManagementInterfaceTest.php
@@ -9,6 +9,9 @@ namespace Magento\Catalog\Api;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
+/**
+ * @magentoAppIsolation enabled
+ */
 class ProductLinkManagementInterfaceTest extends WebapiAbstract
 {
     const SERVICE_NAME = 'catalogProductLinkManagementV1';
@@ -85,7 +88,7 @@ class ProductLinkManagementInterfaceTest extends WebapiAbstract
 
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual_in_stock.php
      */
     public function testAssign()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
index d33e1456bc363e80830d3d1a32229fbccaaebc69..4cbfcf59b2c538d32f78819a903fff2b31c3d2aa 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
@@ -6,9 +6,13 @@
 namespace Magento\Catalog\Api;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 use Magento\Framework\Webapi\Exception as HTTPExceptionCodes;
 
+/**
+ * @magentoAppIsolation enabled
+ */
 class ProductRepositoryInterfaceTest extends WebapiAbstract
 {
     const SERVICE_NAME = 'catalogProductRepositoryV1';
@@ -139,6 +143,9 @@ class ProductRepositoryInterfaceTest extends WebapiAbstract
             ProductInterface::STATUS => 1,
             ProductInterface::TYPE_ID => 'simple',
             ProductInterface::ATTRIBUTE_SET_ID => 4,
+            ProductInterface::EXTENSION_ATTRIBUTES_KEY => [
+                'stock_item' => $this->getStockItemData()
+            ]
         ];
 
         $this->saveProduct($productData);
@@ -778,4 +785,36 @@ class ProductRepositoryInterfaceTest extends WebapiAbstract
         $response = $this->deleteProduct($productData[ProductInterface::SKU]);
         $this->assertTrue($response);
     }
+
+    /**
+     * @return array
+     */
+    private function getStockItemData()
+    {
+        return [
+            StockItemInterface::IS_IN_STOCK => 1,
+            StockItemInterface::QTY => 100500,
+            StockItemInterface::IS_QTY_DECIMAL => 1,
+            StockItemInterface::SHOW_DEFAULT_NOTIFICATION_MESSAGE => 0,
+            StockItemInterface::USE_CONFIG_MIN_QTY => 0,
+            StockItemInterface::USE_CONFIG_MIN_SALE_QTY => 0,
+            StockItemInterface::MIN_QTY => 1,
+            StockItemInterface::MIN_SALE_QTY => 1,
+            StockItemInterface::MAX_SALE_QTY => 100,
+            StockItemInterface::USE_CONFIG_MAX_SALE_QTY => 0,
+            StockItemInterface::USE_CONFIG_BACKORDERS => 0,
+            StockItemInterface::BACKORDERS => 0,
+            StockItemInterface::USE_CONFIG_NOTIFY_STOCK_QTY => 0,
+            StockItemInterface::NOTIFY_STOCK_QTY => 0,
+            StockItemInterface::USE_CONFIG_QTY_INCREMENTS => 0,
+            StockItemInterface::QTY_INCREMENTS => 0,
+            StockItemInterface::USE_CONFIG_ENABLE_QTY_INC => 0,
+            StockItemInterface::ENABLE_QTY_INCREMENTS => 0,
+            StockItemInterface::USE_CONFIG_MANAGE_STOCK => 1,
+            StockItemInterface::MANAGE_STOCK => 1,
+            StockItemInterface::LOW_STOCK_DATE => null,
+            StockItemInterface::IS_DECIMAL_DIVIDED => 0,
+            StockItemInterface::STOCK_STATUS_CHANGED_AUTO => 0,
+        ];
+    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/ProductLinkManagementTest.php b/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/ProductLinkManagementTest.php
index 88160057b07004339713b92e36d1fc93be910cae..5522d62bd0259d260e6d7132f641bfedda6cbeca 100644
--- a/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/ProductLinkManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/ProductLinkManagementTest.php
@@ -6,6 +6,9 @@
  */
 namespace Magento\GroupedProduct\Api;
 
+/**
+ * @magentoAppIsolation enabled
+ */
 class ProductLinkManagementTest extends \Magento\TestFramework\TestCase\WebapiAbstract
 {
     const SERVICE_NAME = 'catalogProductLinkManagementV1';
diff --git a/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/ProductRepositoryInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/ProductRepositoryInterfaceTest.php
index 8adffb82f70547d69249fde8e57dcfcce1643a13..f4a8bab17e58d6f475677c6bdb70c062b478502d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/ProductRepositoryInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/ProductRepositoryInterfaceTest.php
@@ -6,6 +6,7 @@
 namespace Magento\GroupedProduct\Api;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
 class ProductRepositoryInterfaceTest extends WebapiAbstract
@@ -126,6 +127,9 @@ class ProductRepositoryInterfaceTest extends WebapiAbstract
             ProductInterface::STATUS => 1,
             ProductInterface::TYPE_ID => 'simple',
             ProductInterface::ATTRIBUTE_SET_ID => 4,
+            ProductInterface::EXTENSION_ATTRIBUTES_KEY => [
+                'stock_item' => $this->getStockItemData()
+            ]
         ];
 
         $this->saveProduct($productData);
@@ -200,4 +204,36 @@ class ProductRepositoryInterfaceTest extends WebapiAbstract
         $this->deleteProduct("product_simple_500");
         $this->deleteProduct("group_product_500");
     }
+
+    /**
+     * @return array
+     */
+    private function getStockItemData()
+    {
+        return [
+            StockItemInterface::IS_IN_STOCK => 1,
+            StockItemInterface::QTY => 100500,
+            StockItemInterface::IS_QTY_DECIMAL => 1,
+            StockItemInterface::SHOW_DEFAULT_NOTIFICATION_MESSAGE => 0,
+            StockItemInterface::USE_CONFIG_MIN_QTY => 0,
+            StockItemInterface::USE_CONFIG_MIN_SALE_QTY => 0,
+            StockItemInterface::MIN_QTY => 1,
+            StockItemInterface::MIN_SALE_QTY => 1,
+            StockItemInterface::MAX_SALE_QTY => 100,
+            StockItemInterface::USE_CONFIG_MAX_SALE_QTY => 0,
+            StockItemInterface::USE_CONFIG_BACKORDERS => 0,
+            StockItemInterface::BACKORDERS => 0,
+            StockItemInterface::USE_CONFIG_NOTIFY_STOCK_QTY => 0,
+            StockItemInterface::NOTIFY_STOCK_QTY => 0,
+            StockItemInterface::USE_CONFIG_QTY_INCREMENTS => 0,
+            StockItemInterface::QTY_INCREMENTS => 0,
+            StockItemInterface::USE_CONFIG_ENABLE_QTY_INC => 0,
+            StockItemInterface::ENABLE_QTY_INCREMENTS => 0,
+            StockItemInterface::USE_CONFIG_MANAGE_STOCK => 1,
+            StockItemInterface::MANAGE_STOCK => 1,
+            StockItemInterface::LOW_STOCK_DATE => null,
+            StockItemInterface::IS_DECIMAL_DIVIDED => 0,
+            StockItemInterface::STOCK_STATUS_CHANGED_AUTO => 0,
+        ];
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_in_stock.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_in_stock.php
new file mode 100644
index 0000000000000000000000000000000000000000..9f5be07e7658d2f67a265dca5408150db7773d4e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_in_stock.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Product');
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL)
+    ->setId(21)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Virtual Product')
+    ->setSku('virtual-product')
+    ->setPrice(10)
+    ->setTaxClassId(0)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(['is_in_stock' => 1])
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_in_stock_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_in_stock_rollback.php
new file mode 100644
index 0000000000000000000000000000000000000000..bed07e6d07bdde76fc362f6f7eb3df351d0d2a1a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_in_stock_rollback.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Registry');
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Product');
+$product->load(21);
+if ($product->getId()) {
+    $product->delete();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped.php
index d8ac7ad7a8ce3d5b75a0a6e2e2a25fa47f06afb7..eb9f71d2f896f1f341d5351fa030fd3c759ec072 100644
--- a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped.php
+++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped.php
@@ -5,7 +5,7 @@
  */
 
 require realpath(__DIR__ . '/../../') . '/Catalog/_files/product_simple_duplicated.php';
-require realpath(__DIR__ . '/../../') . '/Catalog/_files/product_virtual.php';
+require realpath(__DIR__ . '/../../') . '/Catalog/_files/product_virtual_in_stock.php';
 
 /** @var $product \Magento\Catalog\Model\Product */
 $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Product');