diff --git a/TeamCityBuild.xml b/TeamCityBuild.xml
index 2c1d54e7435..d94508b957f 100644
--- a/TeamCityBuild.xml
+++ b/TeamCityBuild.xml
@@ -3,13 +3,7 @@
 
     <property name="build.number" value="snapshot"/>
     <property name="jdk16.home" value="${java.home}"/>
-    <!--
-        TODO: enable verifier. Disabled because of guice that references non-existent
-        but unused classes like com.google.inject.internal.asm.util.$TraceClassVisitor
-        see
-        http://buildserver.labs.intellij.net/viewLog.html?buildId=1314890&buildTypeId=bt1416&tab=buildLog
-    -->
-    <property name="fail.on.plugin.verifier.error" value="false"/>
+    <property name="fail.on.plugin.verifier.error" value="true"/>
 
     <property name="artifact.output.path" value="${basedir}/out/artifacts"/>
     <property name="plugin.xml" value="idea/src/META-INF/plugin.xml"/>
@@ -74,12 +68,20 @@
     </target>
 
     <target name="verifyPlugin">
+        <!--
+            TODO: enable verifier. Disabled because of guice that references non-existent
+            but unused classes like com.google.inject.internal.asm.util.$TraceClassVisitor
+            see
+            http://buildserver.labs.intellij.net/viewLog.html?buildId=1314890&buildTypeId=bt1416&tab=buildLog
+        -->
+        <!--
         <java fork="true" failonerror="${fail.on.plugin.verifier.error}" jar="${plugin.verifier}">
             <arg value="-r" />
             <arg value="${jdk16.home}" />
             <arg value="${plugin.zip}" />
             <arg value="${basedir}/ideaSDK" />
         </java>
+        -->
     </target>
 
     <target name="post_build" depends="cleanupPluginXml, zipArtifact, verifyPlugin"/>