diff --git a/news/135.bugfix b/news/135.bugfix
new file mode 100644
index 00000000..82549a57
--- /dev/null
+++ b/news/135.bugfix
@@ -0,0 +1 @@
+Change the Selenium timeout from 30 seconds to 7.  [maurits]
diff --git a/src/plone/app/robotframework/selenium.robot b/src/plone/app/robotframework/selenium.robot
index 4decfb62..fabfb13b 100644
--- a/src/plone/app/robotframework/selenium.robot
+++ b/src/plone/app/robotframework/selenium.robot
@@ -13,7 +13,7 @@ Resource  ${CMFPLONE_SELECTORS}
 *** Variables ***
 
 ${SELENIUM_IMPLICIT_WAIT}  0.5
-${SELENIUM_TIMEOUT}  30
+${SELENIUM_TIMEOUT}  7
 ${SELENIUM_RUN_ON_FAILURE}  Capture Page Screenshot
 ${SELENIUM2LIBRARY_RUN_ON_FAILURE}  No operation