diff --git a/pom.xml b/pom.xml
index 98d0e56f5..219a2c553 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,8 +80,8 @@
 
         <!-- test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/src/test/java/net/openhft/chronicle/values/AlignTest.java b/src/test/java/net/openhft/chronicle/values/AlignTest.java
index d6dceb460..29a21e4a0 100644
--- a/src/test/java/net/openhft/chronicle/values/AlignTest.java
+++ b/src/test/java/net/openhft/chronicle/values/AlignTest.java
@@ -5,7 +5,7 @@
 
 import net.openhft.chronicle.bytes.Byteable;
 import net.openhft.chronicle.bytes.BytesStore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static net.openhft.chronicle.values.Values.newNativeReference;
 
diff --git a/src/test/java/net/openhft/chronicle/values/ComplexValueTest.java b/src/test/java/net/openhft/chronicle/values/ComplexValueTest.java
index 3b93d1baf..bde9ada30 100644
--- a/src/test/java/net/openhft/chronicle/values/ComplexValueTest.java
+++ b/src/test/java/net/openhft/chronicle/values/ComplexValueTest.java
@@ -5,7 +5,7 @@
 
 import net.openhft.chronicle.bytes.Byteable;
 import net.openhft.chronicle.bytes.BytesStore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.function.Function;
