From 38918bcad5d7845862158b3fabf96121a911ee21 Mon Sep 17 00:00:00 2001
From: U004458 <markangelo.domingo@avaloq.com>
Date: Wed, 15 Oct 2025 19:25:18 +0800
Subject: [PATCH] feat: use junit5 platform in our tests

use junit-vintage-engine to support junit4 tests
---
 .../CheckCoreTestSuite.launch                               | 5 ++++-
 com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF   | 5 ++++-
 .../CheckRuntimeTestSuite.launch                            | 5 ++++-
 .../META-INF/MANIFEST.MF                                    | 5 ++++-
 .../CheckExecutionEnvironmentTestSuite.launch               | 5 ++++-
 .../CheckLibraryChecksTestSuite.launch                      | 5 ++++-
 .../META-INF/MANIFEST.MF                                    | 5 ++++-
 com.avaloq.tools.ddk.check.ui.test/CheckUiTestSuite.launch  | 5 ++++-
 com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF     | 5 ++++-
 .../CheckCfgTestSuite.launch                                | 5 ++++-
 .../META-INF/MANIFEST.MF                                    | 5 ++++-
 .../CheckCfgUiTestSuite.launch                              | 5 ++++-
 com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF  | 5 ++++-
 com.avaloq.tools.ddk.test.ui.test/AllTests.launch           | 5 ++++-
 com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF      | 5 ++++-
 com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF   | 5 ++++-
 .../TypeSystemTestSuite.launch                              | 5 ++++-
 .../ExportTestSuite.launch                                  | 6 ++++--
 com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF | 5 ++++-
 .../FormatTestSuite.launch                                  | 5 ++++-
 com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF | 5 ++++-
 .../GeneratorTestSuite.launch                               | 5 ++++-
 .../META-INF/MANIFEST.MF                                    | 5 ++++-
 com.avaloq.tools.ddk.xtext.test/AllTests DDK.launch         | 5 ++++-
 com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF        | 5 ++++-
 com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF     | 5 ++++-
 com.avaloq.tools.ddk.xtext.ui.test/XtextUiTestSuite.launch  | 5 ++++-
 ddk-target/ddk.target                                       | 5 +++++
 28 files changed, 113 insertions(+), 28 deletions(-)

diff --git a/com.avaloq.tools.ddk.check.core.test/CheckCoreTestSuite.launch b/com.avaloq.tools.ddk.check.core.test/CheckCoreTestSuite.launch
index 2328824eea..e303ee52be 100644
--- a/com.avaloq.tools.ddk.check.core.test/CheckCoreTestSuite.launch
+++ b/com.avaloq.tools.ddk.check.core.test/CheckCoreTestSuite.launch
@@ -13,6 +13,7 @@
 <booleanAttribute key="default" value="true"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/test/core/CheckCoreTestSuite.java"/>
 </listAttribute>
@@ -22,7 +23,9 @@
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit5"/>
+<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"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.avaloq.tools.ddk.check.test.core.CheckCoreTestSuite"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
diff --git a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
index 7f9f8615f0..7835d8f28c 100644
--- a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
@@ -28,7 +28,10 @@ Require-Bundle: com.avaloq.tools.ddk.check.core,
  org.eclipse.xtext.xbase.lib,
  org.apache.logging.log4j,
  org.apache.commons.lang,
- org.eclipse.xtext.xbase.testing
+ org.eclipse.xtext.xbase.testing,
+ junit-jupiter-api,
+ junit-jupiter-engine,
+ junit-vintage-engine
 Export-Package: com.avaloq.tools.ddk.check.core.test,
  com.avaloq.tools.ddk.check.core.test.util,
  com.avaloq.tools.ddk.check.test.core,
diff --git a/com.avaloq.tools.ddk.check.runtime.core.test/CheckRuntimeTestSuite.launch b/com.avaloq.tools.ddk.check.runtime.core.test/CheckRuntimeTestSuite.launch
index c1f082532c..8632b71fc0 100644
--- a/com.avaloq.tools.ddk.check.runtime.core.test/CheckRuntimeTestSuite.launch
+++ b/com.avaloq.tools.ddk.check.runtime.core.test/CheckRuntimeTestSuite.launch
@@ -13,6 +13,7 @@
 <booleanAttribute key="default" value="true"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/com.avaloq.tools.ddk.check.runtime.core.test/src/com/avaloq/tools/ddk/check/runtime/test/core/CheckRuntimeTestSuite.java"/>
 </listAttribute>
