diff --git a/moodle/Tests/Util/DocblocksTest.php b/moodle/Tests/Util/DocblocksTest.php
index 9b14ba9..4483130 100644
--- a/moodle/Tests/Util/DocblocksTest.php
+++ b/moodle/Tests/Util/DocblocksTest.php
@@ -196,6 +196,46 @@ function exampleFunction(string $param): void {}',
                 function exampleFunction(string $param): void {}',
                 true,
             ],
+            'Behat test file: Valid' => [
+                'lib/tests/behat/behat_example.php',
+                '<?php
+                class behat_example {
+                    /**
+                     * @BeforeScenario
+                     * @AfterScenario
+                     * @BeforeFeature
+                     * @AfterFeature
+                     * @BeforeStep
+                     * @AfterStep
+                     * @Given
+                     * @When
+                     * @Then
+                     * @Given
+                     */
+                    function exampleFunction(string $param): void {}
+                }',
+                true,
+            ],
+            'Unit test file: Contains Behat' => [
+                'lib/tests/test_behat.php',
+                '<?php
+                class test_behat {
+                    /**
+                     * @BeforeScenario
+                     * @AfterScenario
+                     * @BeforeFeature
+                     * @AfterFeature
+                     * @BeforeStep
+                     * @AfterStep
+                     * @Given
+                     * @When
+                     * @Then
+                     * @Given
+                     */
+                    function exampleFunction(string $param): void {}
+                }',
+                false,
+            ],
         ];
     }
 
diff --git a/moodle/Util/Docblocks.php b/moodle/Util/Docblocks.php
index ef86bf0..2dea703 100644
--- a/moodle/Util/Docblocks.php
+++ b/moodle/Util/Docblocks.php
@@ -37,6 +37,12 @@ abstract class Docblocks
         'Given' => true,
         'Then' => true,
         'When' => true,
+        'BeforeFeature' => true,
+        'BeforeScenario' => true,
+        'BeforeStep' => true,
+        'AfterFeature' => true,
+        'AfterScenario' => true,
+        'AfterStep' => true,
 
         // PHPUnit tags.
         'codeCoverageIgnore' => true,
@@ -118,6 +124,13 @@ abstract class Docblocks
         'Given' => ['#.*/tests/behat/.*#'],
         'Then' => ['#.*/tests/behat/.*#'],
         'When' => ['#.*/tests/behat/.*#'],
+        'BeforeFeature' => ['#.*/tests/behat/.*#'],
+        'BeforeScenario' => ['#.*/tests/behat/.*#'],
+        'BeforeStep' => ['#.*/tests/behat/.*#'],
+        'AfterFeature' => ['#.*/tests/behat/.*#'],
+        'AfterScenario' => ['#.*/tests/behat/.*#'],
+        'AfterStep' => ['#.*/tests/behat/.*#'],
+
         'covers' => ['#.*/tests/.*_test.php#'],
         'coversDefaultClass' => ['#.*/tests/.*_test.php#'],
         'coversNothing' => ['#.*/tests/.*_test.php#'],