diff --git a/.gitignore b/.gitignore
index 38f4c43e310..8648ec99ad4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ confluence/target
 out
 dist
 ideaSDK
+PluginVerifier
 .idea/dictionaries/yozh.xml
 .idea/codeStyleSettings.xml
 .idea/workspace.xml
diff --git a/TeamCityBuild.xml b/TeamCityBuild.xml
index 8cdc6ea5f09..8b0f795a793 100644
--- a/TeamCityBuild.xml
+++ b/TeamCityBuild.xml
@@ -2,10 +2,15 @@
     <import file="build.xml" optional="false"/>
 
     <property name="build.number" value="snapshot"/>
+    <property name="jdk16.home" value="${java.home}"/>
+
     <property name="artifact.output.path" value="${basedir}/out/artifacts"/>
     <property name="plugin.xml" value="idea/src/META-INF/plugin.xml"/>
     <property name="plugin.xml.bk" value="${plugin.xml}.bk"/>
 
+    <property name="plugin.verifier" value="${basedir}/PluginVerifier/plugin-verifier-1.0-SNAPSHOT.jar"/>
+    <property name="plugin.zip" value="${artifact.output.path}/kotlin-plugin-${build.number}.zip" />
+
     <macrodef name="echoprop">
         <attribute name="prop"/>
         <sequential>
@@ -55,13 +60,22 @@
     </target>
 
     <target name="zipArtifact">
-        <zip destfile="${artifact.output.path}/kotlin-plugin-${build.number}.zip">
+        <zip destfile="${plugin.zip}">
             <zipfileset prefix="Kotlin" dir="${artifact.output.path}/Kotlin"/>
         </zip>
         <delete dir="${artifact.output.path}/Kotlin" quiet="true"/>
     </target>
 
-    <target name="post_build" depends="cleanupPluginXml, zipArtifact"/>
+    <target name="verifyPlugin">
+        <java fork="true" failonerror="true" 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"/>
 
     <target name="none">
         <fail message="Either specify pre_build or post_build"/>
diff --git a/update_dependencies.xml b/update_dependencies.xml
index febea7ad77f..8132cbe6065 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -13,8 +13,12 @@
         <attribute name="teamcity" default="http://teamcity.jetbrains.com"/>
         <attribute name="teamcity.build" default="bt343"/>
         <sequential>
+            <delete dir="PluginVerifier" failonerror="false" />
+            <get src="http://teamcity.jetbrains.com/guestAuth/repository/download/bt351/.lastSuccessful/plugin-verifier-1.0-SNAPSHOT.jar" dest="PluginVerifier" />
+
             <property name="core" value="ideaSDK/core"/>
             <property name="tc" value="@{teamcity}/guestAuth/repository/download/@{teamcity.build}/.lastSuccessful"/>
+
             <delete dir="ideaSDK" failonerror="false">
                 <exclude name="config/**"/>
                 <exclude name="system/**"/>