diff --git a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/infra/application/GuiApplicationRunner.java b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/infra/application/GuiApplicationRunner.java
index e0a4e8ccba8b38f0cfd20d45d4edfb76b61976a2..8e423c2868580c5452187ddf770e20dcd9e9efac 100644
--- a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/infra/application/GuiApplicationRunner.java
+++ b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/infra/application/GuiApplicationRunner.java
@@ -22,6 +22,7 @@ import java.util.concurrent.TimeUnit;
 import org.openqa.selenium.NoSuchElementException;
 
 import ch.systemsx.cisd.openbis.uitest.infra.dsl.SeleniumTest;
+import ch.systemsx.cisd.openbis.uitest.infra.screenshot.ScreenShotter;
 import ch.systemsx.cisd.openbis.uitest.infra.uid.UidGenerator;
 import ch.systemsx.cisd.openbis.uitest.infra.webdriver.PageProxy;
 import ch.systemsx.cisd.openbis.uitest.page.dialog.AddExperimentTypeDialog;
@@ -78,12 +79,28 @@ public class GuiApplicationRunner implements ApplicationRunner
 
     private UidGenerator uid;
 
-    public GuiApplicationRunner(PageProxy proxy, UidGenerator uid)
+    public GuiApplicationRunner(UidGenerator uid)
     {
-        this.proxy = proxy;
+        this.proxy = new PageProxy(new ScreenShotter()
+            {
+                @Override
+                public void screenshot()
+                {
+                }
+            });
         this.uid = uid;
     }
 
+    public void setScreenShotter(ScreenShotter shotter)
+    {
+        proxy.setScreenShotter(shotter);
+    }
+
+    public void screenshot()
+    {
+        proxy.screenshot();
+    }
+
     @Override
     public String uid()
     {
diff --git a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/infra/dsl/SeleniumTest.java b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/infra/dsl/SeleniumTest.java
index 247f47307d2b85dbb50fb5282a1b70b0eb3fa2a7..5ab54dcfb369f3e555e3bc5c3afba9e94d740f4f 100644
--- a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/infra/dsl/SeleniumTest.java
+++ b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/infra/dsl/SeleniumTest.java
@@ -32,10 +32,8 @@ import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.firefox.FirefoxDriver;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterSuite;
-import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeSuite;
-import org.testng.annotations.BeforeTest;
 
 import ch.systemsx.cisd.openbis.uitest.infra.application.ApplicationRunner;
 import ch.systemsx.cisd.openbis.uitest.infra.application.GuiApplicationRunner;
@@ -50,7 +48,6 @@ import ch.systemsx.cisd.openbis.uitest.infra.screenshot.FileScreenShotter;
 import ch.systemsx.cisd.openbis.uitest.infra.screenshot.ScreenShotter;
 import ch.systemsx.cisd.openbis.uitest.infra.uid.DictionaryUidGenerator;
 import ch.systemsx.cisd.openbis.uitest.infra.uid.UidGenerator;
-import ch.systemsx.cisd.openbis.uitest.infra.webdriver.PageProxy;
 import ch.systemsx.cisd.openbis.uitest.page.tab.BrowserRow;
 import ch.systemsx.cisd.openbis.uitest.page.tab.RegisterSample;
 import ch.systemsx.cisd.openbis.uitest.page.tab.SampleDetails;
@@ -91,11 +88,7 @@ public abstract class SeleniumTest
 
     private static UidGenerator uid;
 
-    private PageProxy pageProxy;
-
-    private ScreenShotter shotter;
-
-    private GuiApplicationRunner openbis;
+    private static GuiApplicationRunner openbis;
 
     private static ApplicationRunner openbisApi;
 
@@ -147,16 +140,8 @@ public abstract class SeleniumTest
 
         uid = new DictionaryUidGenerator(new File("resource/corncob_lowercase.txt"));
         openbisApi = new PublicApiApplicationRunner(asUrl, dssUrl, uid);
-    }
+        openbis = new GuiApplicationRunner(uid);
 
