diff --git a/app/code/Magento/Catalog/Setup/UpgradeSchema.php b/app/code/Magento/Catalog/Setup/UpgradeSchema.php
index ae09ff1113608509504f0405ce62207251bc72f5..78106e3ff3a265c29dcb0ddb09445efe3f1a6287 100755
--- a/app/code/Magento/Catalog/Setup/UpgradeSchema.php
+++ b/app/code/Magento/Catalog/Setup/UpgradeSchema.php
@@ -714,11 +714,9 @@ class UpgradeSchema implements UpgradeSchemaInterface
      */
     private function removeAttributeSetRelation(SchemaSetupInterface $setup)
     {
-        $productTable = $setup->getTable('catalog_product_entity');
-        $attributeSetTable = $setup->getTable('eav_attribute_set');
         $setup->getConnection()->dropForeignKey(
-            $productTable,
-            $setup->getFkName($productTable, 'attribute_set_id', $attributeSetTable, 'attribute_set_id')
+            $setup->getTable('catalog_product_entity'),
+            $setup->getFkName('catalog_product_entity', 'attribute_set_id', 'eav_attribute_set', 'attribute_set_id')
         );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Plugin/Model/AttributeSetRepository/RemoveProductsTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Plugin/Model/AttributeSetRepository/RemoveProductsTest.php
index 724e2e62f230dac9d411862d833be9ae94d93915..2896716a01a04943c0acbe505c1e788265369338 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Plugin/Model/AttributeSetRepository/RemoveProductsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Plugin/Model/AttributeSetRepository/RemoveProductsTest.php
@@ -4,11 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\CatalogUrlRewrite\Plugin\Eav\AttributeSetRepository;
+namespace Magento\Catalog\Plugin\Model\AttributeSetRepository;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
-use Magento\Catalog\Plugin\Model\AttributeSetRepository\RemoveProducts;
 use Magento\Eav\Api\AttributeSetRepositoryInterface;
 use Magento\Eav\Model\Entity\Attribute\Set;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -36,7 +35,6 @@ class RemoveProductsTest extends TestCase
      * Test related to given attribute set products will be removed, if attribute set will be deleted.
      *
      * @magentoDataFixture Magento/Catalog/_files/attribute_set_with_product.php
-     * @magentoDbIsolation enabled
      */
     public function testAroundDelete()
     {