diff --git a/openbis/build/build.xml b/openbis/build/build.xml
index cb31a1c8731202c6a7beb2bdeff2ea16f6ba608d..10f569c9a63e97b946b0a4cb3d8b322400c3e6f4 100644
--- a/openbis/build/build.xml
+++ b/openbis/build/build.xml
@@ -90,8 +90,7 @@
         <sysproperty key="hibernate.search.index-base" value="sourceTest/lucene/indices" />
         <sysproperty key="hibernate.search.index-mode" value="NO_INDEX" />
         <sysproperty key="hibernate.search.indexing_strategy" value="manual" />
-        <sysproperty key="data-store-server-base-url" value="https://localhost:8889" />
-        <sysproperty key="gwt.args" value="-testMethodTimeout 5 -Xtries 1" />
+        <sysproperty key="gwt.args" value="-testMethodTimeout 6 -Xtries 1" />
         <formatter type="xml" />
         <test name="@{testsuite}" todir="${output.test}" />
       </junit>
@@ -115,6 +114,16 @@
     <fail if="tests.failed" message="At least one of system test suites failed."/>    
   </target>
 
+	<!--
+  	// Must pass in 'testsuite'. Should be performed after prepare-gwt and compile-tests.
+  -->
+  <target name="run-single-system-test-suite">
+  	<delete dir="${output.test}" />
+  	<mkdir dir="${output.test}" />
+  	<run-system-test-suite testsuite="${testsuite}"/>
+  	<fail if="tests.failed" message="${testsuite} failed."/>    
+  </target>
+
   <!-- 
       // Makes a distribution file.
       -->