@@ -22,7 +23,9 @@
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit5"/>
+<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"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.avaloq.tools.ddk.check.runtime.test.core.CheckRuntimeTestSuite"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
diff --git a/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF
index db70060261..6d34bb28ed 100644
--- a/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF
@@ -11,7 +11,10 @@ Require-Bundle: org.eclipse.ui,
  com.avaloq.tools.ddk.test.ui, 
  com.avaloq.tools.ddk.check.runtime.core,
  org.junit,
- com.google.guava
+ com.google.guava,
+ junit-jupiter-api,
+ junit-jupiter-engine,
+ junit-vintage-engine
 Export-Package: com.avaloq.tools.ddk.check.runtime.test.core
 Import-Package: org.mockito,
  org.mockito.stubbing
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/CheckExecutionEnvironmentTestSuite.launch b/com.avaloq.tools.ddk.check.test.runtime.tests/CheckExecutionEnvironmentTestSuite.launch
index 155ab47de0..468435e31a 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/CheckExecutionEnvironmentTestSuite.launch
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/CheckExecutionEnvironmentTestSuite.launch
@@ -13,6 +13,7 @@
 <booleanAttribute key="default" value="true"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/test/runtime/tests/CheckExecutionEnvironmentTestSuite.java"/>
 </listAttribute>
@@ -22,7 +23,9 @@
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit5"/>
+<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"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.avaloq.tools.ddk.check.test.runtime.tests.CheckExecutionEnvironmentTestSuite"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/CheckLibraryChecksTestSuite.launch b/com.avaloq.tools.ddk.check.test.runtime.tests/CheckLibraryChecksTestSuite.launch
index 2773f800f7..76051776ce 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/CheckLibraryChecksTestSuite.launch
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/CheckLibraryChecksTestSuite.launch
@@ -13,6 +13,7 @@
 <booleanAttribute key="default" value="true"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/test/runtime/tests/CheckLibraryChecksTestSuite.java"/>
 </listAttribute>
@@ -22,7 +23,9 @@
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit5"/>
+<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"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.avaloq.tools.ddk.check.test.runtime.tests.CheckLibraryChecksTestSuite"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
index 7eba52d5d8..212830dfd4 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
@@ -17,7 +17,10 @@ Require-Bundle: com.avaloq.tools.ddk.check.runtime.core,
  org.junit,
  org.eclipse.ui.workbench;resolution:=optional,
  org.eclipse.xtend.lib,
- org.eclipse.xtext.xbase.lib
+ org.eclipse.xtext.xbase.lib,
+ junit-jupiter-api,
+ junit-jupiter-engine,
+ junit-vintage-engine
 Import-Package: org.junit.runner;version="4.5.0",
  org.junit.runner.manipulation;version="4.5.0",
  org.junit.runner.notification;version="4.5.0",
diff --git a/com.avaloq.tools.ddk.check.ui.test/CheckUiTestSuite.launch b/com.avaloq.tools.ddk.check.ui.test/CheckUiTestSuite.launch
index 8a8daff4bc..ce35fe0ac2 100644
--- a/com.avaloq.tools.ddk.check.ui.test/CheckUiTestSuite.launch
+++ b/com.avaloq.tools.ddk.check.ui.test/CheckUiTestSuite.launch
@@ -13,6 +13,7 @@
 <booleanAttribute key="default" value="true"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/CheckUiTestSuite.java"/>
 </listAttribute>
@@ -22,7 +23,9 @@
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit5"/>
+<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"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.avaloq.tools.ddk.check.ui.test.CheckUiTestSuite"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
diff --git a/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
index c60f5d4225..b113e52111 100644
--- a/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
@@ -20,7 +20,10 @@ Require-Bundle: org.junit,
  org.eclipse.xtext.xbase.lib,
  org.eclipse.core.runtime,
  org.eclipse.ui.workbench;resolution:=optional,
- org.objectweb.asm;resolution:=optional
+ org.objectweb.asm;resolution:=optional,
+ junit-jupiter-api,
+ junit-jupiter-engine,
+ junit-vintage-engine
 Export-Package: com.avaloq.tools.ddk.check.ui.test,
  com.avaloq.tools.ddk.check.ui.test.util,
  com.avaloq.tools.ddk.check
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/CheckCfgTestSuite.launch b/com.avaloq.tools.ddk.checkcfg.core.test/CheckCfgTestSuite.launch
index b58b0e6acb..90c41a326f 100644
--- a/com.avaloq.tools.ddk.checkcfg.core.test/CheckCfgTestSuite.launch
+++ b/com.avaloq.tools.ddk.checkcfg.core.test/CheckCfgTestSuite.launch
@@ -13,6 +13,7 @@
 <booleanAttribute key="default" value="true"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/test/CheckCfgTestSuite.java"/>
 </listAttribute>
