diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/FlatTableBuilderTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/FlatTableBuilderTest.php
index c57dd950dc3e01c038631b52d2eb76657f1c25b1..7e5a8305467e8e979a9ccc79d39d7ffdb70bb339 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/FlatTableBuilderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/FlatTableBuilderTest.php
@@ -141,7 +141,7 @@ class FlatTableBuilderTest extends \PHPUnit_Framework_TestCase
                 [$tableName],
                 ['catalog_product_website']
             )
-            ->willReturn(
+            ->willReturnOnConsecutiveCalls(
                 $tableName,
                 'catalog_product_website'
             );
@@ -184,12 +184,12 @@ class FlatTableBuilderTest extends \PHPUnit_Framework_TestCase
                 ],
                 [
                     $temporaryTableName,
-                    "e.{$linkField} = ${temporaryTableName}.{$linkField}",
+                    "e.{$linkField} = {$temporaryTableName}.{$linkField}",
                     [$linkField]
                 ],
                 [
                     $temporaryValueTableName,
-                    "e.${linkField} = " . $temporaryValueTableName . ".${linkField}",
+                    "e.{$linkField} = " . $temporaryValueTableName . ".{$linkField}",
                     [$linkField]
                 ]
             )->willReturnSelf();