diff --git a/openbis/resource/eclipse/openBIS System Tests (Hosted Mode, Linux).launch b/openbis/resource/eclipse/openBIS System Tests (Hosted Mode, Linux).launch
deleted file mode 100644
index 45e1c3d68e6d3bb9ba6a729e95f229e77e82720e..0000000000000000000000000000000000000000
--- a/openbis/resource/eclipse/openBIS System Tests (Hosted Mode, Linux).launch
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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/SystemTestSuite.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<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="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="openbis" path="1" type="4"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/openbis/source/java" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/openbis/sourceTest/java" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="openbis"/> </runtimeClasspathEntry> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/libraries/gwt1.7/linux/gwt-dev-linux.jar" path="3" type="2"/> "/>
-</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.SystemTestSuite"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-out targets/www-test"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="openbis"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dauthentication-service=file-authentication-service -Ddatabase.create-from-scratch=true -Ddatabase.kind=system_test -Dscript-folder=sourceTest -Dmass-upload-folder=sourceTest/sql/postgresql -Dlog4j.configuration=etc/log_system_test.xml -Dhibernate.search.index-base=sourceTest/lucene/indices -Dhibernate.search.index-mode=NO_INDEX -Dhibernate.search.indexing_strategy=manual -Ddata-store-server-base-url=https://localhost:8889 -Xmx512M -ea"/>
-</launchConfiguration>
diff --git a/openbis/resource/eclipse/openBIS System Tests (Hosted Mode, Mac).launch b/openbis/resource/eclipse/openBIS System Tests (Hosted Mode, Mac).launch
deleted file mode 100644
index 3959d0392f885663065fe2ac19ce6bede4974edd..0000000000000000000000000000000000000000
--- a/openbis/resource/eclipse/openBIS System Tests (Hosted Mode, Mac).launch
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/SystemTestSuite.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="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="openbis" path="1" type="4"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/openbis/source/java" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/openbis/sourceTest/java" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="openbis"/> </runtimeClasspathEntry> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/libraries/gwt2.0/gwt-dev.jar" path="3" type="2"/> "/>
-</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.SystemTestSuite"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="openbis"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dauthentication-service=file-authentication-service -Ddatabase.create-from-scratch=true -Ddatabase.kind=system_test -Dscript-folder=sourceTest -Dmass-upload-folder=sourceTest/sql/postgresql -Dhibernate.search.index-base=sourceTest/lucene/indices -Dhibernate.search.index-mode=NO_INDEX -Dlog4j.configuration=etc/log_system_test.xml -Dhibernate.search.indexing_strategy=manual -Ddata-store-server-base-url=https://localhost:8889 -Dgwt.args="-Xtries 1 -logLevel INFO" -Xmx1024M -ea"/>
-</launchConfiguration>
diff --git a/openbis/resource/eclipse/openBIS System Tests (Hosted Mode, Windows).launch b/openbis/resource/eclipse/openBIS System Tests (Hosted Mode, Windows).launch
deleted file mode 100644
index 918f17536e68808a2fb6656ec7e4d4b0077650c1..0000000000000000000000000000000000000000
--- a/openbis/resource/eclipse/openBIS System Tests (Hosted Mode, Windows).launch
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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/SystemTestSuite.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<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="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="openbis" path="1" type="4"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/openbis/source/java" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/openbis/sourceTest/java" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="openbis"/> </runtimeClasspathEntry> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/libraries/gwt1.7/windows/gwt-dev-windows.jar" path="3" type="2"/> "/>
-</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.SystemTestSuite"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-out targets/www-test"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="openbis"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dauthentication-service=file-authentication-service -Ddatabase.create-from-scratch=true -Ddatabase.kind=system_test -Dscript-folder=sourceTest -Dmass-upload-folder=sourceTest/sql/postgresql -Dlog4j.configuration=etc/log_system_test.xml -Dhibernate.search.index-base=sourceTest/lucene/indices -Dhibernate.search.index-mode=NO_INDEX -Dhibernate.search.indexing_strategy=manual -Ddata-store-server-base-url=https://localhost:8889 -Xmx512M -ea"/>
-</launchConfiguration>
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/SystemTestSuite.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/SystemTestSuite.java
deleted file mode 100644
index face37421f438ea29b66dcfd2f59bc47427b2316..0000000000000000000000000000000000000000
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/SystemTestSuite.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2008 ETH Zuerich, CISD
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.systemsx.cisd.openbis.generic;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import com.google.gwt.junit.tools.GWTTestSuite;
-
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.AuthenticationTest;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.AuthorizationGroupsTest;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.AuthorizationManagementConsolTest;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.DataSetSearchTest;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.EntityTypeBrowserTest;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.EntityTypePropertyTypeAssignmentTest;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ExperimentBrowserTest;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.FileFormatTypeGridTest;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.MaterialBrowserTest;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ProjectRegistrationTest;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.PropertyTypeAssignmentBrowserTest;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.PropertyTypeBrowserTest;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.PropertyTypeRegistrationTest;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.SampleBrowserTest;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.SearchTest;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.VocabularyBrowserTest;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.VocabularyRegistrationTest;
-import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.dataset.GenericDataSetEditorTest;
-import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.dataset.GenericDataSetViewerTest;
-import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.experiment.GenericExperimentAttachmentDownloadTest;
-import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.experiment.GenericExperimentEditorTest;
-import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.experiment.GenericExperimentViewerTest;
-import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.sample.GenericSampleRegistrationTest;
-import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.sample.GenericSampleViewerTest;
-
-/**
- * @author Franz-Josef Elmer
- */
-public class SystemTestSuite extends GWTTestSuite
-{
- public static Test suite()
- {
- final TestSuite testSuite = new TestSuite("System Tests");
- testSuite.addTestSuite(AuthenticationTest.class);
- testSuite.addTestSuite(AuthorizationGroupsTest.class);
- testSuite.addTestSuite(VocabularyBrowserTest.class);
- testSuite.addTestSuite(FileFormatTypeGridTest.class);
- testSuite.addTestSuite(DataSetSearchTest.class);
- testSuite.addTestSuite(GenericDataSetViewerTest.class);
- testSuite.addTestSuite(GenericDataSetEditorTest.class);
- testSuite.addTestSuite(AuthorizationManagementConsolTest.class);
- testSuite.addTestSuite(SampleBrowserTest.class);
- testSuite.addTestSuite(GenericSampleViewerTest.class);
- testSuite.addTestSuite(SearchTest.class);
- testSuite.addTestSuite(GenericSampleRegistrationTest.class);
-
- testSuite.addTestSuite(ExperimentBrowserTest.class);
- testSuite.addTestSuite(MaterialBrowserTest.class);
-
- // TODO 2009-01-21, IA: Uncomment after it's clear how to deal with
- // (NS_ERROR_DOM_SECURITY_ERR): Security error on CC
- // testSuite.addTestSuite(GenericExperimentRegistrationTest.class);
-
- testSuite.addTestSuite(GenericExperimentViewerTest.class);
- testSuite.addTestSuite(GenericExperimentEditorTest.class);
- testSuite.addTestSuite(PropertyTypeBrowserTest.class);
- testSuite.addTestSuite(PropertyTypeAssignmentBrowserTest.class);
- testSuite.addTestSuite(EntityTypePropertyTypeAssignmentTest.class);
- testSuite.addTestSuite(VocabularyRegistrationTest.class);
- testSuite.addTestSuite(PropertyTypeRegistrationTest.class);
- testSuite.addTestSuite(GenericExperimentAttachmentDownloadTest.class);
- testSuite.addTestSuite(ProjectRegistrationTest.class);
- testSuite.addTestSuite(EntityTypeBrowserTest.class);
- return testSuite;
- }
-}
\ No newline at end of file