diff --git a/gherkin/config.feature b/gherkin/config.feature
index 811f51f..350eddf 100644
--- a/gherkin/config.feature
+++ b/gherkin/config.feature
@@ -1,5 +1,5 @@
 Feature: Configuration Test
-  """markdown
+"""markdown
   This is the official option configuration table
   | Option name           | Environment variable name      | Explanation                                                                     | Type & Values                | Default                       | Compatible resolver |
   | --------------------- | ------------------------------ | ------------------------------------------------------------------------------- | ---------------------------- | ----------------------------- | ------------------- |
@@ -96,12 +96,12 @@ Feature: Configuration Test
     When a config was initialized
     Then the option "<option>" of type "<type>" should have the value "<value>"
     Examples:
-      | option   | type         | value      |
-      | resolver | ResolverType | in-process |
-      | host     | String       | local      |
-      | tls      | Boolean      | True       |
-      | port     | Integer      | 1234       |
-      | deadline | Integer      | 123        |
+      | option     | type         | value      |
+      | resolver   | ResolverType | in-process |
+      | host       | String       | local      |
+      | tls        | Boolean      | True       |
+      | port       | Integer      | 1234       |
+      | deadlineMs | Integer      | 123        |
     @targetURI
     Examples: Target URI
       | option    | type   | value |
@@ -147,15 +147,15 @@ Feature: Configuration Test
     When a config was initialized
     Then the option "<option>" of type "<type>" should have the value "<value>"
     Examples:
-      | option   | env               | type         | value      |
-      | resolver | FLAGD_RESOLVER    | ResolverType | in-process |
-      | resolver | FLAGD_RESOLVER    | ResolverType | IN-PROCESS |
-      | resolver | FLAGD_RESOLVER    | ResolverType | rpc        |
-      | resolver | FLAGD_RESOLVER    | ResolverType | RPC        |
-      | host     | FLAGD_HOST        | String       | local      |
-      | tls      | FLAGD_TLS         | Boolean      | True       |
-      | port     | FLAGD_PORT        | Integer      | 1234       |
-      | deadline | FLAGD_DEADLINE_MS | Integer      | 123        |
+      | option     | env               | type         | value      |
+      | resolver   | FLAGD_RESOLVER    | ResolverType | in-process |
+      | resolver   | FLAGD_RESOLVER    | ResolverType | IN-PROCESS |
+      | resolver   | FLAGD_RESOLVER    | ResolverType | rpc        |
+      | resolver   | FLAGD_RESOLVER    | ResolverType | RPC        |
+      | host       | FLAGD_HOST        | String       | local      |
+      | tls        | FLAGD_TLS         | Boolean      | True       |
+      | port       | FLAGD_PORT        | Integer      | 1234       |
+      | deadlineMs | FLAGD_DEADLINE_MS | Integer      | 123        |
     @targetURI
     Examples: Target URI
       | option    | env              | type   | value |
@@ -202,12 +202,12 @@ Feature: Configuration Test
     When a config was initialized
     Then the option "<option>" of type "<type>" should have the value "<value>"
     Examples:
-      | option   | env               | type         | value      | env-value |
-      | resolver | FLAGD_RESOLVER    | ResolverType | in-process | rpc       |
-      | host     | FLAGD_HOST        | String       | local      | l         |
-      | tls      | FLAGD_TLS         | Boolean      | True       | False     |
-      | port     | FLAGD_PORT        | Integer      | 1234       | 3456      |
-      | deadline | FLAGD_DEADLINE_MS | Integer      | 123        | 345       |
+      | option     | env               | type         | value      | env-value |
+      | resolver   | FLAGD_RESOLVER    | ResolverType | in-process | rpc       |
+      | host       | FLAGD_HOST        | String       | local      | l         |
+      | tls        | FLAGD_TLS         | Boolean      | True       | False     |
+      | port       | FLAGD_PORT        | Integer      | 1234       | 3456      |
+      | deadlineMs | FLAGD_DEADLINE_MS | Integer      | 123        | 345       |
     @targetURI
     Examples: Target URI
       | option    | env              | type   | value | env-value |
diff --git a/gherkin/events.feature b/gherkin/events.feature
new file mode 100644
index 0000000..946eece
--- /dev/null
+++ b/gherkin/events.feature
@@ -0,0 +1,29 @@
+Feature: flagd providers
+
+  # This test suite contains scenarios to test flagd providers.
+  # It's associated with the flags configured in flags/changing-flag.json and flags/zero-flags.json.
+  # It should be used in conjunction with the suites supplied by the OpenFeature specification.
+
+  Background:
+    Given a flagd provider is set
+
+  # events
+  Scenario Outline: Provider events
+    When a <event> handler is added
+    Then the <event> handler must run
+    Examples:
+      | event                          |
+      | PROVIDER_ERROR                 |
+      | PROVIDER_STALE                 |
+      | PROVIDER_READY                 |
+
+  # events
+  Scenario: Provider events chain ready -> stale -> error -> ready
+    When a PROVIDER_READY handler is added
+    Then the PROVIDER_READY handler must run
+    When a PROVIDER_STALE handler is added
+    Then the PROVIDER_STALE handler must run
+    When a PROVIDER_ERROR handler is added
+    Then the PROVIDER_ERROR handler must run
+    When a PROVIDER_READY handler is added
+    Then the PROVIDER_READY handler must run