diff --git a/rm-community/rm-community-repo/src/test/properties/local/alfresco-global.properties b/rm-community/rm-community-repo/src/test/properties/local/alfresco-global.properties
index 7033784fec..b3009c4bb8 100644
--- a/rm-community/rm-community-repo/src/test/properties/local/alfresco-global.properties
+++ b/rm-community/rm-community-repo/src/test/properties/local/alfresco-global.properties
@@ -39,6 +39,10 @@ share.protocol=http
 
 # Validates and auto-recover if validation fails
 index.recovery.mode=AUTO
+# As we run embedded, we set Lucene
+# TODO: Find a better solution for indexing, as buildonly (embedded Lucene) is deprecated and going to be removed soon
+index.subsystem.name=buildonly
+
 
 # These jobs seem to require Lucene (Unsupported Operation with Solr) so we disable them / set to future date
 # See https://forums.alfresco.com/en/viewtopic.php?f=52&t=41597
@@ -65,6 +69,5 @@ cifs.enabled=false
 ftp.enabled=false
 
 # Solr config
-index.subsystem.name=solr6
+index.subsystem.name=solr4
 solr.secureComms=none
-solr.port=8983
\ No newline at end of file