Index: tools/build/targets/common.xml
===================================================================
--- tools/build/targets/common.xml
+++ tools/build/targets/common.xml
@@ -31,7 +31,7 @@
 
 	<target name="build" description="Builds a project" depends="init,verify,analyze"/>
 
-	<target name="build-parallel" description="Builds a project (long targets executed in parallel)" depends="init,lint,tools-parallel,phpunit"/>
+	<target name="build-parallel" description="Builds a project (long targets executed in parallel)" depends="init,tools-parallel,phpunit"/>
 
 	<target name="tools-parallel" description="Run tools in parallel">
 		<parallel threadCount="2">
@@ -50,8 +50,8 @@
 	<!-- ### Verify code consistency
 
 	Make sure that our code is clean and functional. -->
-	<target name="verify" description="Verify code consistency" depends="init,lint"/>
-	<!--<target name="verify" description="Verify code consistency" depends="init,lint,phpunit"/>-->
+	<target name="verify" description="Verify code consistency" depends="init"/>
+	<!--<target name="verify" description="Verify code consistency" depends="init,phpunit"/>-->
 
 	<!-- ### Analyze code
 
@@ -69,7 +69,7 @@
 	<!-- ### PHP linting
 
 	Check files for syntax errors. -->
-	<target name="lint" description="Perform syntax check of sourcecode files" depends="init">
+	<target name="lint" description="Perform syntax check of sourcecode files" depends="folders-create">
 		<phplint haltonfailure="true" deprecatedAsError="false" cachefile="${build.cache.dir}/phplint.txt">
 			<fileset refid="php.files"/>
 		</phplint>
Index: tools/build/targets/deploy.xml
===================================================================
--- tools/build/targets/deploy.xml
+++ tools/build/targets/deploy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="inc_deploy" default="build">
-	<target name="deploy-ci" description="Deployment tasks, that are required after SVN checkout" depends="create-aliases">
+	<target name="deploy-ci" description="Deployment tasks, that are required after SVN checkout" depends="lint,create-aliases">
 		<property name="tools.dir" value="${base.dir}/tools"/>
 
 		<echo msg="Fixing shell scripts permissions under '/tools' folder"/>