diff --git a/test/unit/expressions/expressionBasedTransformations-test.js b/test/unit/expressions/expressionBasedTransformations-test.js
index cc350bad3..c59cafb9c 100644
--- a/test/unit/expressions/expressionBasedTransformations-test.js
+++ b/test/unit/expressions/expressionBasedTransformations-test.js
@@ -118,7 +118,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
         deviceRegistrationDuration: 'P1M'
     };
 
-describe('Expression-based transformations plugin', function() {
+describe('NGSI-v1 - Expression-based transformations plugin', function() {
     beforeEach(function(done) {
         logger.setLevel('FATAL');
 
diff --git a/test/unit/general/contextBrokerKeystoneSecurityAccess-test.js b/test/unit/general/contextBrokerKeystoneSecurityAccess-test.js
index 66414be2e..ddfca1bf3 100644
--- a/test/unit/general/contextBrokerKeystoneSecurityAccess-test.js
+++ b/test/unit/general/contextBrokerKeystoneSecurityAccess-test.js
@@ -87,7 +87,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
         deviceRegistrationDuration: 'P1M'
     };
 
-describe('Secured access to the Context Broker with Keystone', function() {
+describe('NGSI-v1 - Secured access to the Context Broker with Keystone', function() {
     var values = [
         {
             name: 'state',
diff --git a/test/unit/general/contextBrokerOAuthSecurityAccess-test.js b/test/unit/general/contextBrokerOAuthSecurityAccess-test.js
index 112b50bf5..59d2bf191 100644
--- a/test/unit/general/contextBrokerOAuthSecurityAccess-test.js
+++ b/test/unit/general/contextBrokerOAuthSecurityAccess-test.js
@@ -88,7 +88,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
         deviceRegistrationDuration: 'P1M'
     };
 
-describe('Secured access to the Context Broker with OAuth2 provider', function() {
+describe('NGSI-v1 - Secured access to the Context Broker with OAuth2 provider', function() {
     var values = [
         {
             name: 'state',
diff --git a/test/unit/general/deviceService-test.js b/test/unit/general/deviceService-test.js
index 65b87f220..ebf65bce9 100644
--- a/test/unit/general/deviceService-test.js
+++ b/test/unit/general/deviceService-test.js
@@ -168,7 +168,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
 
 
 /* jshint camelcase: false */
-describe('Device Service: utils', function() {
+describe('NGSI-v1 - Device Service: utils', function() {
     beforeEach(function(done) {
         nock.cleanAll();
         logger.setLevel('FATAL');
diff --git a/test/unit/general/https-support-test.js b/test/unit/general/https-support-test.js
index 5f3b62bce..0de605597 100644
--- a/test/unit/general/https-support-test.js
+++ b/test/unit/general/https-support-test.js
@@ -122,7 +122,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
     iotamMock;
 
 
-describe('HTTPS support tests IOTAM', function() {
+describe('NGSI-v1 - HTTPS support tests IOTAM', function() {
 
     describe('When the IoT Agents is started with https "iotManager" config', function() {
         beforeEach(function(done) {
@@ -154,7 +154,7 @@ describe('HTTPS support tests IOTAM', function() {
     });
 });
 
-describe('HTTPS support tests', function() {
+describe('NGSI-v1 - HTTPS support tests', function() {
 
     describe('When subscription is sent to HTTPS context broker', function() {
         beforeEach(function(done) {
diff --git a/test/unit/general/iotam-autoregistration-test.js b/test/unit/general/iotam-autoregistration-test.js
index d1840f45c..ce87bb577 100644
--- a/test/unit/general/iotam-autoregistration-test.js
+++ b/test/unit/general/iotam-autoregistration-test.js
@@ -186,7 +186,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
     },
     iotamMock;
 
-describe('IoT Manager autoregistration', function() {
+describe('NGSI-v1 - IoT Manager autoregistration', function() {
     describe('When the IoT Agent is started without a "iotManager" config parameter and empty services', function() {
         beforeEach(function() {
             nock.cleanAll();
diff --git a/test/unit/general/startup-test.js b/test/unit/general/startup-test.js
index bcedc6e3e..2d84574a3 100644
--- a/test/unit/general/startup-test.js
+++ b/test/unit/general/startup-test.js
@@ -62,7 +62,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
     iotAgentConfigNoTypes = _.clone(iotAgentConfig),
     iotamMock;
 
-describe('Startup tests', function() {
+describe('NGSI-v1 - Startup tests', function() {
     describe('When the IoT Agent is started without a "providerUrl" config parameter', function() {
         beforeEach(function() {
             delete iotAgentConfigNoUrl.providerUrl;
diff --git a/test/unit/lazyAndCommands/active-devices-attribute-update-test.js b/test/unit/lazyAndCommands/active-devices-attribute-update-test.js
index 5861375b3..65cc544b2 100644
--- a/test/unit/lazyAndCommands/active-devices-attribute-update-test.js
+++ b/test/unit/lazyAndCommands/active-devices-attribute-update-test.js
@@ -62,7 +62,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
         subservice: 'gardens'
     };
 
-describe('Update attribute functionalities', function() {
+describe('NGSI-v1 - Update attribute functionalities', function() {
 
     beforeEach(function(done) {
         logger.setLevel('FATAL');
diff --git a/test/unit/lazyAndCommands/command-test.js b/test/unit/lazyAndCommands/command-test.js
index 28e796e46..ea5473100 100644
--- a/test/unit/lazyAndCommands/command-test.js
+++ b/test/unit/lazyAndCommands/command-test.js
@@ -107,7 +107,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
         subservice: 'gardens'
     };
 
-describe('Command functionalities', function() {
+describe('NGSI-v1 - Command functionalities', function() {
     beforeEach(function(done) {
         logger.setLevel('FATAL');
 
diff --git a/test/unit/lazyAndCommands/lazy-devices-test.js b/test/unit/lazyAndCommands/lazy-devices-test.js
index fc1af7e82..c21a19583 100644
--- a/test/unit/lazyAndCommands/lazy-devices-test.js
+++ b/test/unit/lazyAndCommands/lazy-devices-test.js
@@ -138,7 +138,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
         }
     };
 
-describe('IoT Agent Lazy Devices', function() {
+describe('NGSI-v1 - IoT Agent Lazy Devices', function() {
     beforeEach(function(done) {
         logger.setLevel('FATAL');
         mongoUtils.cleanDbs(done);
diff --git a/test/unit/lazyAndCommands/polling-commands-test.js b/test/unit/lazyAndCommands/polling-commands-test.js
index 16ccc32bc..b138432dc 100644
--- a/test/unit/lazyAndCommands/polling-commands-test.js
+++ b/test/unit/lazyAndCommands/polling-commands-test.js
@@ -119,7 +119,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
         polling: true
     };
 
-describe('Polling commands', function() {
+describe('NGSI-v1 - Polling commands', function() {
     beforeEach(function(done) {
         logger.setLevel('FATAL');
 
diff --git a/test/unit/ngsiService/active-devices-test.js b/test/unit/ngsiService/active-devices-test.js
index 648f9a392..5297d4da1 100644
--- a/test/unit/ngsiService/active-devices-test.js
+++ b/test/unit/ngsiService/active-devices-test.js
@@ -118,7 +118,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
         deviceRegistrationDuration: 'P1M'
     };
 
-describe('Active attributes test', function() {
+describe('NGSI-v1 - Active attributes test', function() {
     var values = [
         {
             name: 'state',
diff --git a/test/unit/ngsiService/staticAttributes-test.js b/test/unit/ngsiService/staticAttributes-test.js
index f062905ef..747f1fe58 100644
--- a/test/unit/ngsiService/staticAttributes-test.js
+++ b/test/unit/ngsiService/staticAttributes-test.js
@@ -81,7 +81,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
     };
 
 
-describe('Static attributes test', function() {
+describe('NGSI-v1 - Static attributes test', function() {
     var values = [
         {
             name: 'state',
diff --git a/test/unit/ngsiService/subscriptions-test.js b/test/unit/ngsiService/subscriptions-test.js
index 8a73a5a1e..0975977cc 100644
--- a/test/unit/ngsiService/subscriptions-test.js
+++ b/test/unit/ngsiService/subscriptions-test.js
@@ -44,7 +44,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
         deviceRegistrationDuration: 'P1M'
     };
 
-describe('Subscription tests', function() {
+describe('NGSI-v1 - Subscription tests', function() {
     beforeEach(function(done) {
         var optionsProvision = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
diff --git a/test/unit/ngsiv2/expressions/expressionBasedTransformations-test.js b/test/unit/ngsiv2/expressions/expressionBasedTransformations-test.js
index 35144ac38..52f213fef 100644
--- a/test/unit/ngsiv2/expressions/expressionBasedTransformations-test.js
+++ b/test/unit/ngsiv2/expressions/expressionBasedTransformations-test.js
@@ -193,7 +193,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
         providerUrl: 'http://smartGondor.com'
     };
 
-describe('Expression-based transformations plugin', function() {
+describe('NGSI-v2 - Expression-based transformations plugin', function() {
     beforeEach(function(done) {
         logger.setLevel('FATAL');
 
diff --git a/test/unit/ngsiv2/general/contextBrokerOAuthSecurityAccess-test.js b/test/unit/ngsiv2/general/contextBrokerOAuthSecurityAccess-test.js
index 17aa680d2..929eb9d9a 100644
--- a/test/unit/ngsiv2/general/contextBrokerOAuthSecurityAccess-test.js
+++ b/test/unit/ngsiv2/general/contextBrokerOAuthSecurityAccess-test.js
@@ -89,7 +89,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
         providerUrl: 'http://smartGondor.com'
     };
 
-describe('Secured access to the Context Broker with OAuth2 provider', function() {
+describe('NGSI-v2 - Secured access to the Context Broker with OAuth2 provider', function() {
     var values = [
         {
             name: 'state',
@@ -344,7 +344,7 @@ describe('Secured access to the Context Broker with OAuth2 provider', function()
     });
 });
 
-describe('Secured access to the Context Broker with OAuth2 provider (FIWARE Keyrock IDM)', function() {
+describe('NGSI-v2 - Secured access to the Context Broker with OAuth2 provider (FIWARE Keyrock IDM)', function() {
 
     var values = [
         {
@@ -527,7 +527,7 @@ describe('Secured access to the Context Broker with OAuth2 provider (FIWARE Keyr
     });
 });
 
-describe('Secured access to the Context Broker with OAuth2 provider (FIWARE Keyrock IDM)' +
+describe('NGSI-v2 - Secured access to the Context Broker with OAuth2 provider (FIWARE Keyrock IDM)' +
     'configured through group provisioning', function() {
     var groupCreation = {
         url: 'http://localhost:4041/iot/services',
@@ -727,7 +727,7 @@ describe('Secured access to the Context Broker with OAuth2 provider (FIWARE Keyr
     });
 });
 
-describe('Secured access to the Context Broker with OAuth2 provider (FIWARE Keyrock IDM)' +
+describe('NGSI-v2 - Secured access to the Context Broker with OAuth2 provider (FIWARE Keyrock IDM)' +
     'configured through group provisioning. Permanent token', function() {
     var groupCreation = {
         url: 'http://localhost:4041/iot/services',
diff --git a/test/unit/ngsiv2/general/deviceService-test.js b/test/unit/ngsiv2/general/deviceService-test.js
index 280e5e2a3..82d4bbcce 100644
--- a/test/unit/ngsiv2/general/deviceService-test.js
+++ b/test/unit/ngsiv2/general/deviceService-test.js
@@ -170,7 +170,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
 
 
 /* jshint camelcase: false */
-describe('Device Service: utils', function() {
+describe('NGSI-v2 - Device Service: utils', function() {
     beforeEach(function(done) {
         nock.cleanAll();
         logger.setLevel('FATAL');
diff --git a/test/unit/ngsiv2/general/https-support-test.js b/test/unit/ngsiv2/general/https-support-test.js
index bee7b8bbe..c619665f5 100644
--- a/test/unit/ngsiv2/general/https-support-test.js
+++ b/test/unit/ngsiv2/general/https-support-test.js
@@ -122,7 +122,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
     iotamMock;
 
 
-describe('HTTPS support tests IOTAM', function() {
+describe('NGSI-v2 - HTTPS support tests IOTAM', function() {
 
     describe('When the IoT Agents is started with https "iotManager" config', function() {
         beforeEach(function(done) {
@@ -154,7 +154,7 @@ describe('HTTPS support tests IOTAM', function() {
     });
 });
 
-describe('HTTPS support tests', function() {
+describe('NGSI-v2 - HTTPS support tests', function() {
 
     describe('When subscription is sent to HTTPS context broker', function() {
         beforeEach(function(done) {
diff --git a/test/unit/ngsiv2/general/iotam-autoregistration-test.js b/test/unit/ngsiv2/general/iotam-autoregistration-test.js
index d5b23782e..2218a113f 100644
--- a/test/unit/ngsiv2/general/iotam-autoregistration-test.js
+++ b/test/unit/ngsiv2/general/iotam-autoregistration-test.js
@@ -186,7 +186,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
     },
     iotamMock;
 
-describe('IoT Manager autoregistration', function() {
+describe('NGSI-v2 - IoT Manager autoregistration', function() {
     describe('When the IoT Agent is started without a "iotManager" config parameter and empty services', function() {
         beforeEach(function() {
             nock.cleanAll();
diff --git a/test/unit/ngsiv2/general/startup-test.js b/test/unit/ngsiv2/general/startup-test.js
index 4f25eca1b..27f7d2293 100644
--- a/test/unit/ngsiv2/general/startup-test.js
+++ b/test/unit/ngsiv2/general/startup-test.js
@@ -59,7 +59,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
     },
     iotamMock;
 
-describe('Startup tests', function() {
+describe('NGSI-v2 - Startup tests', function() {
 
     describe('When the IoT Agent is started with environment variables', function() {
         beforeEach(function() {
diff --git a/test/unit/ngsiv2/lazyAndCommands/active-devices-attribute-update-test.js b/test/unit/ngsiv2/lazyAndCommands/active-devices-attribute-update-test.js
index be1f50e0e..9ba5253ad 100644
--- a/test/unit/ngsiv2/lazyAndCommands/active-devices-attribute-update-test.js
+++ b/test/unit/ngsiv2/lazyAndCommands/active-devices-attribute-update-test.js
@@ -63,7 +63,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
         subservice: 'gardens'
     };
 
-describe('Update attribute functionalities', function() {
+describe('NGSI-v2 - Update attribute functionalities', function() {
 
     beforeEach(function(done) {
         logger.setLevel('FATAL');
diff --git a/test/unit/ngsiv2/lazyAndCommands/command-test.js b/test/unit/ngsiv2/lazyAndCommands/command-test.js
index ddafff6c1..aa409d1de 100644
--- a/test/unit/ngsiv2/lazyAndCommands/command-test.js
+++ b/test/unit/ngsiv2/lazyAndCommands/command-test.js
@@ -110,7 +110,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
         subservice: 'gardens'
     };
 
-describe('Command functionalities', function() {
+describe('NGSI-v2 - Command functionalities', function() {
     beforeEach(function(done) {
         logger.setLevel('FATAL');
         var time = new Date(1438760101468); // 2015-08-05T07:35:01.468+00:00
diff --git a/test/unit/ngsiv2/lazyAndCommands/lazy-devices-test.js b/test/unit/ngsiv2/lazyAndCommands/lazy-devices-test.js
index 850545a57..6de60746e 100644
--- a/test/unit/ngsiv2/lazyAndCommands/lazy-devices-test.js
+++ b/test/unit/ngsiv2/lazyAndCommands/lazy-devices-test.js
@@ -141,7 +141,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
         }
     };
 
-describe('IoT Agent Lazy Devices', function() {
+describe('NGSI-v2 - IoT Agent Lazy Devices', function() {
     beforeEach(function(done) {
         logger.setLevel('FATAL');
 
diff --git a/test/unit/ngsiv2/lazyAndCommands/polling-commands-test.js b/test/unit/ngsiv2/lazyAndCommands/polling-commands-test.js
index ac473628e..d2bcf2ef9 100644
--- a/test/unit/ngsiv2/lazyAndCommands/polling-commands-test.js
+++ b/test/unit/ngsiv2/lazyAndCommands/polling-commands-test.js
@@ -121,7 +121,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
         polling: true
     };
 
-describe('Polling commands', function() {
+describe('NGSI-v2 - Polling commands', function() {
     beforeEach(function(done) {
         logger.setLevel('FATAL');
 
diff --git a/test/unit/ngsiv2/ngsiService/active-devices-test.js b/test/unit/ngsiv2/ngsiService/active-devices-test.js
index 3bdc0a4d9..51a53e9a0 100644
--- a/test/unit/ngsiv2/ngsiService/active-devices-test.js
+++ b/test/unit/ngsiv2/ngsiService/active-devices-test.js
@@ -144,7 +144,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
         providerUrl: 'http://smartGondor.com'
     };
 
-describe('Active attributes test', function() {
+describe('NGSI-v2 - Active attributes test', function() {
     var values = [
         {
             name: 'state',
diff --git a/test/unit/ngsiv2/ngsiService/autocast-test.js b/test/unit/ngsiv2/ngsiService/autocast-test.js
index 660a66da7..da5517e26 100644
--- a/test/unit/ngsiv2/ngsiService/autocast-test.js
+++ b/test/unit/ngsiv2/ngsiService/autocast-test.js
@@ -81,7 +81,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
         providerUrl: 'http://smartGondor.com'
     };
 
-describe('JSON native types autocast test', function() {
+describe('NGSI-v2 - JSON native types autocast test', function() {
     beforeEach(function() {
         logger.setLevel('FATAL');
     });
diff --git a/test/unit/ngsiv2/ngsiService/staticAttributes-test.js b/test/unit/ngsiv2/ngsiService/staticAttributes-test.js
index 463308f05..0181dbf15 100644
--- a/test/unit/ngsiv2/ngsiService/staticAttributes-test.js
+++ b/test/unit/ngsiv2/ngsiService/staticAttributes-test.js
@@ -82,7 +82,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
     };
 
 
-describe('Static attributes test', function() {
+describe('NGSI-v2 - Static attributes test', function() {
     var values = [
         {
             name: 'state',
diff --git a/test/unit/ngsiv2/ngsiService/subscriptions-test.js b/test/unit/ngsiv2/ngsiService/subscriptions-test.js
index 240506a7a..320318f37 100644
--- a/test/unit/ngsiv2/ngsiService/subscriptions-test.js
+++ b/test/unit/ngsiv2/ngsiService/subscriptions-test.js
@@ -46,7 +46,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
         providerUrl: 'http://smartGondor.com'
     };
 
-describe('Subscription tests', function() {
+describe('NGSI-v2 - Subscription tests', function() {
     beforeEach(function(done) {
         var optionsProvision = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
diff --git a/test/unit/ngsiv2/plugins/alias-plugin_test.js b/test/unit/ngsiv2/plugins/alias-plugin_test.js
index d63d63b77..95c0292e2 100644
--- a/test/unit/ngsiv2/plugins/alias-plugin_test.js
+++ b/test/unit/ngsiv2/plugins/alias-plugin_test.js
@@ -107,7 +107,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
         providerUrl: 'http://smartGondor.com'
     };
 
-describe('Attribute alias plugin', function() {
+describe('NGSI-v2 - Attribute alias plugin', function() {
     beforeEach(function(done) {
         logger.setLevel('FATAL');
 
diff --git a/test/unit/ngsiv2/plugins/bidirectional-plugin_test.js b/test/unit/ngsiv2/plugins/bidirectional-plugin_test.js
index e6c368ee6..fa5f985b0 100644
--- a/test/unit/ngsiv2/plugins/bidirectional-plugin_test.js
+++ b/test/unit/ngsiv2/plugins/bidirectional-plugin_test.js
@@ -48,7 +48,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
         providerUrl: 'http://smartGondor.com'
     };
 
-describe('Bidirectional data plugin', function() {
+describe('NGSI-v2 - Bidirectional data plugin', function() {
     var options = {
         url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
         method: 'POST',
@@ -388,7 +388,7 @@ describe('Bidirectional data plugin', function() {
     });
 });
 
-describe('Bidirectional data plugin and CB is defined using environment variables', function() {
+describe('NGSI-v2 - Bidirectional data plugin and CB is defined using environment variables', function() {
     var options = {
         url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
         method: 'POST',
diff --git a/test/unit/ngsiv2/plugins/compress-timestamp-plugin_test.js b/test/unit/ngsiv2/plugins/compress-timestamp-plugin_test.js
index fe0bfbe33..9a3ff883e 100644
--- a/test/unit/ngsiv2/plugins/compress-timestamp-plugin_test.js
+++ b/test/unit/ngsiv2/plugins/compress-timestamp-plugin_test.js
@@ -120,7 +120,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
         providerUrl: 'http://smartGondor.com'
     };
 
-describe('Timestamp compression plugin', function() {
+describe('NGSI-v2 - Timestamp compression plugin', function() {
     beforeEach(function(done) {
         logger.setLevel('FATAL');
         iotAgentLib.activate(iotAgentConfig, function() {
diff --git a/test/unit/ngsiv2/plugins/event-plugin_test.js b/test/unit/ngsiv2/plugins/event-plugin_test.js
index 6a64963e4..0fe9a242d 100644
--- a/test/unit/ngsiv2/plugins/event-plugin_test.js
+++ b/test/unit/ngsiv2/plugins/event-plugin_test.js
@@ -62,7 +62,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
         providerUrl: 'http://smartGondor.com'
     };
 
-describe('Event plugin', function() {
+describe('NGSI-v2 - Event plugin', function() {
     beforeEach(function(done) {
         logger.setLevel('FATAL');
 
diff --git a/test/unit/ngsiv2/plugins/multientity-plugin_test.js b/test/unit/ngsiv2/plugins/multientity-plugin_test.js
index ba63a7df3..05e08ad36 100644
--- a/test/unit/ngsiv2/plugins/multientity-plugin_test.js
+++ b/test/unit/ngsiv2/plugins/multientity-plugin_test.js
@@ -223,7 +223,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
         providerUrl: 'http://smartGondor.com'
     };
 
-describe('Multi-entity plugin', function() {
+describe('NGSI-v2 - Multi-entity plugin', function() {
     beforeEach(function(done) {
         logger.setLevel('FATAL');
 
@@ -526,7 +526,7 @@ describe('Multi-entity plugin', function() {
     
 });
 
-describe('Multi-entity plugin is executed before timestamp process plugin', function() {
+describe('NGSI-v2 - Multi-entity plugin is executed before timestamp process plugin', function() {
     beforeEach(function(done) {
         logger.setLevel('FATAL');
 
@@ -692,7 +692,7 @@ describe('Multi-entity plugin is executed before timestamp process plugin', func
     });
 });
 
-describe('Multi-entity plugin is executed for a command update for a regular entity ', function () {
+describe('NGSI-v2 - Multi-entity plugin is executed for a command update for a regular entity ', function () {
     beforeEach(function(done) {
         logger.setLevel('FATAL');
 
diff --git a/test/unit/ngsiv2/plugins/timestamp-processing-plugin_test.js b/test/unit/ngsiv2/plugins/timestamp-processing-plugin_test.js
index 5727a6e1f..ff5b9ed1d 100644
--- a/test/unit/ngsiv2/plugins/timestamp-processing-plugin_test.js
+++ b/test/unit/ngsiv2/plugins/timestamp-processing-plugin_test.js
@@ -63,7 +63,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
         providerUrl: 'http://smartGondor.com'
     };
 
-describe('Timestamp processing plugin', function() {
+describe('NGSI-v2 - Timestamp processing plugin', function() {
     beforeEach(function(done) {
         logger.setLevel('FATAL');
 
diff --git a/test/unit/ngsiv2/provisioning/device-provisioning-api_test.js b/test/unit/ngsiv2/provisioning/device-provisioning-api_test.js
index 905e81645..b53afe606 100644
--- a/test/unit/ngsiv2/provisioning/device-provisioning-api_test.js
+++ b/test/unit/ngsiv2/provisioning/device-provisioning-api_test.js
@@ -48,7 +48,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
         providerUrl: 'http://smartGondor.com'
     };
 
-describe('Device provisioning API: Provision devices', function() {
+describe('NGSI-v2 - Device provisioning API: Provision devices', function() {
     beforeEach(function(done) {
         nock.cleanAll();
 
diff --git a/test/unit/ngsiv2/provisioning/device-registration_test.js b/test/unit/ngsiv2/provisioning/device-registration_test.js
index 60ca9e684..d1f8c9bec 100644
--- a/test/unit/ngsiv2/provisioning/device-registration_test.js
+++ b/test/unit/ngsiv2/provisioning/device-registration_test.js
@@ -89,7 +89,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
         subservice: 'gardens'
     };
 
-describe('IoT Agent Device Registration', function() {
+describe('NGSI-v2 - IoT Agent Device Registration', function() {
     beforeEach(function() {
         logger.setLevel('FATAL');
     });
diff --git a/test/unit/ngsiv2/provisioning/device-update-registration_test.js b/test/unit/ngsiv2/provisioning/device-update-registration_test.js
index 534bd6ab9..0d7b96240 100644
--- a/test/unit/ngsiv2/provisioning/device-update-registration_test.js
+++ b/test/unit/ngsiv2/provisioning/device-update-registration_test.js
@@ -133,7 +133,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
         active: []
     };
 
-describe('IoT Agent Device Update Registration', function() {
+describe('NGSI-v2 - IoT Agent Device Update Registration', function() {
     beforeEach(function(done) {
         delete device1.registrationId;
         logger.setLevel('FATAL');
diff --git a/test/unit/ngsiv2/provisioning/listProvisionedDevices-test.js b/test/unit/ngsiv2/provisioning/listProvisionedDevices-test.js
index 21ebe07d6..f8b89a70c 100644
--- a/test/unit/ngsiv2/provisioning/listProvisionedDevices-test.js
+++ b/test/unit/ngsiv2/provisioning/listProvisionedDevices-test.js
@@ -51,7 +51,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
         providerUrl: 'http://smartGondor.com'
     };
 
-describe('Device provisioning API: List provisioned devices', function() {
+describe('NGSI-v2 - Device provisioning API: List provisioned devices', function() {
     var provisioning1Options,
         provisioning2Options,
         provisioning3Options,
diff --git a/test/unit/ngsiv2/provisioning/provisionDeviceMultientity-test.js b/test/unit/ngsiv2/provisioning/provisionDeviceMultientity-test.js
index 37d916377..2c2750cd7 100644
--- a/test/unit/ngsiv2/provisioning/provisionDeviceMultientity-test.js
+++ b/test/unit/ngsiv2/provisioning/provisionDeviceMultientity-test.js
@@ -48,7 +48,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
         providerUrl: 'http://smartGondor.com'
     };
 
-describe('Device provisioning API: Provision devices', function() {
+describe('NGSI-v2 - Device provisioning API: Provision devices', function() {
     beforeEach(function(done) {
         nock.cleanAll();
 
diff --git a/test/unit/ngsiv2/provisioning/removeProvisionedDevice-test.js b/test/unit/ngsiv2/provisioning/removeProvisionedDevice-test.js
index ef6048a1d..b6104b4e0 100644
--- a/test/unit/ngsiv2/provisioning/removeProvisionedDevice-test.js
+++ b/test/unit/ngsiv2/provisioning/removeProvisionedDevice-test.js
@@ -48,7 +48,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
         providerUrl: 'http://smartGondor.com'
     };
 
-describe('Device provisioning API: Remove provisioned devices', function() {
+describe('NGSI-v2 - Device provisioning API: Remove provisioned devices', function() {
     var provisioning1Options = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
             method: 'POST',
diff --git a/test/unit/ngsiv2/provisioning/singleConfigurationMode-test.js b/test/unit/ngsiv2/provisioning/singleConfigurationMode-test.js
index c77cb2f0d..3b0bad02a 100644
--- a/test/unit/ngsiv2/provisioning/singleConfigurationMode-test.js
+++ b/test/unit/ngsiv2/provisioning/singleConfigurationMode-test.js
@@ -69,7 +69,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
         }
     };
 
-describe('Provisioning API: Single service mode', function() {
+describe('NGSI-v2 - Provisioning API: Single service mode', function() {
     beforeEach(function(done) {
         nock.cleanAll();
 
diff --git a/test/unit/ngsiv2/provisioning/updateProvisionedDevices-test.js b/test/unit/ngsiv2/provisioning/updateProvisionedDevices-test.js
index 131d550e5..a17ba8f07 100644
--- a/test/unit/ngsiv2/provisioning/updateProvisionedDevices-test.js
+++ b/test/unit/ngsiv2/provisioning/updateProvisionedDevices-test.js
@@ -48,7 +48,7 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
         providerUrl: 'http://smartGondor.com'
     };
 
-describe('Device provisioning API: Update provisioned devices', function() {
+describe('NGSI-v2 - Device provisioning API: Update provisioned devices', function() {
     var provisioning1Options = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
             method: 'POST',
diff --git a/test/unit/plugins/bidirectional-plugin_test.js b/test/unit/plugins/bidirectional-plugin_test.js
index 1b6234cdd..471df057f 100644
--- a/test/unit/plugins/bidirectional-plugin_test.js
+++ b/test/unit/plugins/bidirectional-plugin_test.js
@@ -62,7 +62,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
         deviceRegistrationDuration: 'P1M'
     };
 
-describe('Bidirectional data plugin', function() {
+describe('NGSI-v1 - Bidirectional data plugin', function() {
     var options = {
         url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
         method: 'POST',
diff --git a/test/unit/plugins/compress-timestamp-plugin_test.js b/test/unit/plugins/compress-timestamp-plugin_test.js
index 0a43ca5bf..699ed40d1 100644
--- a/test/unit/plugins/compress-timestamp-plugin_test.js
+++ b/test/unit/plugins/compress-timestamp-plugin_test.js
@@ -118,7 +118,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
         deviceRegistrationDuration: 'P1M'
     };
 
-describe('Timestamp compression plugin', function() {
+describe('NGSI-v1 - Timestamp compression plugin', function() {
     beforeEach(function(done) {
         logger.setLevel('FATAL');
 
diff --git a/test/unit/plugins/event-plugin_test.js b/test/unit/plugins/event-plugin_test.js
index ed26855ff..69222e3bd 100644
--- a/test/unit/plugins/event-plugin_test.js
+++ b/test/unit/plugins/event-plugin_test.js
@@ -61,7 +61,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
         deviceRegistrationDuration: 'P1M'
     };
 
-describe('Event plugin', function() {
+describe('NGSI-v1 - Event plugin', function() {
     beforeEach(function(done) {
         logger.setLevel('FATAL');
 
diff --git a/test/unit/plugins/multientity-plugin_test.js b/test/unit/plugins/multientity-plugin_test.js
index 37baf52ee..06ea97751 100644
--- a/test/unit/plugins/multientity-plugin_test.js
+++ b/test/unit/plugins/multientity-plugin_test.js
@@ -101,7 +101,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
         deviceRegistrationDuration: 'P1M'
     };
 
-describe('Multi-entity plugin', function() {
+describe('NGSI-v1 - Multi-entity plugin', function() {
     beforeEach(function(done) {
         logger.setLevel('FATAL');
 
diff --git a/test/unit/plugins/timestamp-processing-plugin_test.js b/test/unit/plugins/timestamp-processing-plugin_test.js
index fac323eec..2ad00aee3 100644
--- a/test/unit/plugins/timestamp-processing-plugin_test.js
+++ b/test/unit/plugins/timestamp-processing-plugin_test.js
@@ -61,7 +61,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
         deviceRegistrationDuration: 'P1M'
     };
 
-describe('Timestamp processing plugin', function() {
+describe('NGSI-v1 - Timestamp processing plugin', function() {
     beforeEach(function(done) {
         logger.setLevel('FATAL');
 
diff --git a/test/unit/provisioning/device-provisioning-api_test.js b/test/unit/provisioning/device-provisioning-api_test.js
index 2731a2662..964ff03ee 100644
--- a/test/unit/provisioning/device-provisioning-api_test.js
+++ b/test/unit/provisioning/device-provisioning-api_test.js
@@ -46,7 +46,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
         deviceRegistrationDuration: 'P1M'
     };
 
-describe('Device provisioning API: Provision devices', function() {
+describe('NGSI-v1 - Device provisioning API: Provision devices', function() {
     beforeEach(function(done) {
         nock.cleanAll();
 
diff --git a/test/unit/provisioning/device-registration_test.js b/test/unit/provisioning/device-registration_test.js
index 837aa4869..f4afdfd16 100644
--- a/test/unit/provisioning/device-registration_test.js
+++ b/test/unit/provisioning/device-registration_test.js
@@ -87,7 +87,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
         subservice: 'gardens'
     };
 
-describe('IoT Agent Device Registration', function() {
+describe('NGSI-v1 - IoT Agent Device Registration', function() {
     beforeEach(function() {
         logger.setLevel('FATAL');
     });
diff --git a/test/unit/provisioning/device-update-registration_test.js b/test/unit/provisioning/device-update-registration_test.js
index cf552b243..fac26d653 100644
--- a/test/unit/provisioning/device-update-registration_test.js
+++ b/test/unit/provisioning/device-update-registration_test.js
@@ -131,7 +131,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
         active: []
     };
 
-describe('IoT Agent Device Update Registration', function() {
+describe('NGSI-v1 - IoT Agent Device Update Registration', function() {
     beforeEach(function(done) {
         logger.setLevel('FATAL');
 
diff --git a/test/unit/provisioning/listProvisionedDevices-test.js b/test/unit/provisioning/listProvisionedDevices-test.js
index 373dc2af4..d8ce019d0 100644
--- a/test/unit/provisioning/listProvisionedDevices-test.js
+++ b/test/unit/provisioning/listProvisionedDevices-test.js
@@ -48,7 +48,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
         deviceRegistrationDuration: 'P1M'
     };
 
-describe('Device provisioning API: List provisioned devices', function() {
+describe('NGSI-v1 - Device provisioning API: List provisioned devices', function() {
     var provisioning1Options,
         provisioning2Options,
         provisioning3Options,
diff --git a/test/unit/provisioning/provisionDeviceMultientity-test.js b/test/unit/provisioning/provisionDeviceMultientity-test.js
index e2f723bfa..0bf4992eb 100644
--- a/test/unit/provisioning/provisionDeviceMultientity-test.js
+++ b/test/unit/provisioning/provisionDeviceMultientity-test.js
@@ -46,7 +46,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
         deviceRegistrationDuration: 'P1M'
     };
 
-describe('Device provisioning API: Provision devices', function() {
+describe('NGSI-v1 - Device provisioning API: Provision devices', function() {
     beforeEach(function(done) {
         nock.cleanAll();
 
diff --git a/test/unit/provisioning/removeProvisionedDevice-test.js b/test/unit/provisioning/removeProvisionedDevice-test.js
index f5d294832..8b0cb32a7 100644
--- a/test/unit/provisioning/removeProvisionedDevice-test.js
+++ b/test/unit/provisioning/removeProvisionedDevice-test.js
@@ -46,7 +46,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
         deviceRegistrationDuration: 'P1M'
     };
 
-describe('Device provisioning API: Remove provisioned devices', function() {
+describe('NGSI-v1 - Device provisioning API: Remove provisioned devices', function() {
     var provisioning1Options = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
             method: 'POST',
diff --git a/test/unit/provisioning/singleConfigurationMode-test.js b/test/unit/provisioning/singleConfigurationMode-test.js
index 32871edb2..11d44df2f 100644
--- a/test/unit/provisioning/singleConfigurationMode-test.js
+++ b/test/unit/provisioning/singleConfigurationMode-test.js
@@ -67,7 +67,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
         }
     };
 
-describe('Provisioning API: Single service mode', function() {
+describe('NGSI-v1 - Provisioning API: Single service mode', function() {
     beforeEach(function(done) {
         nock.cleanAll();
 
diff --git a/test/unit/provisioning/updateProvisionedDevices-test.js b/test/unit/provisioning/updateProvisionedDevices-test.js
index 4615e678d..3f19e44ef 100644
--- a/test/unit/provisioning/updateProvisionedDevices-test.js
+++ b/test/unit/provisioning/updateProvisionedDevices-test.js
@@ -46,7 +46,7 @@ var iotAgentLib = require('../../../lib/fiware-iotagent-lib'),
         deviceRegistrationDuration: 'P1M'
     };
 
-describe('Device provisioning API: Update provisioned devices', function() {
+describe('NGSI-v1 - Device provisioning API: Update provisioned devices', function() {
     var provisioning1Options = {
             url: 'http://localhost:' + iotAgentConfig.server.port + '/iot/devices',
             method: 'POST',