diff --git a/java_console/io/src/test/java/com/rusefi/SignatureHelperTest.java b/java_console/io/src/test/java/com/rusefi/SignatureHelperTest.java
index fcda8ce758..b3aa010239 100644
--- a/java_console/io/src/test/java/com/rusefi/SignatureHelperTest.java
+++ b/java_console/io/src/test/java/com/rusefi/SignatureHelperTest.java
@@ -2,9 +2,10 @@ package com.rusefi;
 
 import com.rusefi.core.RusEfiSignature;
 import com.rusefi.core.SignatureHelper;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class SignatureHelperTest {
     @Test
diff --git a/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/CRCTest.java b/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/CRCTest.java
index c2eb9c865b..55fc7f0a7e 100644
--- a/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/CRCTest.java
+++ b/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/CRCTest.java
@@ -1,12 +1,12 @@
 package com.rusefi.binaryprotocol.test;
 
 import com.rusefi.binaryprotocol.IoHelper;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Andrey Belomutskiy, (c) 2013-2020
@@ -30,7 +30,8 @@ public class CRCTest {
         byte[] command = {'S'};
         byte[] expected = {0, 1, 0x53, 0x20, 0x60, -17, -61};
         byte[] actual = IoHelper.makeCrc32Packet(command);
-        assertTrue(Arrays.toString(expected) + " vs " + Arrays.toString(actual),
-                Arrays.equals(expected, actual));
+        Assertions.assertTrue(Arrays.equals(expected, actual),
+            Arrays.toString(expected) + " vs " + Arrays.toString(actual)
+        );
     }
 }
diff --git a/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/IoHelperTest.java b/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/IoHelperTest.java
index 8f46f70b8b..3ab3fc0515 100644
--- a/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/IoHelperTest.java
+++ b/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/IoHelperTest.java
@@ -1,13 +1,14 @@
 package com.rusefi.binaryprotocol.test;
 
 import com.rusefi.binaryprotocol.IoHelper;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.io.IOException;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class IoHelperTest {
     @Test
diff --git a/java_console/io/src/test/java/com/rusefi/io/can/Elm327ConnectorTest.java b/java_console/io/src/test/java/com/rusefi/io/can/Elm327ConnectorTest.java
index eefd2db28c..397e9b7965 100644
--- a/java_console/io/src/test/java/com/rusefi/io/can/Elm327ConnectorTest.java
+++ b/java_console/io/src/test/java/com/rusefi/io/can/Elm327ConnectorTest.java
@@ -4,7 +4,7 @@ import com.rusefi.io.can.elm.Elm327Connector;
 import com.rusefi.util.HexBinary;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class Elm327ConnectorTest {
     @Test
diff --git a/java_console/io/src/test/java/com/rusefi/io/can/IsoTpConnectorTest.java b/java_console/io/src/test/java/com/rusefi/io/can/IsoTpConnectorTest.java
index 8e9383fe8b..e5102274e2 100644
--- a/java_console/io/src/test/java/com/rusefi/io/can/IsoTpConnectorTest.java
+++ b/java_console/io/src/test/java/com/rusefi/io/can/IsoTpConnectorTest.java
@@ -3,12 +3,13 @@ package com.rusefi.io.can;
 import com.rusefi.config.generated.Fields;
 import com.rusefi.io.can.isotp.IsoTpConnector;
 import com.rusefi.util.HexBinary;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class IsoTpConnectorTest {
     @Test
diff --git a/java_console/io/src/test/java/com/rusefi/io/serial/RateCounterTest.java b/java_console/io/src/test/java/com/rusefi/io/serial/RateCounterTest.java
index fc0ae3dafa..1442380f0e 100644
--- a/java_console/io/src/test/java/com/rusefi/io/serial/RateCounterTest.java
+++ b/java_console/io/src/test/java/com/rusefi/io/serial/RateCounterTest.java
@@ -1,9 +1,11 @@
 package com.rusefi.io.serial;
 
 import com.rusefi.Timeouts;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 
 public class RateCounterTest {
     @Test
diff --git a/java_console/io/src/test/java/com/rusefi/ldmp/StateDictionaryTest.java b/java_console/io/src/test/java/com/rusefi/ldmp/StateDictionaryTest.java
index 5e2e1ba168..bb1cfc9584 100644
--- a/java_console/io/src/test/java/com/rusefi/ldmp/StateDictionaryTest.java
+++ b/java_console/io/src/test/java/com/rusefi/ldmp/StateDictionaryTest.java
@@ -6,7 +6,7 @@ import com.rusefi.config.generated.TsOutputs;
 import com.rusefi.enums.live_data_e;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class StateDictionaryTest {
     @Test
diff --git a/java_console/io/src/test/java/com/rusefi/test/ConfigurationImageDiffTest.java b/java_console/io/src/test/java/com/rusefi/test/ConfigurationImageDiffTest.java
index 5b6693b61d..31b2c2e751 100644
--- a/java_console/io/src/test/java/com/rusefi/test/ConfigurationImageDiffTest.java
+++ b/java_console/io/src/test/java/com/rusefi/test/ConfigurationImageDiffTest.java
@@ -2,12 +2,11 @@ package com.rusefi.test;
 
 import com.opensr5.ConfigurationImage;
 import com.rusefi.core.Pair;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import static com.rusefi.ConfigurationImageDiff.findDifferences;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Andrey Belomutskiy, (c) 2013-2020
diff --git a/java_console/io/src/test/java/com/rusefi/test/OchGetCommandTest.java b/java_console/io/src/test/java/com/rusefi/test/OchGetCommandTest.java
index db65ef4aec..03028ff271 100644
--- a/java_console/io/src/test/java/com/rusefi/test/OchGetCommandTest.java
+++ b/java_console/io/src/test/java/com/rusefi/test/OchGetCommandTest.java
@@ -5,10 +5,10 @@ import com.rusefi.binaryprotocol.IoHelper;
 import com.rusefi.config.generated.Fields;
 import com.rusefi.io.commands.GetOutputsCommand;
 //import org.apache.commons.codec.binary.Hex;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class OchGetCommandTest {
     @Test
diff --git a/java_console/io/src/test/java/com/rusefi/uds/SeedKeyTest.java b/java_console/io/src/test/java/com/rusefi/uds/SeedKeyTest.java
index cff1ddd57b..70a8c370bb 100644
--- a/java_console/io/src/test/java/com/rusefi/uds/SeedKeyTest.java
+++ b/java_console/io/src/test/java/com/rusefi/uds/SeedKeyTest.java
@@ -1,8 +1,9 @@
 package com.rusefi.uds;
 
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class SeedKeyTest {
     @Test