diff --git a/src/test/java/GlobalEventBusTest.java b/src/test/java/TestGlobalEventBus.java
similarity index 99%
rename from src/test/java/GlobalEventBusTest.java
rename to src/test/java/TestGlobalEventBus.java
index 213d816..c5dd2a5 100644
--- a/src/test/java/GlobalEventBusTest.java
+++ b/src/test/java/TestGlobalEventBus.java
@@ -10,7 +10,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class GlobalEventBusTest {
+public class TestGlobalEventBus {
 
     // Sample event class
     public static class TestEvent {
diff --git a/src/test/java/ServerTest.java b/src/test/java/TestServerTest.java
similarity index 97%
rename from src/test/java/ServerTest.java
rename to src/test/java/TestServerTest.java
index d91ed67..93082cd 100644
--- a/src/test/java/ServerTest.java
+++ b/src/test/java/TestServerTest.java
@@ -4,7 +4,7 @@ import org.junit.Test;
 import org.toop.server.Server;
 import org.toop.server.backend.*;
 
-public class ServerTest {
+public class TestServerTest {
 
     private Server server;