diff --git a/pom.xml b/pom.xml
index 326824c6366..bf29ed0ea76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
 		<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 		<sonar.jacoco.reportPath>${project.basedir}/../../target/jacoco.exec</sonar.jacoco.reportPath>
-		<help-docs-eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.8</help-docs-eclipserun-repo>
+		<help-docs-eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.10</help-docs-eclipserun-repo>
 	</properties>
 
 	<licenses>
@@ -39,7 +39,7 @@
 	<repositories>
 		<repository>
 			<id>platform</id>
-			<url>http://download.eclipse.org/eclipse/updates/4.8/</url>
+			<url>http://download.eclipse.org/eclipse/updates/4.10/</url>
 			<layout>p2</layout>
 		</repository>
 		<repository>
@@ -49,7 +49,7 @@
 		</repository>
 		<repository>
 			<id>cdt</id>
-			<url>http://download.eclipse.org/tools/cdt/releases/9.5/</url>
+			<url>http://download.eclipse.org/tools/cdt/releases/9.6/</url>
 			<layout>p2</layout>
 		</repository>
 		<repository>
@@ -209,21 +209,11 @@
 					<resolver>p2</resolver>
 					<pomDependencies>consider</pomDependencies>
 					<environments>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>x86</arch>
-						</environment>
 						<environment>
 							<os>linux</os>
 							<ws>gtk</ws>
 							<arch>x86_64</arch>
 						</environment>
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
-							<arch>x86</arch>
-						</environment>
 						<environment>
 							<os>win32</os>
 							<ws>win32</ws>
diff --git a/tests/org.eclipse.launchbar.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.launchbar.core.tests/META-INF/MANIFEST.MF
index 7cedb534a9e..41b41e5ab51 100644
--- a/tests/org.eclipse.launchbar.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.launchbar.core.tests/META-INF/MANIFEST.MF
@@ -5,5 +5,5 @@ Bundle-SymbolicName: org.eclipse.launchbar.core.tests;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Fragment-Host: org.eclipse.launchbar.core;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: org.junit;bundle-version="4.11.0",
- org.mockito;bundle-version="1.9.5"
+Require-Bundle: org.junit;bundle-version="4.12.0",
+ org.mockito;bundle-version="2.23.0"
diff --git a/tests/org.eclipse.launchbar.core.tests/pom.xml b/tests/org.eclipse.launchbar.core.tests/pom.xml
index 66b01ebcd0c..5f5c5b24e71 100644
--- a/tests/org.eclipse.launchbar.core.tests/pom.xml
+++ b/tests/org.eclipse.launchbar.core.tests/pom.xml
@@ -15,25 +15,4 @@
 	<version>1.0.0-SNAPSHOT</version>
 
 	<packaging>eclipse-test-plugin</packaging>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>target-platform-configuration</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<dependency-resolution>
-						<extraRequirements>
-							<requirement>
-								<type>eclipse-plugin</type>
-								<id>org.hamcrest</id>
-								<versionRange>0.0.0</versionRange>
-							</requirement>
-						</extraRequirements>
-					</dependency-resolution>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 </project>