diff --git a/org.idempiere.fitnesse.server/.classpath b/org.idempiere.fitnesse.server/.classpath
index e096e1d2ed..0403b114dc 100644
--- a/org.idempiere.fitnesse.server/.classpath
+++ b/org.idempiere.fitnesse.server/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="lib" path="lib/selenium-server-standalone-2.35.0.jar" sourcepath="lib/selenium-server-2.35.0-srcs.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/phantomjsdriver-1.0.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/selenium-server-standalone-2.31.0.jar" sourcepath="lib/selenium-server-2.31.0-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/fitlibraryweb-2.0.jar" sourcepath="lib/fitlibraryweb-2.0-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.16.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/fitnesse.jar"/>
diff --git a/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF b/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
index f18501cbe8..a64e0a4432 100644
--- a/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
+++ b/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Bundle-ClassPath: .,
  lib/fitnesse.jar,
  lib/log4j-1.2.16.jar,
  lib/fitlibraryweb-2.0.jar,
- lib/selenium-server-standalone-2.31.0.jar,
+ lib/selenium-server-standalone-2.35.0.jar,
  lib/phantomjsdriver-1.0.3.jar
 Web-ContextPath: fitnesse
 Export-Package: fit,
@@ -290,7 +290,6 @@ Export-Package: fit,
  org.openqa.selenium.interactions.internal,
  org.openqa.selenium.interactions.touch,
  org.openqa.selenium.internal,
- org.openqa.selenium.internal.selenesedriver,
  org.openqa.selenium.internal.seleniumemulation,
  org.openqa.selenium.io,
  org.openqa.selenium.iphone,
@@ -323,7 +322,6 @@ Export-Package: fit,
  org.openqa.selenium.server.cli,
  org.openqa.selenium.server.commands,
  org.openqa.selenium.server.htmlrunner,
- org.openqa.selenium.server.log,
  org.openqa.selenium.support,
  org.openqa.selenium.support.events,
  org.openqa.selenium.support.events.internal,
diff --git a/org.idempiere.fitnesse.server/build.properties b/org.idempiere.fitnesse.server/build.properties
index 2362a6b83f..2aa4dbabef 100644
--- a/org.idempiere.fitnesse.server/build.properties
+++ b/org.idempiere.fitnesse.server/build.properties
@@ -7,5 +7,5 @@ bin.includes = META-INF/,\
                lib/log4j-1.2.16.jar,\
                lib/fitlibraryweb-2.0.jar,\
                WEB-INF/,\
-               lib/selenium-server-standalone-2.31.0.jar,\
-               lib/phantomjsdriver-1.0.3.jar
+               lib/phantomjsdriver-1.0.3.jar,\
+               lib/selenium-server-standalone-2.35.0.jar
diff --git a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
index 4f9713f2df..71fc8d6085 100644
--- a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
+++ b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
@@ -290,7 +290,6 @@ Import-Package: fit,
  org.openqa.selenium.interactions.internal,
  org.openqa.selenium.interactions.touch,
  org.openqa.selenium.internal,
- org.openqa.selenium.internal.selenesedriver,
  org.openqa.selenium.internal.seleniumemulation,
  org.openqa.selenium.io,
  org.openqa.selenium.iphone,
@@ -323,7 +322,6 @@ Import-Package: fit,
  org.openqa.selenium.server.cli,
  org.openqa.selenium.server.commands,
  org.openqa.selenium.server.htmlrunner,
- org.openqa.selenium.server.log,
  org.openqa.selenium.support,
  org.openqa.selenium.support.events,
  org.openqa.selenium.support.events.internal,