diff --git a/build.gradle b/build.gradle
index a733a62fcb071dd89a211ce92b37c752f6cb066f..ae8b7222c86459b4015c17d6c0ee1bb67485be89 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,12 +2,7 @@
 
 project.ext {
 	targetRepositories = [
-		// Temporarily using the Eclipse 2021-03 update site to stay compatible with Tycho < 2.1.0. See:
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=564890#c16
-		// https://github.com/eclipse-tycho/tycho/commit/f4ec8f0c6c1e9fdecb096bbcfd4cd6c29cedf0d0
-		// Once we update Tycho (requires Java 11),
-		// this can be switched to Eclipse 2022-03 (same as Rodin 3.8 uses).
-		"https://download.eclipse.org/releases/2021-03/",
+		"https://download.eclipse.org/releases/2022-03/",
 		"https://rodin-b-sharp.sourceforge.net/core-updates/",
 		"https://rodin-b-sharp.sourceforge.net/updates",
 	]
diff --git a/de.prob.core.tests/META-INF/MANIFEST.MF b/de.prob.core.tests/META-INF/MANIFEST.MF
index 615d60b2d764bc2a8e7b91461959dc367d87dc92..9a89c904c20e6965c7a8f5cfb81470c80f75eeb6 100644
--- a/de.prob.core.tests/META-INF/MANIFEST.MF
+++ b/de.prob.core.tests/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: de.prob.core.tests.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.resources,
- org.eclipse.core.runtime;bundle-version="[3.5.0,3.21.0)",
+ org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eventb.core;bundle-version="[3.3.0,4.0.0)",
  org.eventb.core.ast;bundle-version="[3.3.0,4.0.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",