diff --git a/org.eclipse.wb.tests/pom.xml b/org.eclipse.wb.tests/pom.xml
index aaf37b812..03f4d06bf 100644
--- a/org.eclipse.wb.tests/pom.xml
+++ b/org.eclipse.wb.tests/pom.xml
@@ -22,7 +22,7 @@
   <packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<uitest.vmparams>-Dwbp.burningwave.enabled=false</uitest.vmparams>
+		<uitest.vmparams>-Dwbp.burningwave.enabled=false -Dorg.eclipse.swtbot.search.timeout=30000</uitest.vmparams>
 	</properties>
 
 	<profiles>
diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/tests/DesignerTestCase.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/tests/DesignerTestCase.java
index 538db4da1..27c144e7d 100644
--- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/tests/DesignerTestCase.java
+++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/tests/DesignerTestCase.java
@@ -506,7 +506,7 @@ public boolean test() throws Exception {
 				public String getFailureMessage() {
 					return "\"Open type\" dialog took too long to find types.";
 				}
-			}, 30000);
+			});
 		}
 		shell.button(buttonName).click();
 	}