diff --git a/settings.gradle b/settings.gradle
index 9296b126c7c..c121176de73 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -146,8 +146,6 @@ include ":kotlin-build-common",
         ":kotlin-annotation-processing-embeddable",
         ":examples:kotlin-jsr223-local-example",
         ":examples:kotlin-jsr223-daemon-local-eval-example",
-        ":ultimate",
-        ":ultimate:ultimate-runner",
         ":kotlin-annotations-jvm",
         ":kotlin-annotations-android",
         ":pill:generate-all-tests",
@@ -159,6 +157,14 @@ include ":kotlin-build-common",
         ':kotlin-noarg:plugin-marker',
         ":test-instrumenter"
 
+def isTeamcityBuild = hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
+def includeUltimate = hasProperty("intellijUltimateEnabled") && intellijUltimateEnabled != 'false'
+if (isTeamcityBuild || includeUltimate) {
+    include(
+            ":ultimate",
+            ":ultimate:ultimate-runner"
+    )
+}
 
 rootProject.name = "kotlin"