diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/EditingTestSuite.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/EditingTestSuite.java
new file mode 100644
index 0000000000000000000000000000000000000000..304b9f9e056f6d9eefc7d7cdfda4ec9bca44664c
--- /dev/null
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/EditingTestSuite.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2010 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 com.google.gwt.junit.tools.GWTTestSuite;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+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.EntityTypePropertyTypeAssignmentTest;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.ProjectRegistrationTest;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.PropertyTypeRegistrationTest;
+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.experiment.GenericExperimentEditorTest;
+import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.sample.GenericSampleRegistrationTest;
+
+/**
+ * 
+ *
+ * @author Chandrasekhar Ramakrishnan
+ */
+public class EditingTestSuite extends GWTTestSuite
+{
+    public static Test suite()
+    {
+        final TestSuite testSuite = new TestSuite("Editing Tests");
+        testSuite.addTestSuite(AuthenticationTest.class);
+        testSuite.addTestSuite(AuthorizationGroupsTest.class);
+        testSuite.addTestSuite(GenericDataSetEditorTest.class);
+        testSuite.addTestSuite(AuthorizationManagementConsolTest.class);
+        testSuite.addTestSuite(GenericSampleRegistrationTest.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(GenericExperimentEditorTest.class);
+        testSuite.addTestSuite(EntityTypePropertyTypeAssignmentTest.class);
+        testSuite.addTestSuite(VocabularyRegistrationTest.class);
+        testSuite.addTestSuite(PropertyTypeRegistrationTest.class);
+        testSuite.addTestSuite(ProjectRegistrationTest.class);
+        return testSuite;
+    }
+}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite1.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite1.java
new file mode 100644
index 0000000000000000000000000000000000000000..05bdf14e3b699c62a270000062a7eceeef264142
--- /dev/null
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite1.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010 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.DataSetSearchTest;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.FileFormatTypeGridTest;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.VocabularyBrowserTest;
+
+/**
+ * 
+ *
+ * @author Chandrasekhar Ramakrishnan
+ */
+public class ViewingTestSuite1 extends GWTTestSuite
+{
+    public static Test suite()
+    {
+        final TestSuite testSuite = new TestSuite("Viewing Tests 1");
+        testSuite.addTestSuite(AuthenticationTest.class);
+        testSuite.addTestSuite(VocabularyBrowserTest.class);
+        testSuite.addTestSuite(FileFormatTypeGridTest.class);
+        testSuite.addTestSuite(DataSetSearchTest.class);
+        return testSuite;
+    }
+}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite2.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite2.java
new file mode 100644
index 0000000000000000000000000000000000000000..299cd6508ec43907b0dc1c1b38ee8d9d5e9cca05
--- /dev/null
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite2.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2010 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.EntityTypeBrowserTest;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.ExperimentBrowserTest;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.MaterialBrowserTest;
+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.SampleBrowserTest;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.SearchTest;
+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.GenericExperimentViewerTest;
+import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.sample.GenericSampleViewerTest;
+
+/**
+ * 
+ *
+ * @author Chandrasekhar Ramakrishnan
+ */
+public class ViewingTestSuite2 extends GWTTestSuite
+{
+    public static Test suite()
+    {
+        final TestSuite testSuite = new TestSuite("Viewing Tests 2");
+        testSuite.addTestSuite(AuthenticationTest.class);
+        testSuite.addTestSuite(GenericDataSetViewerTest.class);
+        testSuite.addTestSuite(SampleBrowserTest.class);
+        testSuite.addTestSuite(GenericSampleViewerTest.class);
+        testSuite.addTestSuite(SearchTest.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(PropertyTypeBrowserTest.class);
+        testSuite.addTestSuite(PropertyTypeAssignmentBrowserTest.class);
+        testSuite.addTestSuite(GenericExperimentAttachmentDownloadTest.class);
+        testSuite.addTestSuite(EntityTypeBrowserTest.class);
+        return testSuite;
+    }
+}