@@ -22,7 +23,9 @@
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit5"/>
+<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"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.avaloq.tools.ddk.checkcfg.test.CheckCfgTestSuite"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
index ddeea98691..a098efd3f6 100644
--- a/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
@@ -21,7 +21,10 @@ Require-Bundle: com.avaloq.tools.ddk.test.core,
  org.junit,
  org.eclipse.xtext.xbase.lib,
  org.eclipse.ui.workbench;resolution:=optional,
- org.objectweb.asm;resolution:=optional
+ org.objectweb.asm;resolution:=optional,
+ junit-jupiter-api,
+ junit-jupiter-engine,
+ junit-vintage-engine
 Import-Package: org.hamcrest.core,
  org.junit.runner;version="4.5.0",
  org.junit.runner.manipulation;version="4.5.0",
diff --git a/com.avaloq.tools.ddk.checkcfg.ui.test/CheckCfgUiTestSuite.launch b/com.avaloq.tools.ddk.checkcfg.ui.test/CheckCfgUiTestSuite.launch
index 509eda7de0..2252b017bb 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui.test/CheckCfgUiTestSuite.launch
+++ b/com.avaloq.tools.ddk.checkcfg.ui.test/CheckCfgUiTestSuite.launch
@@ -13,6 +13,7 @@
 <booleanAttribute key="default" value="true"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/com.avaloq.tools.ddk.checkcfg.ui.test/src/com/avaloq/tools/ddk/checkcfg/ui/test/CheckCfgUiTestSuite.java"/>
 </listAttribute>
@@ -22,7 +23,9 @@
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit5"/>
+<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"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.avaloq.tools.ddk.checkcfg.ui.test.CheckCfgUiTestSuite"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
diff --git a/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF
index b00d86c3ac..0a2e360228 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF
@@ -6,5 +6,8 @@ Bundle-Version: 16.2.0.qualifier
 Bundle-Vendor: Avaloq Group AG
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Export-Package: com.avaloq.tools.ddk.checkcfg.ui.test
-Require-Bundle: org.junit
+Require-Bundle: org.junit,
+ junit-jupiter-api,
+ junit-jupiter-engine,
+ junit-vintage-engine
 Automatic-Module-Name: com.avaloq.tools.ddk.checkcfg.ui.test
diff --git a/com.avaloq.tools.ddk.test.ui.test/AllTests.launch b/com.avaloq.tools.ddk.test.ui.test/AllTests.launch
index 56067c7ec7..ee04f30bfe 100644
--- a/com.avaloq.tools.ddk.test.ui.test/AllTests.launch
+++ b/com.avaloq.tools.ddk.test.ui.test/AllTests.launch
@@ -13,6 +13,7 @@
 <booleanAttribute key="default" value="true"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/com.avaloq.tools.ddk.test.ui.test/src/com/avaloq/tools/ddk/test/ui/test/AllTests.java"/>
 </listAttribute>
@@ -22,7 +23,9 @@
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit5"/>
+<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"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.avaloq.tools.ddk.test.ui.test.AllTests"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
diff --git a/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF
index dd61b9dc3d..6a46810dad 100644
--- a/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF
@@ -10,7 +10,10 @@ Require-Bundle: org.junit,
  org.eclipse.swtbot.eclipse.finder,
  org.eclipse.swt,
  com.avaloq.tools.ddk.test.core,
- com.avaloq.tools.ddk.test.ui
+ com.avaloq.tools.ddk.test.ui,
+ junit-jupiter-api,
+ junit-jupiter-engine,
+ junit-vintage-engine
 Import-Package: org.eclipse.core.runtime,
  org.eclipse.core.runtime.jobs
 Automatic-Module-Name: com.avaloq.tools.ddk.test.ui.test
diff --git a/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF
index 9edb9fdd12..8d7db395f2 100644
--- a/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF
@@ -9,6 +9,9 @@ Bundle-ActivationPolicy: lazy
 Fragment-Host: com.avaloq.tools.ddk.typesystem
 Require-Bundle: com.google.inject,
  com.google.guava,
- org.junit
+ org.junit,
+ junit-jupiter-api,
+ junit-jupiter-engine,
+ junit-vintage-engine
 Export-Package: com.avaloq.tools.ddk.typesystem.test
 Automatic-Module-Name: com.avaloq.tools.ddk.typesystem.test
