diff --git a/tests/Api/DataFixtures/ORM/gateway_config_payment_request.yaml b/tests/Api/DataFixtures/ORM/gateway_config_payment_request.yaml
new file mode 100644
index 0000000000..48164b8d79
--- /dev/null
+++ b/tests/Api/DataFixtures/ORM/gateway_config_payment_request.yaml
@@ -0,0 +1,6 @@
+Sylius\Bundle\PayumBundle\Model\GatewayConfig:
+    gateway_offline:
+        gatewayName: 'Offline'
+        factoryName: 'offline'
+        usePayum: false
+        config: []
diff --git a/tests/Api/DataFixtures/ORM/payment_method.yaml b/tests/Api/DataFixtures/ORM/payment_method.yaml
index f17555845e..d263887087 100644
--- a/tests/Api/DataFixtures/ORM/payment_method.yaml
+++ b/tests/Api/DataFixtures/ORM/payment_method.yaml
@@ -43,4 +43,5 @@ Sylius\Bundle\PayumBundle\Model\GatewayConfig:
     gateway_offline:
         gatewayName: 'Offline'
         factoryName: 'offline'
+        usePayum: true
         config: []
diff --git a/tests/Api/Shop/PaymentRequestsTest.php b/tests/Api/Shop/PaymentRequestsTest.php
index 2500b42bb8..57522bbd4c 100644
--- a/tests/Api/Shop/PaymentRequestsTest.php
+++ b/tests/Api/Shop/PaymentRequestsTest.php
@@ -262,25 +262,20 @@ final class PaymentRequestsTest extends JsonApiTestCase
 
     public function createPaymentRequestProvider(): iterable
     {
-        $environment = getenv('APP_ENV');
+        yield 'Payment request' => [
+            [
+                'authentication/shop_user.yaml',
+                'channel/channel.yaml',
+                'cart.yaml',
+                'country.yaml',
+                'shipping_method.yaml',
+                'payment_method.yaml',
+                'gateway_config_payment_request.yaml',
+            ],
+            'shop/payment_request/post_payment_request',
+        ];
 
-        if ($environment === 'test_cached_payum') {
-            yield [
-                [
-                    'authentication/shop_user.yaml',
-                    'channel/channel.yaml',
-                    'cart.yaml',
-                    'country.yaml',
-                    'shipping_method.yaml',
-                    'payment_method.yaml',
-                ],
-                'shop/payment_request/post_payment_request_payum',
-            ];
-
-            return;
-        }
-
-        yield [
+        yield 'Payum' => [
             [
                 'authentication/shop_user.yaml',
                 'channel/channel.yaml',
@@ -289,38 +284,33 @@ final class PaymentRequestsTest extends JsonApiTestCase
                 'shipping_method.yaml',
                 'payment_method.yaml',
             ],
-            'shop/payment_request/post_payment_request',
+            'shop/payment_request/post_payment_request_payum',
         ];
     }
 
-    public function updatePaymentRequestProvider(): iterable
+    public static function updatePaymentRequestProvider(): iterable
     {
-        $environment = getenv('APP_ENV');
-
-        if ($environment === 'test_cached_payum') {
-            yield [
-                [
-                    'authentication/shop_user.yaml',
-                    'channel/channel.yaml',
-                    'payment_method.yaml',
-                    'payment_request/payment_request_payum.yaml',
-                    'payment_request/order_with_customer.yaml',
-                ],
-                'shop/payment_request/put_payment_request_payum',
-            ];
-
-            return;
-        }
-
-        yield [
+        yield 'Payment Request' => [
             [
                 'authentication/shop_user.yaml',
                 'channel/channel.yaml',
                 'payment_method.yaml',
+                'gateway_config_payment_request.yaml',
                 'payment_request/payment_request.yaml',
                 'payment_request/order_with_customer.yaml',
             ],
             'shop/payment_request/put_payment_request',
         ];
+
+        yield 'Payum' => [
+            [
+                'authentication/shop_user.yaml',
+                'channel/channel.yaml',
+                'payment_method.yaml',
+                'payment_request/payment_request_payum.yaml',
+                'payment_request/order_with_customer.yaml',
+            ],
+            'shop/payment_request/put_payment_request_payum',
+        ];
     }
 }