diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VocabularyBrowserTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VocabularyBrowserTest.java
index c2bbab5d85e6d5f30bab97e25687c8f92c3e4e5f..84e2958da78ad32d56c7dd52c49dc2fc04397def 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VocabularyBrowserTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VocabularyBrowserTest.java
@@ -59,7 +59,7 @@ public class VocabularyBrowserTest extends AbstractGWTTestCase
         loginAndInvokeAction(ActionMenuKind.VOCABULARY_MENU_BROWSE);
         showControlledVocabularyTerms(remoteConsole, VOCABULARY_CODE, 5, "FLY", "GORILLA", "HUMAN");
 
-        launchTest(20000);
+        launchTest(DEFAULT_TIMEOUT);
     }
 
     public static void showControlledVocabularyTerms(RemoteConsole remoteConsole,
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewerTest.java
index acd213fd6d1d5e73026a52f4926fe65d9c65b4e3..40d01fd0d0e3e0c7f8124084fc9676f4ff7482dd 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewerTest.java
@@ -71,7 +71,7 @@ public class GenericDataSetViewerTest extends AbstractGWTTestCase
 
         remoteConsole.prepare(checkDataSet);
 
-        launchTest(50 * SECOND);
+        launchTest(DEFAULT_TIMEOUT);
     }
 
     public final void testShowExperimentDataSetWithParents()