-    public static void setImplicitWait(long amount, TimeUnit unit)
-    {
-        driver.manage().timeouts().implicitlyWait(amount, unit);
-    }
-
-    public static void setImplicitWaitToDefault()
-    {
-        driver.manage().timeouts().implicitlyWait(IMPLICIT_WAIT, TimeUnit.SECONDS);
     }
 
     @AfterSuite
@@ -165,54 +150,34 @@ public abstract class SeleniumTest
         driver.quit();
     }
 
-    @BeforeTest(groups =
-        { "login-admin", "sprint-test" })
-    public void loginAsAdmin()
+    public static void setImplicitWait(long amount, TimeUnit unit)
     {
-        System.out.println("LOGIN");
-        this.openbis = new GuiApplicationRunner(new PageProxy(new ScreenShotter()
-            {
-                @Override
-                public void screenshot()
-                {
-                }
-            }), uid);
-        openbis.login(ADMIN_USER, ADMIN_PASSWORD);
-        // this is because of BIS-184
-        openbis.browseToSampleBrowser().allSpaces();
+        driver.manage().timeouts().implicitlyWait(amount, unit);
+    }
 
-        openbisApi.login(ADMIN_USER, ADMIN_PASSWORD);
+    public static void setImplicitWaitToDefault()
+    {
+        driver.manage().timeouts().implicitlyWait(IMPLICIT_WAIT, TimeUnit.SECONDS);
     }
 
-    @AfterTest(groups =
-        { "login-admin", "sprint-test" })
     public void logout()
     {
-        System.out.println("LOGOUT!");
-        this.openbis = new GuiApplicationRunner(new PageProxy(new ScreenShotter()
-            {
-                @Override
-                public void screenshot()
-                {
-                }
-            }), uid);
         openbis.logout();
     }
 
     @BeforeMethod(alwaysRun = true)
     public void initPageProxy(Method method)
     {
-        this.shotter =
+        ScreenShotter shotter =
                 new FileScreenShotter((TakesScreenshot) driver, "targets/dist/"
                         + this.getClass().getSimpleName() + "/" + method.getName());
-        this.pageProxy = new PageProxy(shotter);
-        this.openbis = new GuiApplicationRunner(this.pageProxy, uid);
+        openbis.setScreenShotter(shotter);
     }
 
     @AfterMethod(alwaysRun = true)
     public void takeScreenShot() throws IOException
     {
-        shotter.screenshot();
+        openbis.screenshot();
     }
 
     private void delete(File f)
@@ -254,7 +219,7 @@ public abstract class SeleniumTest
     public RegisterSample sampleRegistrationPageFor(SampleType type)
     {
         openbis.browseToRegisterSample().selectSampleType(type);
-        return pageProxy.get(RegisterSample.class);
+        return assumePage(RegisterSample.class);
     }
 
     public String loggedInAs()
diff --git a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/infra/webdriver/PageProxy.java b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/infra/webdriver/PageProxy.java
index 557447b710f8c8eb03c6b3d63f7d688c22033a6a..4aa7c2642ab8f52e67de8770532ffe5247730cdf 100644
--- a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/infra/webdriver/PageProxy.java
+++ b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/infra/webdriver/PageProxy.java
@@ -111,4 +111,14 @@ public class PageProxy
             throw new RuntimeException(e);
         }
     }
+
+    public void setScreenShotter(ScreenShotter shotter)
+    {
+        this.shotter = shotter;
+    }
+
+    public void screenshot()
+    {
+        shotter.screenshot();
+    }
 }
diff --git a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/authentication/AuthenticationTest.java b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/authentication/AuthenticationTest.java
index ad22bab8352cfd19ecdc9763ef690f06141349ae..95c8217d08e54e6b3f46445d5c1a7a089b5b453a 100644
--- a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/authentication/AuthenticationTest.java
+++ b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/authentication/AuthenticationTest.java
@@ -11,8 +11,6 @@ import ch.systemsx.cisd.openbis.uitest.page.menu.AdminMenu;
 import ch.systemsx.cisd.openbis.uitest.page.menu.TopBar;
 import ch.systemsx.cisd.openbis.uitest.page.tab.RoleAssignmentBrowser;
 
