diff --git a/doc/api.md b/doc/api.md
index f9c995cf8..44937e0d5 100644
--- a/doc/api.md
+++ b/doc/api.md
@@ -593,7 +593,7 @@ Additionally, for attribute expressions (`expression`, `entity_name`), `entityNa
 (`expression`) measures are available in the **context** used to evaluate them.
 
 Attribute metadata and Static Attribute metadata are available in the **context** under the following convention:
-`metadata.AttributeName.MetadataName` or `metadata.StaticAttributeName.MetadataName` in a similar way of defined for
+`metadata_AttributeName_MetadataName` or `metadata_StaticAttributeName_MetadataName` in a similar way of defined for
 [Context Broker](https://github.com/telefonicaid/fiware-orion/blob/master/doc/manuals/orion-api.md#metadata-support)
 
 ### Examples of JEXL expressions
diff --git a/lib/services/ngsi/entities-NGSI-v2.js b/lib/services/ngsi/entities-NGSI-v2.js
index e09b98505..45c035a43 100644
--- a/lib/services/ngsi/entities-NGSI-v2.js
+++ b/lib/services/ngsi/entities-NGSI-v2.js
@@ -279,7 +279,7 @@ function sendUpdateValueNgsi2(entityName, originMeasures, originTypeInformation,
             return attrs.reduce((result, item) => {
                 if (item.metadata !== undefined) {
                     for (var meta in item.metadata) {
-                        result['metadata.' + item.name + '.' + meta] = item.metadata[meta].value;
+                        result['metadata_' + item.name + '_' + meta] = item.metadata[meta].value;
                     }
                 }
                 return result;
diff --git a/test/functional/testCases.js b/test/functional/testCases.js
index d389ed03b..90e9809d5 100644
--- a/test/functional/testCases.js
+++ b/test/functional/testCases.js
@@ -1831,7 +1831,6 @@ const testCases = [
     {
         describeName:
             '0175 - Simple group with active attribute + JEXL expression referencing metadata context attributes',
-        skip: 'lib', // Explanation in #1523
         provision: {
             url: 'http://localhost:' + config.iota.server.port + '/iot/services',
             method: 'POST',
@@ -1861,9 +1860,10 @@ const testCases = [
                                 object_id: 'a',
                                 name: 'attr_a',
                                 type: 'Number',
-                                expression: 'a*st_attr*metadata.st_attr.coef'
+                                expression: 'a*st_attr*metadata_st_attr_coef'
                             }
-                        ]
+                        ],
+                        explicitAttrs: "['attr_a']"
                     }
                 ]
             },