diff --git a/e2e-test/python-generator/generator.py b/e2e-test/python-generator/generator.py
index 0b8765833..fd9f473e1 100644
--- a/e2e-test/python-generator/generator.py
+++ b/e2e-test/python-generator/generator.py
@@ -253,6 +253,7 @@ if __name__ == '__main__':
     parser.add_argument('-sr', '--shardRange', type=int, help='Total number of nodes per shard with DB_ID_RANGE sharding (default 800)')
     parser.add_argument('-ct', '--disableCascadeTracking', action='store_true', help='Cascade Tracking Disabled')
     parser.add_argument('-ef', '--enableFingerprint', action='store_true', help='Enable Fingerprint feature')
+    parser.add_argument('-ecl', '--enableCrossLocale', action='store_true', help='Enable Cross Locale configuration')
     parser.add_argument('-sl', '--searchLogLevel', default='WARN', help='The log level for search (default WARN)',
                         choices=['TRACE', 'DEBUG', 'INFO', 'WARN', 'ERROR'])
     parser.add_argument('-o', '--output', default='.', help='The path of the directory to output to')
@@ -288,6 +289,7 @@ if __name__ == '__main__':
             'POSTGRES_IMAGE': args.postgres,
             'SEARCH_IMAGE': args.search,
             'SEARCH_LOG_LEVEL': args.searchLogLevel,
+            'ENABLE_CROSS_LOCALE': args.enableCrossLocale,
             'SEARCH_ENABLE_SPELLCHECK': str(args.spellcheck).lower(),
             'DISABLE_CASCADE_TRACKING': str(args.disableCascadeTracking).lower()
             }
diff --git a/e2e-test/python-generator/templates/search/Dockerfile.template b/e2e-test/python-generator/templates/search/Dockerfile.template
index cd2db8ae2..2a672ae4f 100644
--- a/e2e-test/python-generator/templates/search/Dockerfile.template
+++ b/e2e-test/python-generator/templates/search/Dockerfile.template
@@ -29,4 +29,11 @@ RUN if [ "${SEARCH_LOG_LEVEL}" != "" ] ; then \
   $${DIST_DIR}/solr/bin/search_config_setup.sh; \
 fi
 
+# Enable cross locale configuration if requested.
+RUN if [ "${ENABLE_CROSS_LOCALE}" != "" ] ; then \
+  sed -i '/^bash.*/i sed -i "'"/alfresco.cross.locale.datatype/s/^#//g"'" $${DIST_DIR}/solrhome/conf/shared.properties\n' \
+  $${DIST_DIR}/solr/bin/search_config_setup.sh; \
+fi
+
+
 VOLUME ["/opt/alfresco-search-services/keystore"]