diff --git a/ci.properties b/ci.properties
index 15a2ccfcf94f86..6e1715b47f887b 100644
--- a/ci.properties
+++ b/ci.properties
@@ -68,6 +68,7 @@ ci.test.available.suites=\
     content-page-review,\
     continuous-integration,\
     cookies,\
+    core-functional,\
     data-engine,\
     data-engine-db-partition,\
     data-integration,\
@@ -305,6 +306,7 @@ ci.test.suite.description[content-management-lxc]=Content Management functional
 ci.test.suite.description[content-management-upgrade]=Test Content Management upgrade tests.
 ci.test.suite.description[content-page-review]=Test Content Page Review (comments) tests.
 ci.test.suite.description[continuous-integration]=Test Continuous Integration tests.
+ci.test.suite.description[core-functional]=Test Core Infra Functional tests
 ci.test.suite.description[cookies]=Test Cookie Preferences tests.
 ci.test.suite.description[depot]=Test Depot tests.
 ci.test.suite.description[dl-store]=Test Document Library Store tests.
diff --git a/test.properties b/test.properties
index dc638229939add..1b8c1114c5a340 100644
--- a/test.properties
+++ b/test.properties
@@ -4575,6 +4575,57 @@ test.batch.run.property.query[functional-orcllinux9-tomcat90-mysql57-jdk8]=\
         (portal.upstream == "true") AND \
         (testray.main.component.name ~ "Cookies")
 
+    #
+    # Core Infrastructure
+    #
+
+    test.batch.dist.app.servers[core-functional]=tomcat
+
+    test.batch.names[core-functional]=\
+        functional-tomcat90-mysql57-jdk8
+
+    test.batch.run.property.query[functional-tomcat90-mysql57-jdk8][core-functional]=\
+        (\
+            (app.server.types == null) OR \
+            (app.server.types ~ tomcat)\
+        ) AND \
+        (\
+            (database.types == null) OR \
+            (database.types ~ mysql)\
+        ) AND \
+        (\
+            (testray.main.component.name == "Bean Portlet") OR \
+            (testray.main.component.name == "Bundle Blacklist") OR \
+            (testray.main.component.name == "Clustering") OR \
+            (testray.main.component.name == "Custom Fields") OR \
+            (testray.main.component.name == "Deployment") OR \
+            (testray.main.component.name == "Document Library Stores") OR \
+            (testray.main.component.name == "Ext") OR \
+            (testray.main.component.name == "File Install") OR \
+            (testray.main.component.name == "Gogo Shell") OR \
+            (testray.main.component.name == "IP Address") OR \
+            (testray.main.component.name == "JSP Compiler") OR \
+            (testray.main.component.name == "License") OR \
+            (testray.main.component.name == "Liferay Faces") OR \
+            (testray.main.component.name == "Locale") OR \
+            (testray.main.component.name == "Logging") OR \
+            (testray.main.component.name == "Mobile Device Rules") OR \
+            (testray.main.component.name == "Module Framework Servlet") OR \
+            (testray.main.component.name == "Portal Configuration") OR \
+            (testray.main.component.name == "Portal Services") OR \
+            (testray.main.component.name == "Rolling Restart") OR \
+            (testray.main.component.name == "Scheduler") OR \
+            (testray.main.component.name == "Server Administration") OR \
+            (testray.main.component.name == "Service Builder") OR \
+            (testray.main.component.name == "Setup Wizard") OR \
+            (testray.main.component.name == "Smoke") OR \
+            (testray.main.component.name == "TCK") OR \
+            (testray.main.component.name == "Templates Engine") OR \
+            (testray.main.component.name == "Test Plugins") OR \
+            (testray.main.component.name == "User Tracker") OR \
+            (testray.main.component.name == "Virtual Instances")\
+        )
+
     #
     # Data Engine
     #