diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 0044b89c2..10d066a86 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -25,11 +25,13 @@ jobs:
         path: ~/.m2/repository
         key: maven-cache-${{ hashFiles('**/pom.xml') }}
 
-    - name: Set up JDK ${{ matrix.jdk }}
+    - name: Set up JDKs
       uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
       with:
         distribution: temurin
-        java-version: ${{ matrix.jdk }}
+        java-version: |
+          11
+          17
 
     - name: Build with Maven
       run: ./mvnw --errors --no-transfer-progress install
@@ -40,6 +42,6 @@ jobs:
     - name: Publish Test Results
       uses: EnricoMi/publish-unit-test-result-action@e780361cd1fc1b1a170624547b3ffda64787d365 # v2.12.0
       # we only want to attach test results one time, not for every matrix combination
-      if: startsWith(matrix.platform, 'ubuntu') && (matrix.jdk == 17)
+      if: startsWith(matrix.platform, 'ubuntu') && (matrix.jdk == 11)
       with:
         files: '**/target/surefire-reports/*.xml'
diff --git a/net.sf.eclipsecs.target/Maven update check.launch b/net.sf.eclipsecs.target/Maven update check.launch
index 5eb7722a1..1a0181458 100644
--- a/net.sf.eclipsecs.target/Maven update check.launch	
+++ b/net.sf.eclipsecs.target/Maven update check.launch	
@@ -18,7 +18,8 @@
         <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
     </listAttribute>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${git_work_tree:/eclipse-cs}"/>
 </launchConfiguration>
diff --git a/net.sf.eclipsecs.target/Maven verify.launch b/net.sf.eclipsecs.target/Maven verify.launch
index ca6e8cff5..57c388461 100644
--- a/net.sf.eclipsecs.target/Maven verify.launch	
+++ b/net.sf.eclipsecs.target/Maven verify.launch	
@@ -18,7 +18,8 @@
         <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
     </listAttribute>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${git_work_tree:/eclipse-cs}"/>
 </launchConfiguration>
diff --git a/net.sf.eclipsecs.target/net.sf.eclipsecs.target.target b/net.sf.eclipsecs.target/net.sf.eclipsecs.target.target
index 0cffedb5b..ce55823b7 100644
--- a/net.sf.eclipsecs.target/net.sf.eclipsecs.target.target
+++ b/net.sf.eclipsecs.target/net.sf.eclipsecs.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Eclipse Checkstyle" sequenceNumber="1695470918">
+<target name="Eclipse Checkstyle" sequenceNumber="1703064646">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.jdt.feature.group" version="3.18.800.v20210611-1600"/>
@@ -16,15 +16,19 @@
       <repository location="https://download.eclipse.org/releases/2021-06/202106161001/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.junit.jupiter.api" version="5.7.1.v20210222-1948"/>
-      <unit id="org.junit.jupiter.engine" version="5.7.1.v20210222-1948"/>
-      <unit id="org.junit.jupiter.params" version="5.7.1.v20210222-1948"/>
-      <unit id="org.junit.platform.commons" version="1.7.1.v20210222-1948"/>
-      <unit id="org.junit.platform.engine" version="1.7.1.v20210222-1948"/>
-      <unit id="org.junit.platform.launcher" version="1.7.1.v20210222-1948"/>
-      <unit id="org.junit.platform.runner" version="1.7.1.v20210222-1948"/>
-      <unit id="org.junit.platform.suite.api" version="1.7.1.v20210222-1948"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+      <unit id="junit-jupiter-api" version="5.9.0"/>
+      <unit id="junit-jupiter-engine" version="5.9.0"/>
+      <unit id="junit-jupiter-migrationsupport" version="5.9.0"/>
+      <unit id="junit-jupiter-params" version="5.9.0"/>
+      <unit id="junit-platform-commons" version="1.9.0"/>
+      <unit id="junit-platform-engine" version="1.9.0"/>
+      <unit id="junit-platform-launcher" version="1.9.0"/>
+      <unit id="junit-platform-runner" version="1.9.0"/>
+      <unit id="junit-platform-suite-api" version="1.9.0"/>
+      <unit id="junit-platform-suite-commons" version="1.9.0"/>
+      <unit id="junit-vintage-engine" version="5.9.0"/>
+      <unit id="org.apiguardian.api" version="1.1.2"/>
+      <repository location="https://download.eclipse.org/releases/2022-09/202209141001/"/>
     </location>
     <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven" label="SnakeYaml">
     <dependencies>
diff --git a/net.sf.eclipsecs.target/net.sf.eclipsecs.target.tpd b/net.sf.eclipsecs.target/net.sf.eclipsecs.target.tpd
index a53047873..b61e86214 100644
--- a/net.sf.eclipsecs.target/net.sf.eclipsecs.target.tpd
+++ b/net.sf.eclipsecs.target/net.sf.eclipsecs.target.tpd
@@ -21,16 +21,23 @@ location "https://download.eclipse.org/releases/2021-06/202106161001/" {
 	org.eclipse.ui.trace
 }
 
-// matching release of JUnit 5 from Eclipse Orbit
-location "https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository" {
-	org.junit.jupiter.api
-	org.junit.jupiter.engine
-	org.junit.jupiter.params
-	org.junit.platform.commons
-	org.junit.platform.engine
-	org.junit.platform.launcher
-	org.junit.platform.runner
-	org.junit.platform.suite.api
+// You must use 2022-06 or newer as Eclipse IDE to run the unit tests.
+// With that version Eclipse started consuming many libraries directly from Maven instead of re-bundling them in Eclipse Orbit.
+// Unfortunately the JUnit runtime support (the connection between test engine and IDE/Tycho) therefore had a breaking change
+// in the JUnit bundle names, therefore old IDEs can't run the tests anymore.
+location "https://download.eclipse.org/releases/2022-09/202209141001/" {
+	junit-jupiter-api
+	junit-jupiter-engine
+	junit-jupiter-migrationsupport
+	junit-jupiter-params
+	junit-platform-commons
+	junit-platform-engine
+	junit-platform-launcher
+	junit-platform-runner
+	junit-platform-suite-api
+	junit-platform-suite-commons
+	junit-vintage-engine
+	org.apiguardian.api
 }
 
 // If the following part has errors and no syntax highlighting, then please use Help>About>Installation>Installed Software>Target Platform DSL>Uninstall.
diff --git a/pom.xml b/pom.xml
index 3db9c3109..8ebf29aed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
         <maven-site-plugin-version>3.12.1</maven-site-plugin-version>
         <maven-surefire-plugin-version>3.2.5</maven-surefire-plugin-version>
         <maven-version>3.6.3</maven-version>
-        <tycho-version>2.7.5</tycho-version>
+        <tycho-version>3.0.5</tycho-version>
         <versions-maven-plugin-version>2.16.2</versions-maven-plugin-version>
 
         <!-- sevntu and patch-filters need to use a compatible/compiled version with checkstyle -->
@@ -255,7 +255,7 @@
                     <dependencies>
                         <!-- generate timestamps from last git change of any file in this module -->
                         <dependency>
-                            <groupId>org.eclipse.tycho.extras</groupId>
+                            <groupId>org.eclipse.tycho</groupId>
                             <artifactId>tycho-buildtimestamp-jgit</artifactId>
                             <version>${tycho-version}</version>
                         </dependency>