diff --git a/ci.properties b/ci.properties
index 0646d9994133c1..45308aaf5c16e5 100644
--- a/ci.properties
+++ b/ci.properties
@@ -59,6 +59,7 @@ ci.test.available.suites=\
     forms,\
     frontend,\
     gauntlet,\
+    gauntlet-bucket,\
     gradle-plugins,\
     headless,\
     headless-acceptance,\
@@ -151,6 +152,7 @@ ci.test.suite.description[export-import]=Test exportimport tests.
 ci.test.suite.description[frontend]=Test frontend tests.
 ci.test.suite.description[forms]=Test forms tests.
 ci.test.suite.description[gauntlet]=Test upstream tests.
+ci.test.suite.description[gauntlet-bucket]=Test a subset of upstream tests.
 ci.test.suite.description[gradle-plugins]=Test Gradle Plugins tests.
 ci.test.suite.description[headless]=Test headless team tests.
 ci.test.suite.description[headless-acceptance]=Test headless team acceptance tests considering Headless and Rest Builder.
diff --git a/test.properties b/test.properties
index 528236bb237620..f7e0a87aaca6ac 100644
--- a/test.properties
+++ b/test.properties
@@ -3327,6 +3327,73 @@
         (liferay.online.properties != true)  AND \
         (portal.release == true)
 
+    #
+    # Gauntlet Bucket
+    #
+
+    test.batch.names[gauntlet-bucket]=\
+        archived-module-smoke-jdk8,\
+        archived-modules-test-jdk8,\
+        blade-samples-jdk8,\
+        bundle-blacklist-restart-jdk8,\
+        central-requirements-jdk8,\
+        compile-jsp-jdk8,\
+        empty-temp-dir-jdk8,\
+        functional-smoke-jboss72-mysql57-jdk8,\
+        functional-smoke-tomcat90-db2111-jdk8,\
+        functional-smoke-tomcat90-mariadb102-jdk8,\
+        functional-smoke-tomcat90-mysql57-jdk8,\
+        functional-smoke-tomcat90-mysql57-jdk11_open,\
+        functional-smoke-tomcat90-mysql80-jdk8,\
+        functional-smoke-tomcat90-oracle193-jdk8,\
+        functional-smoke-tomcat90-postgresql11-jdk8,\
+        functional-smoke-tomcat90-postgresql121-jdk8,\
+        functional-smoke-tomcat90-sqlserver2017-jdk8,\
+        functional-smoke-tomcat90-sqlserver2019-jdk8,\
+        functional-smoke-weblogic122-mysql57-jdk8,\
+        functional-smoke-websphere90-mysql57-jdk8,\
+        functional-smoke-wildfly140-mariadb102-jdk8,\
+        functional-smoke-wildfly170-mariadb104-jdk8,\
+        functional-tomcat90-mysql57-jdk8,\
+        functional-upgrade-tomcat90-mysql57-jdk8,\
+        gogo-shell-client-jdk8,\
+        javadoc-jdk8,\
+        js-unit-jdk8,\
+        jsp-runtime-compile-jdk8,\
+        lpkg-base-jdk8,\
+        lpkg-container-jdk8,\
+        lpkg-controller-jdk8,\
+        lpkg-hot-deployment-jdk8,\
+        lpkg-independence-jdk8,\
+        lpkg-override-jdk8,\
+        lpkg-persistence-jdk8,\
+        lpkg-release-jdk8,\
+        lpkg-startup-jdk8,\
+        modules-compile-jdk8,\
+        modules-functional-jdk8,\
+        modules-functional-tomcat90-mysql57-jdk8,\
+        modules-integration-mysql57-jdk8,\
+        modules-integration-project-templates-jdk8,\
+        modules-semantic-versioning-jdk8,\
+        modules-unit-jdk8,\
+        modules-unit-project-templates-jdk8,\
+        pmd-jdk8,\
+        portal-renamed-tomcat-in-path-jdk8,\
+        portal-second-startup-space-in-path-jdk8,\
+        portal-startup-space-in-path-jdk8,\
+        poshi-validation-jdk8,\
+        release-osgi-state-exploded-test-jdk8,\
+        release-osgi-state-lpkg-change-directory-test-jdk8,\
+        release-osgi-state-lpkg-test-jdk8,\
+        rest-builder-jdk8,\
+        ruby-sass-compiler-jdk8,\
+        semantic-versioning-jdk8,\
+        service-builder-jdk8,\
+        source-format-jdk8,\
+        tck-jdk8,\
+        unit-jdk8,\
+        wsdd-builder-jdk8
+
     #
     # Gradle Plugins
     #