diff --git a/src/Apps/W1/Shopify/Test/Catalogs/ShpfyCatalogPricesTest.Codeunit.al b/src/Apps/W1/Shopify/Test/Catalogs/ShpfyCatalogPricesTest.Codeunit.al
index e78f9db18e..d19f3433c8 100644
--- a/src/Apps/W1/Shopify/Test/Catalogs/ShpfyCatalogPricesTest.Codeunit.al
+++ b/src/Apps/W1/Shopify/Test/Catalogs/ShpfyCatalogPricesTest.Codeunit.al
@@ -46,7 +46,9 @@ codeunit 139646 "Shpfy Catalog Prices Test"
         ComparePrice: Decimal;
     begin
         // Creating test data.
-        LibraryPriceCalculation.DisableExtendedPriceCalculation();
+        // Extended pricing is on by default in the tenant; explicitly select the V15 handler so the legacy Sales Price / Sales Line Discount data path is exercised.
+        LibraryPriceCalculation.EnableExtendedPriceCalculation();
+        LibraryPriceCalculation.SetupDefaultHandler("Price Calculation Handler"::"Business Central (Version 15.0)");
         Shop := InitializeTest.CreateShop();
         Shop."Allow Line Disc." := false;
         Shop.Modify();
@@ -112,7 +114,9 @@ codeunit 139646 "Shpfy Catalog Prices Test"
         ComparePrice: Decimal;
     begin
         // Creating test data.
-        LibraryPriceCalculation.DisableExtendedPriceCalculation();
+        // Extended pricing is on by default in the tenant; explicitly select the V15 handler so the legacy Sales Price / Sales Line Discount data path is exercised.
+        LibraryPriceCalculation.EnableExtendedPriceCalculation();
+        LibraryPriceCalculation.SetupDefaultHandler("Price Calculation Handler"::"Business Central (Version 15.0)");
         Shop := InitializeTest.CreateShop();
         Shop."Allow Line Disc." := false;
         Shop.Modify();
diff --git a/src/Apps/W1/Shopify/Test/DisabledTests/ShpfyCatalogPricesTest.json b/src/Apps/W1/Shopify/Test/DisabledTests/ShpfyCatalogPricesTest.json
deleted file mode 100644
index 1d7984bb34..0000000000
--- a/src/Apps/W1/Shopify/Test/DisabledTests/ShpfyCatalogPricesTest.json
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-    {
-        "bug": "621557",
-        "codeunitId": 139646,
-        "CodeunitName": "Shpfy Catalog Prices Test",
-        "Method": "UnitTestCalcCatalogPrice"
-    },
-    {
-        "bug": "621557",
-        "codeunitId": 139646,
-        "CodeunitName": "Shpfy Catalog Prices Test",
-        "Method": "UnitTestCalcMarketCatalogPrice"
-    }
-]
\ No newline at end of file
diff --git a/src/Apps/W1/Shopify/Test/DisabledTests/ShpfyProductPriceCalcTest.json b/src/Apps/W1/Shopify/Test/DisabledTests/ShpfyProductPriceCalcTest.json
deleted file mode 100644
index 0a728636e5..0000000000
--- a/src/Apps/W1/Shopify/Test/DisabledTests/ShpfyProductPriceCalcTest.json
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-    {
-        "bug": "621557",
-        "codeunitId": 139605,
-        "CodeunitName": "Shpfy Product Price Calc. Test",
-        "Method": "UnitTestCalcPriceTest"
-    }
-]
diff --git a/src/Apps/W1/Shopify/Test/Products/ShpfyProductPriceCalcTest.Codeunit.al b/src/Apps/W1/Shopify/Test/Products/ShpfyProductPriceCalcTest.Codeunit.al
index 5b88fe6b76..d22e239f5a 100644
--- a/src/Apps/W1/Shopify/Test/Products/ShpfyProductPriceCalcTest.Codeunit.al
+++ b/src/Apps/W1/Shopify/Test/Products/ShpfyProductPriceCalcTest.Codeunit.al
@@ -44,7 +44,9 @@ codeunit 139605 "Shpfy Product Price Calc. Test"
         ComparePrice: Decimal;
     begin
         // [INIT] Initialization startup data.
-        LibraryPriceCalculation.DisableExtendedPriceCalculation();
+        // Extended pricing is on by default in the tenant; explicitly select the V15 handler so the legacy Sales Price / Sales Line Discount data path is exercised.
+        LibraryPriceCalculation.EnableExtendedPriceCalculation();
+        LibraryPriceCalculation.SetupDefaultHandler("Price Calculation Handler"::"Business Central (Version 15.0)");
         Shop := InitializeTest.CreateShop();
         Shop."Allow Line Disc." := false;
         Shop.Modify();