diff --git a/openbis-common/build/build-common.xml b/openbis-common/build/build-common.xml
index b64467d106f9bc34850fc1fd542c47cf900b9408..bf9307c4ef1a05a0fffd3b2144165ca59dfd5c15 100644
--- a/openbis-common/build/build-common.xml
+++ b/openbis-common/build/build-common.xml
@@ -18,6 +18,7 @@
           <fileset dir="${targets.www}"  followsymlinks="false"/> 
         </delete>
     	  <mkdir dir="${targets.www}" />
+    	  <mkdir dir="${targets.www}/${module-test.module}" />
     		<mkdir dir="${targets.www.web-inf}" />
         <copy todir="${targets.www.web-inf}" overwrite="true" failonerror="true">
             <fileset dir="../${ant.project.name}/${server-resource}" includes="*.xml" />
diff --git a/openbis/build/build.xml b/openbis/build/build.xml
index abbb2d39638282a36bbc8e5bad3e43884b95bb0d..2cb750acdae64b7e523ea63d057ce57f7be3f44b 100644
--- a/openbis/build/build.xml
+++ b/openbis/build/build.xml
@@ -362,7 +362,13 @@
     // Override 'prepare-gwt' target by writing out 'OpenBIS.gwt-without-entry-point.xml' and updating
     'ClientPluginProvider.java'.
   -->
-  <target name="prepare-gwt"
+  <target name="prepare-gwt">
+		<antcall target="do-prepare-gwt">
+			<param name="module-test.module" value="ch.systemsx.cisd.openbis.OpenBIS" />
+		</antcall>
+  </target>
+  
+  <target name="do-prepare-gwt"
   	depends="prepare-web-client, compile-tests, openbis-common-common.prepare-gwt"
     description="Override 'prepare-gwt' by writing out 'OpenBIS.gwt-without-entry-point.xml' and updating 'ClientPluginProvider.java'.">
   	
diff --git a/rtd_phosphonetx/build/build.xml b/rtd_phosphonetx/build/build.xml
index 013b8566272bcdae2836647249f447a0f52bc25c..ebee07653f7c89eed48aa516b77ccefd0d8ca143 100644
--- a/rtd_phosphonetx/build/build.xml
+++ b/rtd_phosphonetx/build/build.xml
@@ -190,6 +190,12 @@
 	        depends="prepare-gwt, module-test"
 	        description="Prepare, compile, and run the module test mode">
 	</target>
+  
+  <target name="prepare-gwt">
+		<antcall target="openbis.do-prepare-gwt">
+			<param name="module-test.module" value="ch.systemsx.cisd.openbis.plugin.proteomics.OpenBIS" />
+		</antcall>
+  </target>
 
 	<target name="compile-and-run-openbis-proteomics-from-eclipse"
 	        description="Compile and run the proteomics openbis from Eclipse">
diff --git a/screening/build/build.xml b/screening/build/build.xml
index ad41fdf19440545219622525066b1a9689cf2548..6388537c239dc3552af9e86635bf5e568413440e 100644
--- a/screening/build/build.xml
+++ b/screening/build/build.xml
@@ -210,6 +210,12 @@
 	-->
 	<target name="prepare-gwt-with-image-viewer" depends="prepare-gwt, jar"/>
 	
+  <target name="prepare-gwt">
+		<antcall target="openbis.do-prepare-gwt">
+			<param name="module-test.module" value="ch.systemsx.cisd.openbis.plugin.screening.OpenBIS" />
+		</antcall>
+  </target>
+
 	<target name="jar" depends="openbis.jar">
 	  <property name="dist.file.name"
 	            value="${ant.project.name}-${version.number}-r${revision.number}" />