diff --git a/features/using_variadic_arguments_in_behat_steps_definitions.feature b/features/using_variadic_arguments_in_behat_steps_definitions.feature
deleted file mode 100644
index db9cf6d..0000000
--- a/features/using_variadic_arguments_in_behat_steps_definitions.feature
+++ /dev/null
@@ -1,64 +0,0 @@
-Feature: Using variadic arguments in Behat steps definitions
-    In order to make Behat steps definitions cleaner and more readable
-    As a Behat User
-    I want to use variadic arguments in these
-
-    Background:
-        Given a context file "features/bootstrap/FeatureContext.php" containing:
-        """
-        <?php
-        use Behat\Behat\Context\Context;
-        class FeatureContext implements Context
-        {
-            /**
-             * @When I use a step with :two :arguments
-             * @When /^I use another step (\w+) (\w+) (\w+)$/
-             */
-            public function iUseAStepWith(...$variadic)
-            {
-                printf('Number of passed arguments: %d', count($variadic));
-            }
-        }
-        """
-
-    Scenario: Enabled variadic support for steps with turnip notation
-        Given a Behat configuration containing:
-        """
-        default:
-            extensions:
-                FriendsOfBehat\VariadicExtension: ~
-        """
-        And a feature file "features/enabled_variadic_support.feature" containing:
-        """
-        Feature: Enabled variadic support feature
-            Scenario: Enabled variadic support scenario
-                When I use a step with two arguments
-        """
-        When I run Behat
-        Then it should pass with "Number of passed arguments: 2"
-
-    Scenario: Enabled variadic support for steps with regexp notation
-        Given a Behat configuration containing:
-        """
-        default:
-            extensions:
-                FriendsOfBehat\VariadicExtension: ~
-        """
-        And a feature file "features/enabled_variadic_support.feature" containing:
-        """
-        Feature: Enabled variadic support feature
-            Scenario: Enabled variadic support scenario
-                When I use another step with three arguments
-        """
-        When I run Behat
-        Then it should pass with "Number of passed arguments: 3"
-
-    Scenario: Disabled variadic support
-        And a feature file "features/enabled_variadic_support.feature" containing:
-        """
-        Feature: Enabled variadic support feature
-            Scenario: Enabled variadic support scenario
-                When I use a step with two arguments
-        """
-        When I run Behat
-        Then it should pass with "Number of passed arguments: 1"
diff --git a/features/using_variadic_arguments_in_steps_definitions_with_named_parameters.feature b/features/using_variadic_arguments_in_steps_definitions_with_named_parameters.feature
new file mode 100644
index 0000000..b9ac9ac
--- /dev/null
+++ b/features/using_variadic_arguments_in_steps_definitions_with_named_parameters.feature
@@ -0,0 +1,52 @@
+Feature: Using variadic arguments in steps definitions with named parameters
+    In order to make Behat steps definitions cleaner and more readable
+    As a Behat User
+    I want to use variadic arguments in these
+
+    Background:
+        Given a Behat configuration containing:
+        """
+        default:
+            extensions:
+                FriendsOfBehat\VariadicExtension: ~
+        """
+        And a context file "features/bootstrap/FeatureContext.php" containing:
+        """
+        <?php
+
+        use Behat\Behat\Context\Context;
+
+        class FeatureContext implements Context
+        {
+            /**
+             * @When I pass :firstArgument and :secondArgument as arguments
+             * @When I pass :firstArgument, :secondArgument and :thirdArgument as arguments
+             */
+            public function iPass(...$arguments)
+            {
+                printf('Number of passed arguments: %d', count($arguments));
+            }
+        }
+        """
+
+    Scenario: Using two variadic arguments as the only ones
+        Given a feature file "features/variadics_arguments_support.feature" containing:
+        """
+        Feature: Passing arguments
+
+            Scenario: Passing two arguments
+                When I pass "foo" and "bar" as arguments
+        """
+        When I run Behat
+        Then it should pass with "Number of passed arguments: 2"
+
+    Scenario: Using three variadic arguments as the only ones
+        Given a feature file "features/variadics_arguments_support.feature" containing:
+        """
+        Feature: Passing arguments
+
+            Scenario: Passing three arguments
+                When I pass "foo", "bar" and "baz" as arguments
+        """
+        When I run Behat
+        Then it should pass with "Number of passed arguments: 3"
diff --git a/features/using_variadic_arguments_in_steps_definitions_with_not_named_parameters.feature b/features/using_variadic_arguments_in_steps_definitions_with_not_named_parameters.feature
new file mode 100644
index 0000000..37b4c34
--- /dev/null
+++ b/features/using_variadic_arguments_in_steps_definitions_with_not_named_parameters.feature
@@ -0,0 +1,52 @@
+Feature: Using variadic arguments in Behat steps definitions with not named parameters
+    In order to make Behat steps definitions cleaner and more readable
+    As a Behat User
+    I want to use variadic arguments in these
+
+    Background:
+        Given a Behat configuration containing:
+        """
+        default:
+            extensions:
+                FriendsOfBehat\VariadicExtension: ~
+        """
+        And a context file "features/bootstrap/FeatureContext.php" containing:
+        """
+        <?php
+
+        use Behat\Behat\Context\Context;
+
+        class FeatureContext implements Context
+        {
+            /**
+             * @When /^I pass "(\w+)" and "(\w+)" as arguments$/
+             * @When /^I pass "(\w+)", "(\w+)" and "(\w+)" as arguments$/
+             */
+            public function iPass(...$arguments)
+            {
+                printf('Number of passed arguments: %d', count($arguments));
+            }
+        }
+        """
+
+    Scenario: Using two variadic arguments as the only ones
+        Given a feature file "features/variadic_arguments_support.feature" containing:
+        """
+        Feature: Passing arguments
+
+            Scenario: Passing two arguments
+                When I pass "foo" and "bar" as arguments
+        """
+        When I run Behat
+        Then it should pass with "Number of passed arguments: 2"
+
+    Scenario: Using three variadic arguments as the only ones
+        Given a feature file "features/variadic_arguments_support.feature" containing:
+        """
+        Feature: Passing arguments
+
+            Scenario: Passing three arguments
+                When I pass "foo", "bar" and "baz" as arguments
+        """
+        When I run Behat
+        Then it should pass with "Number of passed arguments: 3"