diff --git a/test/arguments/without_sql_code/build.xml b/test/arguments/without_sql_code/build.xml
index 9eb56e506..db17501af 100644
--- a/test/arguments/without_sql_code/build.xml
+++ b/test/arguments/without_sql_code/build.xml
@@ -24,7 +24,11 @@
         <testCompile testName="without_sql_code" srcPath="${without_sql_code.zs.out_dir}"/>
     </target>
 
-    <target name="spotbugs" depends="compile" if="spotbugs.home_dir">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
+        <testClangFormat testName="without_sql_code"/>
+    </target>
+
+    <target name="spotbugs" depends="clang_format" if="spotbugs.home_dir">
         <testSpotBugs testName="without_sql_code" srcPath="${without_sql_code.zs.out_dir}"/>
     </target>
 
diff --git a/test/build.xml b/test/build.xml
index cb5ed8b19..7c9581266 100644
--- a/test/build.xml
+++ b/test/build.xml
@@ -198,12 +198,15 @@ spotbugs.home_dir               - Location of the spotbugs tool. If not set, spo
         <attribute name="testName"/>
         <attribute name="srcPath" default="${@{testName}.base_dir}/java"/>
         <sequential>
-            <echo>
+            <condition property="src_path.exists">
+                <available file="@{srcPath}" type="dir"/>
+            </condition>
+            <echo if:set="src_path.exists">
     Command hints to reformat source manually using clang-format tool (in case of format errors):
         git clang-format
         clang-format --style=file -i [SOURCE]
             </echo>
-            <apply executable="${clang_format.exec_file}" failonerror="true">
+            <apply if:set="src_path.exists" executable="${clang_format.exec_file}" failonerror="true">
                 <arg value="--style=file"/>
                 <arg value="--dry-run"/>
                 <arg value="--Werror"/>
diff --git a/test/language/comments/build.xml b/test/language/comments/build.xml
index 7f3e8409e..ea48a15d9 100644
--- a/test/language/comments/build.xml
+++ b/test/language/comments/build.xml
@@ -22,7 +22,11 @@
         <testCompile testName="comments" srcPath="${comments.zs.out_dir}"/>
     </target>
 
-    <target name="spotbugs" depends="compile" if="spotbugs.home_dir">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
+        <testClangFormat testName="comments"/>
+    </target>
+
+    <target name="spotbugs" depends="clang_format" if="spotbugs.home_dir">
         <testSpotBugs testName="comments" srcPath="${comments.zs.out_dir}"/>
     </target>
 
diff --git a/test/language/rules/build.xml b/test/language/rules/build.xml
index 39854f1f7..e7c5fb082 100644
--- a/test/language/rules/build.xml
+++ b/test/language/rules/build.xml
@@ -22,7 +22,11 @@
         <testCompile testName="rules" srcPath="${rules.zs.out_dir}"/>
     </target>
 
-    <target name="spotbugs" depends="compile" if="spotbugs.home_dir">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
+        <testClangFormat testName="rules"/>
+    </target>
+
+    <target name="spotbugs" depends="clang_format" if="spotbugs.home_dir">
         <testSpotBugs testName="rules" srcPath="${rules.zs.out_dir}"/>
     </target>