diff --git a/test/controllers/game_controller_test.exs b/test/controllers/game_controller_test.exs
index 95d4522..2af7991 100644
--- a/test/controllers/game_controller_test.exs
+++ b/test/controllers/game_controller_test.exs
@@ -1,7 +1,7 @@
 defmodule Chess.GameControllerTest do
-  use Chess.ConnCase
+  use ChessWeb.ConnCase
 
-  alias Chess.Game
+  alias Chess.Store.Game
   @valid_attrs %{}
 
   test "lists all entries on index", %{conn: conn} do
diff --git a/test/features/games_test.exs b/test/features/games_test.exs
index 7b864f7..009c582 100644
--- a/test/features/games_test.exs
+++ b/test/features/games_test.exs
@@ -1,5 +1,5 @@
 defmodule Chess.GamesTest do
-  use Chess.FeatureCase
+  use ChessWeb.FeatureCase
 
   test "visit homepage" do
     navigate_to "/"
diff --git a/test/models/game_test.exs b/test/models/game_test.exs
index 199e3ad..687b783 100644
--- a/test/models/game_test.exs
+++ b/test/models/game_test.exs
@@ -1,7 +1,7 @@
 defmodule Chess.GameTest do
   use Chess.ModelCase
 
-  alias Chess.Game
+  alias Chess.Store.Game
 
   @valid_attrs %{board: %{}}
   @invalid_attrs %{}
diff --git a/test/support/feature_case.ex b/test/support/feature_case.ex
index d985063..7900e6a 100644
--- a/test/support/feature_case.ex
+++ b/test/support/feature_case.ex
@@ -1,9 +1,9 @@
-defmodule Chess.FeatureCase do
+defmodule ChessWeb.FeatureCase do
   use ExUnit.CaseTemplate
 
   using do
     quote do
-      use Chess.ConnCase
+      use ChessWeb.ConnCase
 
       use Hound.Helpers
       hound_session()
diff --git a/test/views/error_view_test.exs b/test/views/error_view_test.exs
index 90417f9..35a6892 100644
--- a/test/views/error_view_test.exs
+++ b/test/views/error_view_test.exs
@@ -1,21 +1,23 @@
 defmodule Chess.ErrorViewTest do
-  use Chess.ConnCase, async: true
+  use ChessWeb.ConnCase, async: true
 
   # Bring render/3 and render_to_string/3 for testing custom views
   import Phoenix.View
 
+  alias ChessWeb.ErrorView
+
   test "renders 404.html" do
-    assert render_to_string(Chess.ErrorView, "404.html", []) ==
+    assert render_to_string(ErrorView, "404.html", []) ==
            "Page not found"
   end
 
   test "render 500.html" do
-    assert render_to_string(Chess.ErrorView, "500.html", []) ==
+    assert render_to_string(ErrorView, "500.html", []) ==
            "Internal server error"
   end
 
   test "render any other" do
-    assert render_to_string(Chess.ErrorView, "505.html", []) ==
+    assert render_to_string(ErrorView, "505.html", []) ==
            "Internal server error"
   end
 end
diff --git a/test/views/layout_view_test.exs b/test/views/layout_view_test.exs
index cad9dab..9242c83 100644
--- a/test/views/layout_view_test.exs
+++ b/test/views/layout_view_test.exs
@@ -1,3 +1,3 @@
 defmodule Chess.LayoutViewTest do
-  use Chess.ConnCase, async: true
+  use ChessWeb.ConnCase, async: true
 end
diff --git a/test/views/page_view_test.exs b/test/views/page_view_test.exs
index 2642373..50ccc1b 100644
--- a/test/views/page_view_test.exs
+++ b/test/views/page_view_test.exs
@@ -1,3 +1,3 @@
 defmodule Chess.PageViewTest do
-  use Chess.ConnCase, async: true
+  use ChessWeb.ConnCase, async: true
 end