diff --git a/com.avaloq.tools.ddk.typesystem.test/TypeSystemTestSuite.launch b/com.avaloq.tools.ddk.typesystem.test/TypeSystemTestSuite.launch
index 12b7406b6e..4cb5fbcdc8 100644
--- a/com.avaloq.tools.ddk.typesystem.test/TypeSystemTestSuite.launch
+++ b/com.avaloq.tools.ddk.typesystem.test/TypeSystemTestSuite.launch
@@ -13,6 +13,7 @@
 <booleanAttribute key="default" value="true"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/com.avaloq.tools.ddk.typesystem.test/src/com/avaloq/tools/ddk/typesystem/test/TypeSystemTestSuite.java"/>
 </listAttribute>
@@ -22,7 +23,9 @@
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit5"/>
+<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"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.avaloq.tools.ddk.typesystem.test.TypeSystemTestSuite"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
diff --git a/com.avaloq.tools.ddk.xtext.export.test/ExportTestSuite.launch b/com.avaloq.tools.ddk.xtext.export.test/ExportTestSuite.launch
index 701a7a1cd1..2c773c4a52 100644
--- a/com.avaloq.tools.ddk.xtext.export.test/ExportTestSuite.launch
+++ b/com.avaloq.tools.ddk.xtext.export.test/ExportTestSuite.launch
@@ -13,7 +13,7 @@
 <booleanAttribute key="default" value="true"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
 <listEntry value="/com.avaloq.tools.ddk.xtext.export.test/src/com/avaloq/tools/ddk/xtext/test/export/ExportTestSuite.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
@@ -22,7 +22,9 @@
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit5"/>
+<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"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.avaloq.tools.ddk.xtext.test.export.ExportTestSuite"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
diff --git a/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF
index a6cd34d04b..680bae76a6 100644
--- a/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF
@@ -11,6 +11,9 @@ Require-Bundle: com.avaloq.tools.ddk.xtext.export,
  com.google.inject,
  com.avaloq.tools.ddk.xtext.test.core,
  org.junit,
- com.avaloq.tools.ddk.xtext
+ com.avaloq.tools.ddk.xtext,
+ junit-jupiter-api,
+ junit-jupiter-engine,
+ junit-vintage-engine
 Export-Package: com.avaloq.tools.ddk.xtext.test.export
 Automatic-Module-Name: com.avaloq.tools.ddk.xtext.export.test
diff --git a/com.avaloq.tools.ddk.xtext.format.test/FormatTestSuite.launch b/com.avaloq.tools.ddk.xtext.format.test/FormatTestSuite.launch
index bfcf09a164..aa6290a31b 100644
--- a/com.avaloq.tools.ddk.xtext.format.test/FormatTestSuite.launch
+++ b/com.avaloq.tools.ddk.xtext.format.test/FormatTestSuite.launch
@@ -13,6 +13,7 @@
 <booleanAttribute key="default" value="true"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/com.avaloq.tools.ddk.xtext.format.test/src/com/avaloq/tools/ddk/xtext/test/format/FormatTestSuite.java"/>
 </listAttribute>
@@ -22,7 +23,9 @@
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit5"/>
+<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"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.avaloq.tools.ddk.xtext.test.format.FormatTestSuite"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
diff --git a/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF
index e42ef04c91..2b75995784 100644
--- a/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF
@@ -15,7 +15,10 @@ Require-Bundle: com.avaloq.tools.ddk.xtext.format,
  org.eclipse.xtext.xbase.lib,
  org.eclipse.xtext.xbase.testing,
  org.objectweb.asm;resolution:=optional,
- org.eclipse.xtext.testing
+ org.eclipse.xtext.testing,
+ junit-jupiter-api,
+ junit-jupiter-engine,
+ junit-vintage-engine
 Export-Package: com.avaloq.tools.ddk.xtext.test.format;x-internal=true,
  com.avaloq.tools.ddk.xtext.format;x-internal=true
 Automatic-Module-Name: com.avaloq.tools.ddk.xtext.format.test
diff --git a/com.avaloq.tools.ddk.xtext.generator.test/GeneratorTestSuite.launch b/com.avaloq.tools.ddk.xtext.generator.test/GeneratorTestSuite.launch
index f9d99a2b75..0748c657a4 100644
--- a/com.avaloq.tools.ddk.xtext.generator.test/GeneratorTestSuite.launch
+++ b/com.avaloq.tools.ddk.xtext.generator.test/GeneratorTestSuite.launch
@@ -13,6 +13,7 @@
 <booleanAttribute key="default" value="true"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/com.avaloq.tools.ddk.xtext.generator.test/src/com/avaloq/tools/ddk/xtext/generator/test/generator/GeneratorTestSuite.java"/>
 </listAttribute>
