diff --git a/pom.xml b/pom.xml
index b009172..aae8617 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,12 +27,6 @@
         </dependencies>
     </dependencyManagement>
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.1</version>
-            <scope>test</scope>
-        </dependency>
         <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
         <dependency>
             <groupId>com.google.guava</groupId>
diff --git a/src/test/java/TestGlobalEventBus.java b/src/test/java/GlobalEventBusTest.java
similarity index 97%
rename from src/test/java/TestGlobalEventBus.java
rename to src/test/java/GlobalEventBusTest.java
index c5dd2a5..7ed81f4 100644
--- a/src/test/java/TestGlobalEventBus.java
+++ b/src/test/java/GlobalEventBusTest.java
@@ -7,10 +7,9 @@ import org.toop.eventbus.GlobalEventBus;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestGlobalEventBus {
+public class GlobalEventBusTest {
 
     // Sample event class
     public static class TestEvent {
diff --git a/src/test/java/TestServerTest.java b/src/test/java/ServerTest.java
similarity index 57%
rename from src/test/java/TestServerTest.java
rename to src/test/java/ServerTest.java
index 93082cd..60b0f28 100644
--- a/src/test/java/TestServerTest.java
+++ b/src/test/java/ServerTest.java
@@ -1,50 +1,51 @@
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.toop.server.Server;
 import org.toop.server.backend.*;
 
-public class TestServerTest {
+import static org.junit.jupiter.api.Assertions.*;
+
+public class ServerTest {
 
     private Server server;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         server = new Server(Server.ServerBackend.LOCAL, "127.0.0.1", "8080");
     }
 
     @Test
     public void testConstructorSetsValues() {
-        Assert.assertEquals("127.0.0.1", server.getIp());
-        Assert.assertEquals("8080", server.getPort());
+        assertEquals("127.0.0.1", server.getIp());
+        assertEquals("8080", server.getPort());
     }
 
     @Test
     public void testSetIpUpdatesValue() {
         server.setIp("192.168.1.1");
-        Assert.assertEquals("192.168.1.1", server.getIp());
+        assertEquals("192.168.1.1", server.getIp());
     }
 
     @Test
     public void testSetPortUpdatesValue() {
         server.setPort("9090");
-        Assert.assertEquals("9090", server.getPort());
+        assertEquals("9090", server.getPort());
     }
 
     @Test
     public void testSetLocalBackend() {
-        Assert.assertEquals(new Local(), server.getBackend());
+        assertEquals(new Local(), server.getBackend());
     }
 
     @Test
     public void testSetRemoteBackend() {
         server.setBackend(Server.ServerBackend.REMOTE);
-        Assert.assertEquals(new Remote(), server.getBackend());
+        assertEquals(new Remote(), server.getBackend());
     }
 
     @Test
     public void testNotNullAfterConstruction() {
-        Assert.assertNotNull(server);
+        assertNotNull(server);
     }
 
 }
\ No newline at end of file