diff --git a/test/chess/store/game_test.exs b/test/chess/store/game_test.exs
index ba69041..00a27b9 100644
--- a/test/chess/store/game_test.exs
+++ b/test/chess/store/game_test.exs
@@ -1,4 +1,4 @@
-defmodule Chess.GameTest do
+defmodule Chess.Store.GameTest do
   @moduledoc false
 
   use Chess.DataCase
diff --git a/test/chess/store/move_test.exs b/test/chess/store/move_test.exs
index 8d5914b..946db3f 100644
--- a/test/chess/store/move_test.exs
+++ b/test/chess/store/move_test.exs
@@ -1,4 +1,4 @@
-defmodule Chess.MoveTest do
+defmodule Chess.Store.MoveTest do
   @moduledoc false
 
   use Chess.DataCase
diff --git a/test/chess/store/user_test.exs b/test/chess/store/user_test.exs
index fcc5d7f..e59da2c 100644
--- a/test/chess/store/user_test.exs
+++ b/test/chess/store/user_test.exs
@@ -1,4 +1,4 @@
-defmodule Chess.UserTest do
+defmodule Chess.Store.UserTest do
   use Chess.DataCase
 
   import Chess.Factory
diff --git a/test/chess_web/controllers/game_controller_test.exs b/test/chess_web/controllers/game_controller_test.exs
index 2c61b14..2a32f30 100644
--- a/test/chess_web/controllers/game_controller_test.exs
+++ b/test/chess_web/controllers/game_controller_test.exs
@@ -1,4 +1,4 @@
-defmodule Chess.GameControllerTest do
+defmodule ChessWeb.GameControllerTest do
   use ChessWeb.ConnCase
 
   alias Chess.Store.Game
diff --git a/test/chess_web/controllers/session_controller_test.exs b/test/chess_web/controllers/session_controller_test.exs
index bb19e56..e9890da 100644
--- a/test/chess_web/controllers/session_controller_test.exs
+++ b/test/chess_web/controllers/session_controller_test.exs
@@ -1,4 +1,4 @@
-defmodule Chess.SessionControllerTest do
+defmodule ChessWeb.SessionControllerTest do
   use ChessWeb.ConnCase
 
   test "shows log in form", %{conn: conn} do
diff --git a/test/features/games_test.exs b/test/features/games_test.exs
index 38d0e3f..19e4886 100644
--- a/test/features/games_test.exs
+++ b/test/features/games_test.exs
@@ -1,4 +1,4 @@
-defmodule Chess.GamesTest do
+defmodule Chess.Features.GamesTest do
   use ChessWeb.FeatureCase
 
   import Wallaby.Query
diff --git a/test/features/moves_test.exs b/test/features/moves_test.exs
index 83db8ce..c25df33 100644
--- a/test/features/moves_test.exs
+++ b/test/features/moves_test.exs
@@ -1,4 +1,4 @@
-defmodule Chess.MovesTest do
+defmodule Chess.Features.MovesTest do
   use ChessWeb.FeatureCase
 
   import Wallaby.Query
diff --git a/test/features/registration_test.exs b/test/features/registration_test.exs
index 89c02f0..732d60b 100644
--- a/test/features/registration_test.exs
+++ b/test/features/registration_test.exs
@@ -1,4 +1,4 @@
-defmodule Chess.RegistrationTest do
+defmodule Chess.Features.RegistrationTest do
   use ChessWeb.FeatureCase
 
   import Wallaby.Query
diff --git a/test/features/session_test.exs b/test/features/session_test.exs
index 3deac03..9efaf65 100644
--- a/test/features/session_test.exs
+++ b/test/features/session_test.exs
@@ -1,4 +1,4 @@
-defmodule Chess.SessionTest do
+defmodule Chess.Features.SessionTest do
   use ChessWeb.FeatureCase
 
   import Wallaby.Query