diff --git a/webapp/build.xml b/webapp/build.xml
index 9c341abca..ceaa34605 100644
--- a/webapp/build.xml
+++ b/webapp/build.xml
@@ -167,7 +167,7 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 	<!-- ================================= 
           target: test              
          ================================= -->
-	<target name="test" depends="compile" description="--> Run JUnit tests">
+	<target name="test" depends="compile" unless="skiptests" description="--> Run JUnit tests">
 		<javac srcdir="${webapp.dir}/test"
 		       destdir="${build.dir}/testclasses"
 		       debug="true"
diff --git a/webapp/product-build.xml b/webapp/product-build.xml
index f89080586..96ca569f2 100644
--- a/webapp/product-build.xml
+++ b/webapp/product-build.xml
@@ -103,7 +103,10 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 	<!-- ================================= 
           target: test              
          ================================= -->
-	<target name="test" depends="vitroCore.test, productTest" description="--> Run JUnit tests">
+	<target name="test"
+	        depends="vitroCore.test, productTest"
+	        unless="skiptests"
+	        description="--> Run JUnit tests">
 	</target>
 
 	<!-- ================================= 
@@ -152,7 +155,7 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 	<!-- - - - - - - - - - - - - - - - - - 
           target: productTest                      
          - - - - - - - - - - - - - - - - - -->
-	<target name="productTest" depends="vitroCore.test" if="product.tests.exist">
+	<target name="productTest" depends="vitroCore.test" if="product.tests.exist" unless="skiptests">
 		<javac srcdir="${product.test.dir}"
 		       destdir="${test.classes.dir}"
 		       debug="true"