diff --git a/.editorconfig b/.editorconfig
index c6f3cf49..089d5461 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,5 +1,6 @@
 # This file is for unifying the coding style for different editors and IDEs
-# editorconfig.org
+# It is based on https://core.trac.wordpress.org/browser/trunk/.editorconfig
+# See https://editorconfig.org for more information about the standard.
 
 # WordPress Coding Standards
 # https://make.wordpress.org/core/handbook/coding-standards/
@@ -13,12 +14,12 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 indent_style = tab
 
-[*.yml]
+[{*.yml,*.feature}]
 indent_style = space
 indent_size = 2
 
 [*.md]
 trim_trailing_whitespace = false
 
-[{*.txt,wp-config-sample.php}]
+[*.txt]
 end_of_line = crlf
diff --git a/.github/workflows/behat-test.yml b/.github/workflows/behat-test.yml
new file mode 100644
index 00000000..f4d8a21e
--- /dev/null
+++ b/.github/workflows/behat-test.yml
@@ -0,0 +1,27 @@
+name: Behat Testing
+
+on:
+  push:
+    paths:
+      - '.github/workflows/behat-test.yml'
+      - '**.php'
+      - '**.feature'
+      - 'behat.yml'
+      - 'composer.json'
+  pull_request:
+    paths:
+      - '.github/workflows/behat-test.yml'
+      - '**.php'
+      - '**.feature'
+      - 'behat.yml'
+      - 'composer.json'
+    types:
+      - opened
+      - reopened
+      - synchronize
+
+  workflow_dispatch:
+
+jobs:
+  behat:
+    uses: automattic/wpvip-plugins-.github/.github/workflows/reusable-behat-test.yml@trunk