@@ -22,7 +23,9 @@
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit5"/>
+<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"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.avaloq.tools.ddk.xtext.generator.test.generator.GeneratorTestSuite"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
diff --git a/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF
index 772aa65ef4..33c40c74d6 100644
--- a/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF
@@ -16,7 +16,10 @@ Require-Bundle: com.avaloq.tools.ddk.test.core,
  org.junit,
  org.mockito,
  com.avaloq.tools.ddk.xtext.ui,
- org.eclipse.xtext.xtext.generator
+ org.eclipse.xtext.xtext.generator,
+ junit-jupiter-api,
+ junit-jupiter-engine,
+ junit-vintage-engine
 Export-Package: com.avaloq.tools.ddk.xtext.generator.test.generator
 Import-Package: org.eclipse.xtext.ui.resource
 Automatic-Module-Name: com.avaloq.tools.ddk.xtext.generator.test
diff --git a/com.avaloq.tools.ddk.xtext.test/AllTests DDK.launch b/com.avaloq.tools.ddk.xtext.test/AllTests DDK.launch
index 8caf78ec12..c543ce3e8e 100644
--- a/com.avaloq.tools.ddk.xtext.test/AllTests DDK.launch	
+++ b/com.avaloq.tools.ddk.xtext.test/AllTests DDK.launch	
@@ -13,6 +13,7 @@
 <booleanAttribute key="default" value="true"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/AllTests.java"/>
 </listAttribute>
@@ -25,7 +26,9 @@
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit5"/>
+<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"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.avaloq.tools.ddk.xtext.AllTests"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
diff --git a/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
index 7b181c4202..49bb525df2 100644
--- a/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
@@ -26,7 +26,10 @@ Require-Bundle: com.avaloq.tools.ddk.xtext,
  com.avaloq.tools.ddk.test.core,
  org.eclipse.pde.core,
  org.eclipse.xtext.xbase.lib,
- org.eclipse.emf.ecore
+ org.eclipse.emf.ecore,
+ junit-jupiter-api,
+ junit-jupiter-engine,
+ junit-vintage-engine
 Import-Package: org.slf4j, org.apache.log4j,
  com.avaloq.tools.ddk.check.runtime.test.core,
  com.avaloq.tools.ddk.check.test.core,
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
index b9aab250b4..80dfe17b2e 100644
--- a/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
@@ -13,6 +13,9 @@ Require-Bundle: org.eclipse.xtext.ui,
  com.avaloq.tools.ddk.xtext.ui,
  com.avaloq.tools.ddk.test.core,
  org.eclipse.ui.ide,
- com.avaloq.tools.ddk.xtext.test.core
+ com.avaloq.tools.ddk.xtext.test.core,
+ junit-jupiter-api,
+ junit-jupiter-engine,
+ junit-vintage-engine
 Export-Package: com.avaloq.tools.ddk.xtext.ui.test
 Automatic-Module-Name: com.avaloq.tools.ddk.xtext.ui.test
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/XtextUiTestSuite.launch b/com.avaloq.tools.ddk.xtext.ui.test/XtextUiTestSuite.launch
index 0d284814a2..937ae68943 100644
--- a/com.avaloq.tools.ddk.xtext.ui.test/XtextUiTestSuite.launch
+++ b/com.avaloq.tools.ddk.xtext.ui.test/XtextUiTestSuite.launch
@@ -13,6 +13,7 @@
 <booleanAttribute key="default" value="true"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/test/XtextUiTestSuite.java"/>
 </listAttribute>
@@ -22,7 +23,9 @@
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit5"/>
+<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"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.avaloq.tools.ddk.xtext.ui.test.XtextUiTestSuite"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
diff --git a/ddk-target/ddk.target b/ddk-target/ddk.target
index ed6ac298aa..79bb22225b 100644
--- a/ddk-target/ddk.target
+++ b/ddk-target/ddk.target
@@ -53,5 +53,10 @@
     <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
     <unit id="org.junit" version="4.13.2.v20211018-1956"/>
   </location>
+  <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+    <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2025-09"/>
+    <unit id="junit-jupiter-api" version="5.13.4"/>
+    <unit id="junit-vintage-engine" version="5.13.4"/>
+  </location>
 </locations>
 </target>