diff --git a/test/functionalTest/cases/0000_content_related_headers/accept_fail.test b/test/functionalTest/cases/0000_content_related_headers/accept_fail.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0000_content_related_headers/accept_fail.test
rename to test/functionalTest/cases/0000_content_related_headers/accept_fail.test.DISABLED
diff --git a/test/functionalTest/cases/0000_deprecated_checkings/disable_ngsi_cli.test b/test/functionalTest/cases/0000_deprecated_checkings/disable_ngsi_cli.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0000_deprecated_checkings/disable_ngsi_cli.test
rename to test/functionalTest/cases/0000_deprecated_checkings/disable_ngsi_cli.test.DISABLED
diff --git a/test/functionalTest/cases/0000_deprecated_checkings/log_deprecate_warning_dynamic.test b/test/functionalTest/cases/0000_deprecated_checkings/log_deprecate_warning_dynamic.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0000_deprecated_checkings/log_deprecate_warning_dynamic.test
rename to test/functionalTest/cases/0000_deprecated_checkings/log_deprecate_warning_dynamic.test.DISABLED
diff --git a/test/functionalTest/cases/0000_deprecated_checkings/metadata_id_duplicate_error.test b/test/functionalTest/cases/0000_deprecated_checkings/metadata_id_duplicate_error.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0000_deprecated_checkings/metadata_id_duplicate_error.test
rename to test/functionalTest/cases/0000_deprecated_checkings/metadata_id_duplicate_error.test.DISABLED
diff --git a/test/functionalTest/cases/0000_large_requests/large_query_context.test b/test/functionalTest/cases/0000_large_requests/large_query_context.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0000_large_requests/large_query_context.test
rename to test/functionalTest/cases/0000_large_requests/large_query_context.test.DISABLED
diff --git a/test/functionalTest/cases/0000_large_requests/large_update_context.test b/test/functionalTest/cases/0000_large_requests/large_update_context.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0000_large_requests/large_update_context.test
rename to test/functionalTest/cases/0000_large_requests/large_update_context.test.DISABLED
diff --git a/test/functionalTest/cases/0000_ngsi10_convenience/individual_context_entity_delete_fails.test b/test/functionalTest/cases/0000_ngsi10_convenience/individual_context_entity_delete_fails.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0000_ngsi10_convenience/individual_context_entity_delete_fails.test
rename to test/functionalTest/cases/0000_ngsi10_convenience/individual_context_entity_delete_fails.test.DISABLED
diff --git a/test/functionalTest/cases/0000_ngsi10_update/update_sequence.test b/test/functionalTest/cases/0000_ngsi10_update/update_sequence.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0000_ngsi10_update/update_sequence.test
rename to test/functionalTest/cases/0000_ngsi10_update/update_sequence.test.DISABLED
diff --git a/test/functionalTest/cases/0392_service_path_update_and_query/service_path_http_header.test b/test/functionalTest/cases/0392_service_path_update_and_query/service_path_http_header.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0392_service_path_update_and_query/service_path_http_header.test
rename to test/functionalTest/cases/0392_service_path_update_and_query/service_path_http_header.test.DISABLED
diff --git a/test/functionalTest/cases/0647_crash_with_compounds/POST_UpdateContextRequest.test b/test/functionalTest/cases/0647_crash_with_compounds/POST_UpdateContextRequest.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0647_crash_with_compounds/POST_UpdateContextRequest.test
rename to test/functionalTest/cases/0647_crash_with_compounds/POST_UpdateContextRequest.test.DISABLED
diff --git a/test/functionalTest/cases/0690_geoquery_crash/invalid_polygon_geoscope.test b/test/functionalTest/cases/0690_geoquery_crash/invalid_polygon_geoscope.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0690_geoquery_crash/invalid_polygon_geoscope.test
rename to test/functionalTest/cases/0690_geoquery_crash/invalid_polygon_geoscope.test.DISABLED
diff --git a/test/functionalTest/cases/0746_valid_service_path_for_updates/invalid_service_paths.test b/test/functionalTest/cases/0746_valid_service_path_for_updates/invalid_service_paths.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0746_valid_service_path_for_updates/invalid_service_paths.test
rename to test/functionalTest/cases/0746_valid_service_path_for_updates/invalid_service_paths.test.DISABLED
diff --git a/test/functionalTest/cases/0787_cprs_full_functional/append_attribute_that_doesnt_exist.test b/test/functionalTest/cases/0787_cprs_full_functional/append_attribute_that_doesnt_exist.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0787_cprs_full_functional/append_attribute_that_doesnt_exist.test
rename to test/functionalTest/cases/0787_cprs_full_functional/append_attribute_that_doesnt_exist.test.DISABLED
diff --git a/test/functionalTest/cases/0787_cprs_full_functional/delete_attribute_that_does_exist.test b/test/functionalTest/cases/0787_cprs_full_functional/delete_attribute_that_does_exist.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0787_cprs_full_functional/delete_attribute_that_does_exist.test
rename to test/functionalTest/cases/0787_cprs_full_functional/delete_attribute_that_does_exist.test.DISABLED
diff --git a/test/functionalTest/cases/0787_cprs_full_functional/delete_attribute_that_doesnt_exist.test b/test/functionalTest/cases/0787_cprs_full_functional/delete_attribute_that_doesnt_exist.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0787_cprs_full_functional/delete_attribute_that_doesnt_exist.test
rename to test/functionalTest/cases/0787_cprs_full_functional/delete_attribute_that_doesnt_exist.test.DISABLED
diff --git a/test/functionalTest/cases/0787_cprs_full_functional/query_local_query_found.test b/test/functionalTest/cases/0787_cprs_full_functional/query_local_query_found.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0787_cprs_full_functional/query_local_query_found.test
rename to test/functionalTest/cases/0787_cprs_full_functional/query_local_query_found.test.DISABLED
diff --git a/test/functionalTest/cases/0787_cprs_full_functional/query_local_query_not_found.test b/test/functionalTest/cases/0787_cprs_full_functional/query_local_query_not_found.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0787_cprs_full_functional/query_local_query_not_found.test
rename to test/functionalTest/cases/0787_cprs_full_functional/query_local_query_not_found.test.DISABLED
diff --git a/test/functionalTest/cases/0787_cprs_full_functional/query_simple.test b/test/functionalTest/cases/0787_cprs_full_functional/query_simple.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0787_cprs_full_functional/query_simple.test
rename to test/functionalTest/cases/0787_cprs_full_functional/query_simple.test.DISABLED
diff --git a/test/functionalTest/cases/0787_cprs_full_functional/update_attribute_that_doesnt_exist.test b/test/functionalTest/cases/0787_cprs_full_functional/update_attribute_that_doesnt_exist.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0787_cprs_full_functional/update_attribute_that_doesnt_exist.test
rename to test/functionalTest/cases/0787_cprs_full_functional/update_attribute_that_doesnt_exist.test.DISABLED
diff --git a/test/functionalTest/cases/0787_cprs_full_functional/update_local_found.test b/test/functionalTest/cases/0787_cprs_full_functional/update_local_found.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0787_cprs_full_functional/update_local_found.test
rename to test/functionalTest/cases/0787_cprs_full_functional/update_local_found.test.DISABLED
diff --git a/test/functionalTest/cases/0787_cprs_full_functional/update_local_not_found.test b/test/functionalTest/cases/0787_cprs_full_functional/update_local_not_found.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0787_cprs_full_functional/update_local_not_found.test
rename to test/functionalTest/cases/0787_cprs_full_functional/update_local_not_found.test.DISABLED
diff --git a/test/functionalTest/cases/0878_attributes_with_dot/basic_dot_attr.test b/test/functionalTest/cases/0878_attributes_with_dot/basic_dot_attr.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0878_attributes_with_dot/basic_dot_attr.test
rename to test/functionalTest/cases/0878_attributes_with_dot/basic_dot_attr.test.DISABLED
diff --git a/test/functionalTest/cases/0885_service_path_and_delete/delete_with_service_path.test b/test/functionalTest/cases/0885_service_path_and_delete/delete_with_service_path.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0885_service_path_and_delete/delete_with_service_path.test
rename to test/functionalTest/cases/0885_service_path_and_delete/delete_with_service_path.test.DISABLED
diff --git a/test/functionalTest/cases/0889_writeConcern_configurable/update_with_writeConcern_acknowledged.test b/test/functionalTest/cases/0889_writeConcern_configurable/update_with_writeConcern_acknowledged.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0889_writeConcern_configurable/update_with_writeConcern_acknowledged.test
rename to test/functionalTest/cases/0889_writeConcern_configurable/update_with_writeConcern_acknowledged.test.DISABLED
diff --git a/test/functionalTest/cases/0889_writeConcern_configurable/update_with_writeConcern_unacknowledged.test b/test/functionalTest/cases/0889_writeConcern_configurable/update_with_writeConcern_unacknowledged.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/0889_writeConcern_configurable/update_with_writeConcern_unacknowledged.test
rename to test/functionalTest/cases/0889_writeConcern_configurable/update_with_writeConcern_unacknowledged.test.DISABLED
diff --git a/test/functionalTest/cases/3055_qc_inappropriate_payload/qc_inappropriate_payload.test b/test/functionalTest/cases/3055_qc_inappropriate_payload/qc_inappropriate_payload.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/3055_qc_inappropriate_payload/qc_inappropriate_payload.test
rename to test/functionalTest/cases/3055_qc_inappropriate_payload/qc_inappropriate_payload.test.DISABLED
diff --git a/test/functionalTest/cases/3119_qc_nullcharacter_payload/3119_qc_nullcharacter_payload.test b/test/functionalTest/cases/3119_qc_nullcharacter_payload/3119_qc_nullcharacter_payload.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/3119_qc_nullcharacter_payload/3119_qc_nullcharacter_payload.test
rename to test/functionalTest/cases/3119_qc_nullcharacter_payload/3119_qc_nullcharacter_payload.test.DISABLED
diff --git a/test/functionalTest/cases/3442_ngsiv1_interop_location_fix/ngsiv1_geobox_create_does_not_break_location.test b/test/functionalTest/cases/3442_ngsiv1_interop_location_fix/ngsiv1_geobox_create_does_not_break_location.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/3442_ngsiv1_interop_location_fix/ngsiv1_geobox_create_does_not_break_location.test
rename to test/functionalTest/cases/3442_ngsiv1_interop_location_fix/ngsiv1_geobox_create_does_not_break_location.test.DISABLED
diff --git a/test/functionalTest/cases/3442_ngsiv1_interop_location_fix/ngsiv1_geojson_create_does_not_break_location.test b/test/functionalTest/cases/3442_ngsiv1_interop_location_fix/ngsiv1_geojson_create_does_not_break_location.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/3442_ngsiv1_interop_location_fix/ngsiv1_geojson_create_does_not_break_location.test
rename to test/functionalTest/cases/3442_ngsiv1_interop_location_fix/ngsiv1_geojson_create_does_not_break_location.test.DISABLED
diff --git a/test/functionalTest/cases/3442_ngsiv1_interop_location_fix/ngsiv1_geoline_create_does_not_break_location.test b/test/functionalTest/cases/3442_ngsiv1_interop_location_fix/ngsiv1_geoline_create_does_not_break_location.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/3442_ngsiv1_interop_location_fix/ngsiv1_geoline_create_does_not_break_location.test
rename to test/functionalTest/cases/3442_ngsiv1_interop_location_fix/ngsiv1_geoline_create_does_not_break_location.test.DISABLED
diff --git a/test/functionalTest/cases/3442_ngsiv1_interop_location_fix/ngsiv1_geopoint_create_does_not_break_location.test b/test/functionalTest/cases/3442_ngsiv1_interop_location_fix/ngsiv1_geopoint_create_does_not_break_location.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/3442_ngsiv1_interop_location_fix/ngsiv1_geopoint_create_does_not_break_location.test
rename to test/functionalTest/cases/3442_ngsiv1_interop_location_fix/ngsiv1_geopoint_create_does_not_break_location.test.DISABLED
diff --git a/test/functionalTest/cases/3442_ngsiv1_interop_location_fix/ngsiv1_geopolygon_create_does_not_break_location.test b/test/functionalTest/cases/3442_ngsiv1_interop_location_fix/ngsiv1_geopolygon_create_does_not_break_location.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/3442_ngsiv1_interop_location_fix/ngsiv1_geopolygon_create_does_not_break_location.test
rename to test/functionalTest/cases/3442_ngsiv1_interop_location_fix/ngsiv1_geopolygon_create_does_not_break_location.test.DISABLED
diff --git a/test/functionalTest/cases/3607_killer_request_apiv1/killer_request_apiv1_parsing_cases.test b/test/functionalTest/cases/3607_killer_request_apiv1/killer_request_apiv1_parsing_cases.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/3607_killer_request_apiv1/killer_request_apiv1_parsing_cases.test
rename to test/functionalTest/cases/3607_killer_request_apiv1/killer_request_apiv1_parsing_cases.test.DISABLED
diff --git a/test/functionalTest/cases/3608_killer_request_apiv1/killer_request_apiv1_deeply_nested_attr.test b/test/functionalTest/cases/3608_killer_request_apiv1/killer_request_apiv1_deeply_nested_attr.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/3608_killer_request_apiv1/killer_request_apiv1_deeply_nested_attr.test
rename to test/functionalTest/cases/3608_killer_request_apiv1/killer_request_apiv1_deeply_nested_attr.test.DISABLED
diff --git a/test/functionalTest/cases/3608_killer_request_apiv1/killer_request_apiv1_parsing_cases_bis.test b/test/functionalTest/cases/3608_killer_request_apiv1/killer_request_apiv1_parsing_cases_bis.test.DISABLED
similarity index 100%
rename from test/functionalTest/cases/3608_killer_request_apiv1/killer_request_apiv1_parsing_cases_bis.test
rename to test/functionalTest/cases/3608_killer_request_apiv1/killer_request_apiv1_parsing_cases_bis.test.DISABLED