diff --git a/build/build-tests.xml b/build/build-tests.xml
index fdfc2d959da..544a496c69a 100755
--- a/build/build-tests.xml
+++ b/build/build-tests.xml
@@ -266,7 +266,6 @@
 	</target>
 
 	<target name="automated-test-run" description="Run the automated tests in tools/testClient/testcases/automated.xml using the debug server">
-	  <property name="env.CATALINA_HOME" value="/usr/share/cloud"/>
 	  <antcall target="build-all"/>
 	  <antcall target="deploy-server"/>
 	  <antcall target="deploydb"/>
diff --git a/tools/testClient/automated/automated.sh b/tools/testClient/automated/automated.sh
new file mode 100644
index 00000000000..a348ff8c5d8
--- /dev/null
+++ b/tools/testClient/automated/automated.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+export CATALINA_HOME=/usr/share/cloud
+
+ant clean-all
+
+ant automated-test-run
+
+exit $?