diff --git a/framework/src/test/eventbus/EventPublisherSpeedTest.java b/framework/src/test/java/org/toop/framework/eventbus/EventPublisherSpeedTest.java
similarity index 100%
rename from framework/src/test/eventbus/EventPublisherSpeedTest.java
rename to framework/src/test/java/org/toop/framework/eventbus/EventPublisherSpeedTest.java
diff --git a/framework/src/test/eventbus/EventPublisherStressTest.java b/framework/src/test/java/org/toop/framework/eventbus/EventPublisherStressTest.java
similarity index 100%
rename from framework/src/test/eventbus/EventPublisherStressTest.java
rename to framework/src/test/java/org/toop/framework/eventbus/EventPublisherStressTest.java
diff --git a/framework/src/test/eventbus/EventPublisherTest.java b/framework/src/test/java/org/toop/framework/eventbus/EventPublisherTest.java
similarity index 100%
rename from framework/src/test/eventbus/EventPublisherTest.java
rename to framework/src/test/java/org/toop/framework/eventbus/EventPublisherTest.java
diff --git a/framework/src/test/eventbus/GlobalEventBusTest.java b/framework/src/test/java/org/toop/framework/eventbus/GlobalEventBusTest.java
similarity index 100%
rename from framework/src/test/eventbus/GlobalEventBusTest.java
rename to framework/src/test/java/org/toop/framework/eventbus/GlobalEventBusTest.java
diff --git a/game/src/test/tictactoe/GameBaseTest.java b/game/src/test/java/org/toop/tictactoe/GameBaseTest.java
similarity index 100%
rename from game/src/test/tictactoe/GameBaseTest.java
rename to game/src/test/java/org/toop/tictactoe/GameBaseTest.java
diff --git a/game/src/test/tictactoe/PlayerTest.java b/game/src/test/java/org/toop/tictactoe/PlayerTest.java
similarity index 100%
rename from game/src/test/tictactoe/PlayerTest.java
rename to game/src/test/java/org/toop/tictactoe/PlayerTest.java
diff --git a/game/src/test/tictactoe/ai/MinMaxTicTacToeTest.java b/game/src/test/java/org/toop/tictactoe/ai/MinMaxTicTacToeTest.java
similarity index 100%
rename from game/src/test/tictactoe/ai/MinMaxTicTacToeTest.java
rename to game/src/test/java/org/toop/tictactoe/ai/MinMaxTicTacToeTest.java