diff --git a/docs/utilities/feature_flags.md b/docs/utilities/feature_flags.md
index 2953f6e773c..89393ddd54f 100644
--- a/docs/utilities/feature_flags.md
+++ b/docs/utilities/feature_flags.md
@@ -827,10 +827,10 @@ def test_flags_condition_match(mocker):
 	expected_value = True
 	mocked_app_config_schema = {
 		"my_feature": {
-			"default": expected_value,
+			"default": False,
 			"rules": {
 				"tenant id equals 12345": {
-					"when_match": True,
+					"when_match": expected_value,
 					"conditions": [
 						{
 							"action": RuleAction.EQUALS.value,
diff --git a/tests/functional/feature_flags/test_feature_flags.py b/tests/functional/feature_flags/test_feature_flags.py
index 12568c750e4..5329dc33acd 100644
--- a/tests/functional/feature_flags/test_feature_flags.py
+++ b/tests/functional/feature_flags/test_feature_flags.py
@@ -808,10 +808,10 @@ def test_flags_not_equal_match(mocker, config):
     expected_value = True
     mocked_app_config_schema = {
         "my_feature": {
-            "default": expected_value,
+            "default": False,
             "rules": {
                 "tenant id not equals 345345435": {
-                    "when_match": True,
+                    "when_match": expected_value,
                     "conditions": [
                         {
                             "action": RuleAction.NOT_EQUALS.value,
@@ -889,10 +889,10 @@ def test_flags_less_than_match(mocker, config):
     expected_value = True
     mocked_app_config_schema = {
         "my_feature": {
-            "default": expected_value,
+            "default": False,
             "rules": {
                 "Date less than 2021.10.31": {
-                    "when_match": True,
+                    "when_match": expected_value,
                     "conditions": [
                         {
                             "action": RuleAction.KEY_LESS_THAN_VALUE.value,
@@ -946,10 +946,10 @@ def test_flags_less_than_or_equal_match_1(mocker, config):
     expected_value = True
     mocked_app_config_schema = {
         "my_feature": {
-            "default": expected_value,
+            "default": False,
             "rules": {
                 "Date less than or equal 2021.10.31": {
-                    "when_match": True,
+                    "when_match": expected_value,
                     "conditions": [
                         {
                             "action": RuleAction.KEY_LESS_THAN_OR_EQUAL_VALUE.value,
@@ -974,10 +974,10 @@ def test_flags_less_than_or_equal_match_2(mocker, config):
     expected_value = True
     mocked_app_config_schema = {
         "my_feature": {
-            "default": expected_value,
+            "default": False,
             "rules": {
                 "Date less than or equal 2021.10.31": {
-                    "when_match": True,
+                    "when_match": expected_value,
                     "conditions": [
                         {
                             "action": RuleAction.KEY_LESS_THAN_OR_EQUAL_VALUE.value,
@@ -1059,10 +1059,10 @@ def test_flags_greater_than_match(mocker, config):
     expected_value = True
     mocked_app_config_schema = {
         "my_feature": {
-            "default": expected_value,
+            "default": False,
             "rules": {
                 "Date greater than 2021.10.31": {
-                    "when_match": True,
+                    "when_match": expected_value,
                     "conditions": [
                         {
                             "action": RuleAction.KEY_GREATER_THAN_VALUE.value,
@@ -1116,10 +1116,10 @@ def test_flags_greater_than_or_equal_match_1(mocker, config):
     expected_value = True
     mocked_app_config_schema = {
         "my_feature": {
-            "default": expected_value,
+            "default": False,
             "rules": {
                 "Date greater than or equal 2021.10.31": {
-                    "when_match": True,
+                    "when_match": expected_value,
                     "conditions": [
                         {
                             "action": RuleAction.KEY_GREATER_THAN_OR_EQUAL_VALUE.value,
@@ -1144,10 +1144,10 @@ def test_flags_greater_than_or_equal_match_2(mocker, config):
     expected_value = True
     mocked_app_config_schema = {
         "my_feature": {
-            "default": expected_value,
+            "default": False,
             "rules": {
                 "Date greater than or equal 2021.10.31": {
-                    "when_match": True,
+                    "when_match": expected_value,
                     "conditions": [
                         {
                             "action": RuleAction.KEY_GREATER_THAN_OR_EQUAL_VALUE.value,