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 cd82ca7785..9da79bec67 100644
--- a/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
@@ -19,7 +19,6 @@ Require-Bundle: com.avaloq.tools.ddk.xtext,
  org.eclipse.emf.ecore,
  org.eclipse.emf.common,
  org.antlr.runtime,
- org.junit,
  com.avaloq.tools.ddk.xtext.builder,
  org.eclipse.xtext.builder,
  org.mockito.mockito-core,
diff --git a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/formatter/AbstractFormatterTest.java b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/formatter/AbstractFormatterTest.java
index 92b4b34e3f..99abbc35ec 100644
--- a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/formatter/AbstractFormatterTest.java
+++ b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/formatter/AbstractFormatterTest.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package com.avaloq.tools.ddk.xtext.formatter;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.io.IOException;
 
 import org.eclipse.emf.ecore.EObject;
@@ -19,7 +21,6 @@
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.xtext.resource.SaveOptions;
 import org.eclipse.xtext.serializer.ISerializer;
-import org.junit.Assert;
 
 import com.avaloq.tools.ddk.xtext.test.AbstractXtextTest;
 
@@ -55,13 +56,13 @@ protected ISerializer getSerializer() {
   protected void assertFormattedPTC(final String expected, final String model) throws IOException {
     EObject m = getModel(model);
     String res = getSerializer().serialize(m, SaveOptions.newBuilder().format().getOptions());
-    Assert.assertEquals("Serialization not equal", expected, res);
+    assertEquals(expected, res, "Serialization not equal");
   }
 
   protected void assertPreserved(final String model) throws IOException {
     EObject m = getModel(model);
     String res = getSerializer().serialize(m, SaveOptions.newBuilder().getOptions());
-    Assert.assertEquals("Preserved node model", model, res);
+    assertEquals(model, res, "Preserved node model");
   }
 
   // test formatting based on the NodeModel
@@ -69,7 +70,7 @@ protected void assertFormattedNM(final String expected, final String model, fina
     ICompositeNode node = NodeModelUtils.getNode(getModel(model)).getRootNode();
     IFormattedRegion r = getXtextTestUtil().get(INodeModelFormatter.class).format(node, offset, length);
     String actual = model.substring(0, r.getOffset()) + r.getFormattedText() + model.substring(r.getLength() + r.getOffset());
-    Assert.assertEquals("Formatting based on the NodeModel", expected, actual);
+    assertEquals(expected, actual, "Formatting based on the NodeModel");
   }
 
 }