diff --git a/pom.xml b/pom.xml
index 23e2de1e5b03fbfe3df0195288508a476b8c9928..1754ae0d21800acfbff80aac77402987f375d5dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,8 @@
 		<gwt.version>2.12.1</gwt.version>
 		<jackson.version>2.17.2</jackson.version>
 		<jersey.version>2.45</jersey.version>
-		<junit.version>4.13.2</junit.version>
+		<junit.version>5.11.3</junit.version>
+                <junit4.version>4.13.2</junit4.version>
 		<log4j.version>2.24.1</log4j.version>
 		<lombok.version>1.18.34</lombok.version>
 		<swagger.version>2.2.21</swagger.version>
@@ -362,10 +363,17 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- Tests -->
+		<!-- Tests for GWT -->
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
+			<version>${junit4.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<!-- Tests -->
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
 			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
diff --git a/src/test/java/fr/inrae/agroclim/gwtexpe/server/dao/PersonDaoHibernateTest.java b/src/test/java/fr/inrae/agroclim/gwtexpe/server/dao/PersonDaoHibernateTest.java
index b14a45dfd1f6c77e6b082ca9441e6ee86369f934..73519ffb9e174e81bec22bef3cf0e82bad048298 100644
--- a/src/test/java/fr/inrae/agroclim/gwtexpe/server/dao/PersonDaoHibernateTest.java
+++ b/src/test/java/fr/inrae/agroclim/gwtexpe/server/dao/PersonDaoHibernateTest.java
@@ -22,19 +22,19 @@ package fr.inrae.agroclim.gwtexpe.server.dao;
  * #L%
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import fr.inrae.agroclim.gwtexpe.server.model.Person;
 
 /**
  * Test DAO.
  */
-public class PersonDaoHibernateTest {
+class PersonDaoHibernateTest {
 
     /**
      * DAO to test.
@@ -42,16 +42,16 @@ public class PersonDaoHibernateTest {
     private final PersonDaoHibernate dao = new PersonDaoHibernate();
 
     @Test
-    public void create() {
+    void create() {
         final String name = "toto";
         List<Person> found;
         found = dao.findAll();
         assertNotNull(found);
-        assertEquals("No data at start", 0, found.size());
+        assertEquals(0, found.size(), "No data at start");
         dao.findOrCreateBy(name);
         found = dao.findAll();
-        assertNotNull("Data after creation", found);
-        assertEquals("One after creation", 1, found.size());
+        assertNotNull(found, "Data after creation");
+        assertEquals(1, found.size(), "One after creation");
         assertEquals(name, found.get(0).getName());
     }
 }
diff --git a/src/test/java/fr/inrae/agroclim/gwtexpe/server/jwt/JsonWebTokenServiceTest.java b/src/test/java/fr/inrae/agroclim/gwtexpe/server/jwt/JsonWebTokenServiceTest.java
index db4ceef20a9fcc0bb48e3425901be15cca808751..2339aaf117d748197e104768dc288f4dbe905a09 100644
--- a/src/test/java/fr/inrae/agroclim/gwtexpe/server/jwt/JsonWebTokenServiceTest.java
+++ b/src/test/java/fr/inrae/agroclim/gwtexpe/server/jwt/JsonWebTokenServiceTest.java
@@ -22,19 +22,19 @@ package fr.inrae.agroclim.gwtexpe.server.jwt;
  * #L%
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.UnsupportedEncodingException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import fr.inrae.agroclim.gwtexpe.server.model.User;
 
 /**
  * Test JsonWebTokenService.
  */
-public class JsonWebTokenServiceTest {
+class JsonWebTokenServiceTest {
 
     /**
      * Service to test.
@@ -49,7 +49,7 @@ public class JsonWebTokenServiceTest {
     /**
      * Constructor.
      */
-    public JsonWebTokenServiceTest() {
+    JsonWebTokenServiceTest() {
         user = new User();
         user.setName("admin");
     }