diff --git a/helm/tests/api-configmap_test.yaml b/helm/tests/api-configmap_test.yaml
index 17b05224ee8..8316768a211 100644
--- a/helm/tests/api-configmap_test.yaml
+++ b/helm/tests/api-configmap_test.yaml
@@ -579,3 +579,46 @@ tests:
       - matchRegex:
           path: data.[gravitee.yml]
           pattern: "[ ]{12}- /path/to/default/keystore3.pem"
+<<<<<<< HEAD
+=======
+
+
+  - it: should set allowed from
+    set:
+      smtp:
+        allowedfrom:
+          - email@from
+        enabled: true
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: ConfigMap
+      - matchRegex:
+          path: data.[gravitee.yml]
+          pattern: " *email:\n
+                     *  allowedfrom:\n
+                     *  - email@from\n
+                     *  enabled: true"
+
+  - it: should set allowed from with custom values
+    set:
+      smtp:
+        allowedfrom:
+          - '*@company.com'
+          - specific@email.com
+        enabled: true
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: ConfigMap
+      - matchRegex:
+          path: data.[gravitee.yml]
+          pattern: " *email:\n
+                     *  allowedfrom:\n
+                     *  - '\\*@company\\.com'\n
+                     *  - specific@email\\.com\n
+                     *  enabled: true"
+
+>>>>>>> 076f4046bf (fix(helm): previous refactor as failling tests)