diff --git a/build/build.xml b/build/build.xml
index f4f0b3754..dccdae3c0 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -552,8 +552,7 @@
     <get src="${archive_url}" dest="${archive_file}" verbose="true" ignoreerrors="true" />
   </target>
 
-  <!-- Ensure that the tool is downloaded and test checksums, if everything's ok unzip it on the tools folder  -->
-  <target name="untar" depends="untar-unzip-download" unless="${archive_file}_installed">
+  <target name="untar-unzip-checksum" depends="untar-unzip-download">
     <echo>Testing checksum of "${archive_file}"</echo>
     <checksum file="${archive_file}" algorithm="sha" fileext=".sha" verifyproperty="checksum.matches"/>
     <condition property="checksum.matches.fail">
@@ -564,8 +563,10 @@
       File ${archive_file} failed checksum.
       Please remove "${archive_file}" to download it again.
     </fail>
+  </target>
 
-    <!-- Unzip tool to the destination folder -->
+  <!-- Ensure that the tool is downloaded and test checksums, if everything's ok unzip it on the tools folder  -->
+  <target name="untar" depends="untar-unzip-checksum" unless="${archive_file}_installed">
     <echo>Unzipping into folder ${dest_folder}</echo>
     <exec executable="tar">
       <arg value="xfz"/>
@@ -574,19 +575,7 @@
     </exec>
   </target>
 
-  <target name="unzip" depends="untar-unzip-download" unless="${archive_file}_installed">
-    <echo>Testing checksum of "${archive_file}"</echo>
-    <checksum file="${archive_file}" algorithm="sha" fileext=".sha" verifyproperty="checksum.matches"/>
-    <condition property="checksum.matches.fail">
-      <equals arg1="${checksum.matches}" arg2="false"/>
-    </condition>
-    <fail if="checksum.matches.fail">Checksum failed.
-
-      File ${archive_file} failed checksum.
-      Please remove "${archive_file}" to download it again.
-    </fail>
-
-    <!-- Unzip tool to the destination folder -->
+  <target name="unzip" depends="untar-unzip-checksum" unless="${archive_file}_installed">
     <echo>Unzipping into folder ${dest_folder}</echo>
     <mkdir dir="${dest_folder}" />
     <exec executable="unzip">