diff --git a/update_dependencies.xml b/update_dependencies.xml
index ce4fc032068..2c8e9fe8a42 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -787,11 +787,14 @@
     <target name="override-version">
         <condition property="need.version.override">
             <and>
-                <equals arg1="${kotlin.bootstrap.branch}" arg2="${teamcity.build.branch}"/>
                 <isset property="override.version.url"/>
+                <equals arg1="${kotlin.bootstrap.branch}" arg2="${teamcity.build.branch}"/>
                 <not>
                     <isset property="override.version.disabled"/>
                 </not>
+                <not>
+                    <istrue value="${bootstrap.build.no.tests}"/>
+                </not>
             </and>
         </condition>