-@Test(groups =
-    { "no-login" })
 public class AuthenticationTest extends SeleniumTest
 {
 
diff --git a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/DataSetTest.java b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/DataSetTest.java
index 876579c6732d21ac95720812c89ad116072c7f96..a985c576665c05d460bb0bd344b4ebd6a6776726 100644
--- a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/DataSetTest.java
+++ b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/DataSetTest.java
@@ -18,7 +18,6 @@ package ch.systemsx.cisd.openbis.uitest.suite.main;
 
 import org.testng.annotations.Test;
 
-import ch.systemsx.cisd.openbis.uitest.infra.dsl.SeleniumTest;
 import ch.systemsx.cisd.openbis.uitest.type.DataSet;
 import ch.systemsx.cisd.openbis.uitest.type.Experiment;
 import ch.systemsx.cisd.openbis.uitest.type.Sample;
@@ -26,9 +25,7 @@ import ch.systemsx.cisd.openbis.uitest.type.Sample;
 /**
  * @author anttil
  */
-@Test(groups =
-    { "login-admin" })
-public class DataSetTest extends SeleniumTest
+public class DataSetTest extends MainSuiteTest
 {
 
     @Test(enabled = false)
diff --git a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ExperimentTest.java b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ExperimentTest.java
index e406f65f55fdd942f578cb7389691e0469d58c86..0c918c1fe124eb168f4fb25a59842a316db55edb 100644
--- a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ExperimentTest.java
+++ b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ExperimentTest.java
@@ -20,7 +20,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.testng.annotations.Test;
 
-import ch.systemsx.cisd.openbis.uitest.infra.dsl.SeleniumTest;
 import ch.systemsx.cisd.openbis.uitest.type.Experiment;
 import ch.systemsx.cisd.openbis.uitest.type.Project;
 import ch.systemsx.cisd.openbis.uitest.type.Sample;
@@ -29,9 +28,7 @@ import ch.systemsx.cisd.openbis.uitest.type.Space;
 /**
  * @author anttil
  */
-@Test(groups =
-    { "login-admin" })
-public class ExperimentTest extends SeleniumTest
+public class ExperimentTest extends MainSuiteTest
 {
 
     @Test
diff --git a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ExperimentTypeTest.java b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ExperimentTypeTest.java
index 3df66a899ac5f41efc749527012624ff4615ff3d..be4b3c6d6884c2e16b312c41bc211253a372df17 100644
--- a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ExperimentTypeTest.java
+++ b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ExperimentTypeTest.java
@@ -4,12 +4,9 @@ import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.testng.annotations.Test;
 
-import ch.systemsx.cisd.openbis.uitest.infra.dsl.SeleniumTest;
 import ch.systemsx.cisd.openbis.uitest.type.ExperimentType;
 
-@Test(groups =
-    { "login-admin" })
-public class ExperimentTypeTest extends SeleniumTest
+public class ExperimentTypeTest extends MainSuiteTest
 {
 
     @Test
diff --git a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/MainSuiteTest.java b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/MainSuiteTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..4fb35430196d1e7133ef36720258af2750f2a01a
--- /dev/null
+++ b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/MainSuiteTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2012 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.uitest.suite.main;
+
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+
+import ch.systemsx.cisd.openbis.uitest.infra.dsl.SeleniumTest;
+import ch.systemsx.cisd.openbis.uitest.page.menu.BrowseMenu;
+import ch.systemsx.cisd.openbis.uitest.page.menu.TopBar;
+import ch.systemsx.cisd.openbis.uitest.page.tab.SampleBrowser;
+
+/**
+ * @author anttil
+ */
+public abstract class MainSuiteTest extends SeleniumTest
+{
+    @BeforeTest
+    public void before()
+    {
+        login(ADMIN_USER, ADMIN_PASSWORD);
+        // this is because of BIS-184
+        assumePage(TopBar.class).browse();
+        assumePage(BrowseMenu.class).samples();
+        assumePage(SampleBrowser.class).allSpaces();
+    }
+
+    @AfterTest
+    public void after()
+    {
+        logout();
+    }
+}
diff --git a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ProjectTest.java b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ProjectTest.java
index b11ffc657abd204b5742414f861e2ac544b75b00..9fd1a856556989dc729b24d23973abd80928ffca 100644
--- a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ProjectTest.java
+++ b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ProjectTest.java
@@ -4,12 +4,9 @@ import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.testng.annotations.Test;
 
-import ch.systemsx.cisd.openbis.uitest.infra.dsl.SeleniumTest;
 import ch.systemsx.cisd.openbis.uitest.type.Project;
 
-@Test(groups =
-    { "login-admin" })
-public class ProjectTest extends SeleniumTest
+public class ProjectTest extends MainSuiteTest
 {
 
     @Test
diff --git a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/PropertyTypeAssignmentTest.java b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/PropertyTypeAssignmentTest.java
index 30ab5f4429371ab0a82b443397739f29ec0dfdcc..705a08d90a6746fef9949424ee84f020c3369afd 100644
--- a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/PropertyTypeAssignmentTest.java
+++ b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/PropertyTypeAssignmentTest.java
@@ -20,7 +20,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.testng.annotations.Test;
 
-import ch.systemsx.cisd.openbis.uitest.infra.dsl.SeleniumTest;
 import ch.systemsx.cisd.openbis.uitest.type.PropertyType;
 import ch.systemsx.cisd.openbis.uitest.type.PropertyTypeAssignment;
 import ch.systemsx.cisd.openbis.uitest.type.Sample;
@@ -29,9 +28,7 @@ import ch.systemsx.cisd.openbis.uitest.type.SampleType;
 /**
  * @author anttil
  */
-@Test(groups =
-    { "login-admin" })
-public class PropertyTypeAssignmentTest extends SeleniumTest
+public class PropertyTypeAssignmentTest extends MainSuiteTest
 {
     @Test
     public void newPropertyTypeAssignmentIsListedInPropertyTypeAssignmentBrowser() throws Exception
diff --git a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/PropertyTypeTest.java b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/PropertyTypeTest.java
index c9e19480c51409e984c21222f79761c91bdf41f7..465bcbcf2ffd15c17db97146b9d6294ddcabf48b 100644
--- a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/PropertyTypeTest.java
+++ b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/PropertyTypeTest.java
@@ -20,15 +20,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.testng.annotations.Test;
 
-import ch.systemsx.cisd.openbis.uitest.infra.dsl.SeleniumTest;
 import ch.systemsx.cisd.openbis.uitest.type.PropertyType;
 
 /**
  * @author anttil
  */
-@Test(groups =
-    { "login-admin" })
-public class PropertyTypeTest extends SeleniumTest
+public class PropertyTypeTest extends MainSuiteTest
 {
     @Test
     public void newPropertyTypeIsListedInPropertyTypeBrowser() throws Exception
diff --git a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/SampleTest.java b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/SampleTest.java
index efac6d8593221772206e1e14d9ccf06c0dbf83cd..613d87c1cab8d99c4991aa6c61774c345f02dc55 100644
--- a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/SampleTest.java
+++ b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/SampleTest.java
@@ -20,7 +20,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.testng.annotations.Test;
 
-import ch.systemsx.cisd.openbis.uitest.infra.dsl.SeleniumTest;
 import ch.systemsx.cisd.openbis.uitest.type.PropertyType;
 import ch.systemsx.cisd.openbis.uitest.type.Sample;
 import ch.systemsx.cisd.openbis.uitest.type.SampleType;
@@ -29,9 +28,7 @@ import ch.systemsx.cisd.openbis.uitest.type.Vocabulary;
 /**
  * @author anttil
  */
-@Test(groups =
-    { "login-admin" })
-public class SampleTest extends SeleniumTest
+public class SampleTest extends MainSuiteTest
 {
     @Test
     public void newSampleIsListedInSampleBrowser() throws Exception
diff --git a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/SampleTypeTest.java b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/SampleTypeTest.java
index 18662623aa585bb3fb504740cdaa9be679278575..0d058598340bbce41743c18f9ba041f61234cb7a 100644
--- a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/SampleTypeTest.java
+++ b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/SampleTypeTest.java
@@ -20,16 +20,13 @@ import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.testng.annotations.Test;
 
-import ch.systemsx.cisd.openbis.uitest.infra.dsl.SeleniumTest;
 import ch.systemsx.cisd.openbis.uitest.page.dialog.AddSampleTypeDialog;
 import ch.systemsx.cisd.openbis.uitest.type.SampleType;
 
 /**
  * @author anttil
  */
-@Test(groups =
-    { "login-admin" })
-public class SampleTypeTest extends SeleniumTest
+public class SampleTypeTest extends MainSuiteTest
 {
 
     @Test
diff --git a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/SpaceTest.java b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/SpaceTest.java
index 4c5e88d7bd62421fee24c392b21fbd33ea033e09..d8e8f5858de53ff57769bbb23b59f08508aef3fc 100644
--- a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/SpaceTest.java
+++ b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/SpaceTest.java
@@ -4,12 +4,9 @@ import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.testng.annotations.Test;
 
-import ch.systemsx.cisd.openbis.uitest.infra.dsl.SeleniumTest;
 import ch.systemsx.cisd.openbis.uitest.type.Space;
 
-@Test(groups =
-    { "login-admin" })
-public class SpaceTest extends SeleniumTest
+public class SpaceTest extends MainSuiteTest
 {
 
     @Test
diff --git a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/VocabularyTest.java b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/VocabularyTest.java
index 5e7d349f75b9b6999b9b2a8df2d0c76fb273713b..de7fba7865b8b9e63250ff75f604b00623bc2d94 100644
--- a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/VocabularyTest.java
+++ b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/VocabularyTest.java
@@ -4,12 +4,9 @@ import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.testng.annotations.Test;
 
-import ch.systemsx.cisd.openbis.uitest.infra.dsl.SeleniumTest;
 import ch.systemsx.cisd.openbis.uitest.type.Vocabulary;
 
-@Test(groups =
-    { "login-admin" })
-public class VocabularyTest extends SeleniumTest
+public class VocabularyTest extends MainSuiteTest
 {
 
     @Test
diff --git a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/sprint/SprintSuiteTest.java b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/sprint/SprintSuiteTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..745f16ee88d74aea437500b64db1cd063c7cdd03
--- /dev/null
+++ b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/sprint/SprintSuiteTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2012 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.uitest.suite.sprint;
+
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+
+import ch.systemsx.cisd.openbis.uitest.infra.dsl.SeleniumTest;
+import ch.systemsx.cisd.openbis.uitest.page.menu.BrowseMenu;
+import ch.systemsx.cisd.openbis.uitest.page.menu.TopBar;
+import ch.systemsx.cisd.openbis.uitest.page.tab.SampleBrowser;
+
+/**
+ * @author anttil
+ */
+public abstract class SprintSuiteTest extends SeleniumTest
+{
+    @BeforeTest
+    public void before()
+    {
+        login(ADMIN_USER, ADMIN_PASSWORD);
+        // this is because of BIS-184
+        assumePage(TopBar.class).browse();
+        assumePage(BrowseMenu.class).samples();
+        assumePage(SampleBrowser.class).allSpaces();
+    }
+
+    @AfterTest
+    public void after()
+    {
+        logout();
+    }
+}
diff --git a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/sprint/SprintTest.java b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/sprint/SprintTest.java
index 301616cfe4d96dc3157ebf15a97c45bb9ff1d253..641d3e58a9fdccc46cbd8893ba62c54c36759bf1 100644
--- a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/sprint/SprintTest.java
+++ b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/sprint/SprintTest.java
@@ -20,7 +20,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.testng.annotations.Test;
 
-import ch.systemsx.cisd.openbis.uitest.infra.dsl.SeleniumTest;
 import ch.systemsx.cisd.openbis.uitest.page.dialog.AddSampleTypeDialog;
 import ch.systemsx.cisd.openbis.uitest.page.menu.AdminMenu;
 import ch.systemsx.cisd.openbis.uitest.page.menu.TopBar;
@@ -37,9 +36,7 @@ import ch.systemsx.cisd.openbis.uitest.type.Vocabulary;
 /**
  * @author anttil
  */
-@Test(groups =
-    { "sprint-test" })
-public class SprintTest extends SeleniumTest
+public class SprintTest extends SprintSuiteTest
 {
 
     @Test