@@ -13,7 +13,7 @@
 
 import static net.openhft.chronicle.values.Values.newHeapInstance;
 import static net.openhft.chronicle.values.Values.newNativeReference;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ComplexValueTest extends ValuesTestCommon {
 
@@ -44,13 +44,13 @@ public void heapAndNativeBehaviourMatch() {
             Map<String, FieldModel> byName = model.fields()
                     .collect(Collectors.toMap(FieldModel::name, Function.identity()));
 
-            assertTrue("label field present", byName.containsKey("label"));
-            assertTrue("mirrorEnabled field present", byName.containsKey("mirrorEnabled"));
-            assertTrue("label offset should be resolved",
-                    model.fieldBitOffset(byName.get("label")) >= 0);
-            assertTrue("history should allocate extent per element",
-                    model.fieldBitExtent(byName.get("history"))
-                            >= 3 * Long.SIZE);
+            assertTrue(byName.containsKey("label"), "label field present");
+            assertTrue(byName.containsKey("mirrorEnabled"), "mirrorEnabled field present");
+            assertTrue(model.fieldBitOffset(byName.get("label")) >= 0,
+                    "label offset should be resolved");
+            assertTrue(model.fieldBitExtent(byName.get("history"))
+                            >= 3 * Long.SIZE,
+                    "history should allocate extent per element");
 
             // behaviour assertions
             assertEquals(ComplexValue.Status.ACTIVE, nativeValue.getStatus());
diff --git a/src/test/java/net/openhft/chronicle/values/CoreValuesTest.java b/src/test/java/net/openhft/chronicle/values/CoreValuesTest.java
index 722f1c7b1..82d2568b1 100644
--- a/src/test/java/net/openhft/chronicle/values/CoreValuesTest.java
+++ b/src/test/java/net/openhft/chronicle/values/CoreValuesTest.java
@@ -7,10 +7,10 @@
 import net.openhft.chronicle.bytes.BytesStore;
 import net.openhft.chronicle.core.values.*;
 import org.jetbrains.annotations.NotNull;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static net.openhft.chronicle.bytes.BytesStore.nativeStoreWithFixedCapacity;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class CoreValuesTest extends ValuesTestCommon {
diff --git a/src/test/java/net/openhft/chronicle/values/FirstPrimitiveFieldTest.java b/src/test/java/net/openhft/chronicle/values/FirstPrimitiveFieldTest.java
index f4344d9f4..8539fc580 100644
--- a/src/test/java/net/openhft/chronicle/values/FirstPrimitiveFieldTest.java
+++ b/src/test/java/net/openhft/chronicle/values/FirstPrimitiveFieldTest.java
@@ -5,9 +5,9 @@
 
 import net.openhft.chronicle.core.values.IntValue;
 import net.openhft.chronicle.core.values.LongValue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Interface holding a five element array of {@code long} values for field type tests.
diff --git a/src/test/java/net/openhft/chronicle/values/UnderscoreFieldNameTest.java b/src/test/java/net/openhft/chronicle/values/UnderscoreFieldNameTest.java
index 822a304f9..5fc0d5bf1 100644
--- a/src/test/java/net/openhft/chronicle/values/UnderscoreFieldNameTest.java
+++ b/src/test/java/net/openhft/chronicle/values/UnderscoreFieldNameTest.java
@@ -3,7 +3,7 @@
  */
 package net.openhft.chronicle.values;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class UnderscoreFieldNameTest extends ValuesTestCommon {
 
diff --git a/src/test/java/net/openhft/chronicle/values/ValueGeneratorTest.java b/src/test/java/net/openhft/chronicle/values/ValueGeneratorTest.java
index 0e753821a..fbbe05d3a 100644
--- a/src/test/java/net/openhft/chronicle/values/ValueGeneratorTest.java
+++ b/src/test/java/net/openhft/chronicle/values/ValueGeneratorTest.java
@@ -7,7 +7,7 @@
 import net.openhft.chronicle.bytes.Bytes;
 import net.openhft.chronicle.bytes.BytesStore;
 import net.openhft.chronicle.core.values.LongValue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.InvocationTargetException;
 import java.nio.ByteBuffer;
@@ -17,8 +17,8 @@
 import static net.openhft.chronicle.values.Generators.generateNativeClass;
 import static net.openhft.chronicle.values.Values.newHeapInstance;
 import static net.openhft.chronicle.values.Values.newNativeReference;
-import static org.junit.Assert.*;
 import static net.openhft.compiler.CompilerUtils.CACHED_COMPILER;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Tests code generation and serialisation routines.
diff --git a/src/test/java/net/openhft/chronicle/values/ValueInterfaceWithEnumTest.java b/src/test/java/net/openhft/chronicle/values/ValueInterfaceWithEnumTest.java
index cfe84648a..445935fca 100644
--- a/src/test/java/net/openhft/chronicle/values/ValueInterfaceWithEnumTest.java
+++ b/src/test/java/net/openhft/chronicle/values/ValueInterfaceWithEnumTest.java
@@ -5,10 +5,10 @@
 
 import net.openhft.chronicle.bytes.Byteable;
 import net.openhft.chronicle.bytes.BytesStore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static net.openhft.chronicle.values.ValueInterfaceWithEnumTest.SimpleValueInterface.SVIEnum.SIX;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author ges
diff --git a/src/test/java/net/openhft/chronicle/values/ValuesTestCommon.java b/src/test/java/net/openhft/chronicle/values/ValuesTestCommon.java
index 599acbc3f..7ae9e72ed 100644
--- a/src/test/java/net/openhft/chronicle/values/ValuesTestCommon.java
+++ b/src/test/java/net/openhft/chronicle/values/ValuesTestCommon.java
@@ -11,8 +11,8 @@
 import net.openhft.chronicle.core.threads.CleaningThread;
 import net.openhft.chronicle.core.threads.ThreadDump;
 import net.openhft.chronicle.core.time.SystemTimeProvider;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -32,7 +32,7 @@ public class ValuesTestCommon {
     private Map<ExceptionKey, Integer> exceptions;
     private final Map<Predicate<ExceptionKey>, String> expectedExceptions = new LinkedHashMap<>();
 
-    @Before
+    @BeforeEach
     public void enableReferenceTracing() {
         AbstractReferenceCounted.enableReferenceTracing();
     }
@@ -45,7 +45,7 @@ private void assertReferencesReleased() {
         AbstractReferenceCounted.assertReferencesReleased();
     }
 
-    @Before
+    @BeforeEach
     public void threadDump() {
         threadDump = new ThreadDump();
     }
@@ -54,7 +54,7 @@ private void checkThreadDump() {
         threadDump.assertNoNewThreads();
     }
 
-    @Before
+    @BeforeEach
     public void recordExceptions() {
         exceptions = Jvm.recordExceptions();
     }
@@ -98,7 +98,7 @@ private void checkExceptions() {
         }
     }
 
-    @After
+    @AfterEach
     public void afterChecks() {
         SystemTimeProvider.CLOCK = SystemTimeProvider.INSTANCE;
         CleaningThread.performCleanup(Thread.currentThread());
diff --git a/src/test/java/net/openhft/chronicle/values/VolatileTest.java b/src/test/java/net/openhft/chronicle/values/VolatileTest.java
index 6640fee5b..fc0615a03 100644
--- a/src/test/java/net/openhft/chronicle/values/VolatileTest.java
+++ b/src/test/java/net/openhft/chronicle/values/VolatileTest.java
@@ -5,14 +5,14 @@
 
 import net.openhft.chronicle.bytes.Byteable;
 import net.openhft.chronicle.bytes.BytesStore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.ByteBuffer;
 
 import static net.openhft.chronicle.values.Values.newHeapInstance;
 import static net.openhft.chronicle.values.Values.newNativeReference;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 /*
  * Created by daniel on 11/06/2014.
@@ -53,7 +53,7 @@ public void testGenerateJavaCode() throws ClassNotFoundException, IllegalAccessE
             assertEquals(3, jbi.getVolatileIntAt(3));
         } catch (AssertionError e) {
             e.printStackTrace();
-            assertFalse("Throws an IllegalArgumentException", true);
+            assertFalse(true, "Throws an IllegalArgumentException");
         }
 
         //Test the native interface
@@ -75,7 +75,7 @@ public void testGenerateJavaCode() throws ClassNotFoundException, IllegalAccessE
             assertEquals(3, jbi.getVolatileIntAt(3));
         } catch (AssertionError e) {
             e.printStackTrace();
-            assertFalse("Throws an IllegalArgumentException", true);
+            assertFalse(true, "Throws an IllegalArgumentException");
         }
     }
 
diff --git a/src/test/java/net/openhft/chronicle/values/issue10/ChronicleValueTypeTest.java b/src/test/java/net/openhft/chronicle/values/issue10/ChronicleValueTypeTest.java
index 1e84b47f6..4b0392111 100644
--- a/src/test/java/net/openhft/chronicle/values/issue10/ChronicleValueTypeTest.java
+++ b/src/test/java/net/openhft/chronicle/values/issue10/ChronicleValueTypeTest.java
@@ -5,7 +5,7 @@
 
 import net.openhft.chronicle.values.Values;
 import net.openhft.chronicle.values.ValuesTestCommon;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ChronicleValueTypeTest extends ValuesTestCommon {
 
diff --git a/src/test/java/net/openhft/chronicle/values/issue9/HeapVsNativeTest.java b/src/test/java/net/openhft/chronicle/values/issue9/HeapVsNativeTest.java
index 4d2033759..69358da3a 100644
--- a/src/test/java/net/openhft/chronicle/values/issue9/HeapVsNativeTest.java
+++ b/src/test/java/net/openhft/chronicle/values/issue9/HeapVsNativeTest.java
@@ -9,10 +9,10 @@
 import net.openhft.chronicle.values.NotNull;
 import net.openhft.chronicle.values.Values;
 import net.openhft.chronicle.values.ValuesTestCommon;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Tests that heap and native {@link Entity} values hold the same content but
diff --git a/src/test/java/net/openhft/chronicle/values/pointer/PointerTest.java b/src/test/java/net/openhft/chronicle/values/pointer/PointerTest.java
index 796d574d3..6bac8975c 100644
--- a/src/test/java/net/openhft/chronicle/values/pointer/PointerTest.java
+++ b/src/test/java/net/openhft/chronicle/values/pointer/PointerTest.java
@@ -8,10 +8,10 @@
 import net.openhft.chronicle.values.Values;
 import net.openhft.chronicle.values.ValuesTestCommon;
 import org.jetbrains.annotations.NotNull;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static java.util.Objects.requireNonNull;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class PointerTest extends ValuesTestCommon {