diff --git a/openbis/build/build.xml b/openbis/build/build.xml
index 2bdb637960bc8e98d4624d06f1e4d0111e6f697a..b823b5fdf66b366377331535d35e9853f4bcecfd 100644
--- a/openbis/build/build.xml
+++ b/openbis/build/build.xml
@@ -106,7 +106,7 @@
 				<isset property="tests-failed"/>
 			</condition>
 		</fail>
-			<junit dir="." fork="true" forkmode="once" maxmemory="1024m" showoutput="true" failureproperty="tests-failed">
+		<junit dir="." fork="true" forkmode="once" maxmemory="1024m" showoutput="true" failureproperty="tests-failed">
 				<classpath>
 					<pathelement location="${sources}" />
 					<pathelement location="${sources.test}" />
@@ -126,13 +126,40 @@
 				<sysproperty key="data-store-server-base-url" value="https://localhost:8889" />
 				<sysproperty key="gwt.args" value="-Xtries 1" />
 				<formatter type="xml" />
-				<test name="ch.systemsx.cisd.openbis.generic.ViewingTestSuite2" todir="${output.test}" />
+				<test name="ch.systemsx.cisd.openbis.generic.ViewingTestSuite3" todir="${output.test}" />
 			</junit>
 			<fail>
 				<condition>
 					<isset property="tests-failed"/>
-				</condition>
-			</fail>
+			</condition>
+		</fail>
+		<junit dir="." fork="true" forkmode="once" maxmemory="1024m" showoutput="true" failureproperty="tests-failed">
+			<classpath>
+				<pathelement location="${sources}" />
+				<pathelement location="${sources.test}" />
+				<pathelement path="${ecp}" />
+				<pathelement location="${gwt.lib}/gwt-dev.jar" />
+			</classpath>
+			<jvmarg value="-ea" />
+			<sysproperty key="authentication-service" value="file-authentication-service" />
+			<sysproperty key="database.create-from-scratch" value="true" />
+			<sysproperty key="database.kind" value="system_test" />
+			<sysproperty key="script-folder" value="sourceTest" />
+			<sysproperty key="mass-upload-folder" value="sourceTest/sql/postgresql" />
+			<sysproperty key="log4j.configuration" value="etc/log_system_test.xml" />
+			<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="-Xtries 1" />
+			<formatter type="xml" />
+			<test name="ch.systemsx.cisd.openbis.generic.ViewingTestSuite2" todir="${output.test}" />
+		</junit>
+		<fail>
+			<condition>
+				<isset property="tests-failed"/>
+			</condition>
+		</fail>
 	</target>
 	
 
diff --git a/openbis/resource/eclipse/openBIS Viewing Tests 3.launch b/openbis/resource/eclipse/openBIS Viewing Tests 3.launch
new file mode 100644
index 0000000000000000000000000000000000000000..ac15d0026c35fdc86de705d20cf97be460c511a1
--- /dev/null
+++ b/openbis/resource/eclipse/openBIS Viewing Tests 3.launch	
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite2.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;openbis&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/openbis/source/java&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/openbis/sourceTest/java&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;openbis&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/libraries/gwt2.0/gwt-dev.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="ch.systemsx.cisd.openbis.generic.ViewingTestSuite3"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="openbis"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dauthentication-service=file-authentication-service&#13;&#10;-Ddatabase.create-from-scratch=true&#13;&#10;-Ddatabase.kind=system_test&#13;&#10;-Dscript-folder=sourceTest&#13;&#10;-Dmass-upload-folder=sourceTest/sql/postgresql&#13;&#10;-Dhibernate.search.index-base=sourceTest/lucene/indices&#13;&#10;-Dhibernate.search.index-mode=NO_INDEX&#13;&#10;-Dlog4j.configuration=etc/log_system_test.xml&#13;&#10;-Dhibernate.search.indexing_strategy=manual&#13;&#10;-Ddata-store-server-base-url=https://localhost:8889&#10;-Dgwt.args=&quot;-Xtries 1&quot;&#13;&#10;-Xmx1024m&#13;&#10;-ea"/>
+</launchConfiguration>