diff --git a/test/faker/books/test_dune.rb b/test/faker/books/test_dune.rb
deleted file mode 100644
index b0a0aef0d3..0000000000
--- a/test/faker/books/test_dune.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../test_helper'
-
-class TestFakerBooksDune < Test::Unit::TestCase
-  def setup
-    @tester = Faker::Books::Dune
-  end
-
-  def test_character
-    assert @tester.character.match(/\w+/)
-  end
-
-  def test_title
-    assert @tester.title.match(/\w+/)
-  end
-
-  def test_planet
-    assert @tester.planet.match(/\w+/)
-  end
-
-  def test_quote
-    assert @tester.quote.match(/\w+/)
-  end
-
-  def test_saying
-    assert @tester.saying.match(/\w+/)
-  end
-end
diff --git a/test/faker/default/test_faker_dune.rb b/test/faker/books/test_faker_dune.rb
similarity index 100%
rename from test/faker/default/test_faker_dune.rb
rename to test/faker/books/test_faker_dune.rb
diff --git a/test/faker/default/test_faker_movie.rb b/test/faker/default/test_faker_movie.rb
deleted file mode 100644
index 8a63a9426d..0000000000
--- a/test/faker/default/test_faker_movie.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../test_helper'
-
-class TestFakerMovie < Test::Unit::TestCase
-  def setup
-    @tester = Faker::Movie
-  end
-
-  def test_quote
-    assert @tester.quote.match(/\w+/)
-  end
-end
diff --git a/test/faker/games/test_control.rb b/test/faker/games/test_faker_control.rb
similarity index 100%
rename from test/faker/games/test_control.rb
rename to test/faker/games/test_faker_control.rb
diff --git a/test/faker/games/test_dnd.rb b/test/faker/games/test_faker_dnd.rb
similarity index 100%
rename from test/faker/games/test_dnd.rb
rename to test/faker/games/test_faker_dnd.rb
diff --git a/test/faker/default/test_faker_dota.rb b/test/faker/games/test_faker_dota.rb
similarity index 100%
rename from test/faker/default/test_faker_dota.rb
rename to test/faker/games/test_faker_dota.rb
diff --git a/test/faker/default/test_faker_elder_scrolls.rb b/test/faker/games/test_faker_elder_scrolls.rb
similarity index 100%
rename from test/faker/default/test_faker_elder_scrolls.rb
rename to test/faker/games/test_faker_elder_scrolls.rb
diff --git a/test/faker/default/test_faker_fallout.rb b/test/faker/games/test_faker_fallout.rb
similarity index 100%
rename from test/faker/default/test_faker_fallout.rb
rename to test/faker/games/test_faker_fallout.rb
diff --git a/test/faker/games/test_game.rb b/test/faker/games/test_faker_game.rb
similarity index 100%
rename from test/faker/games/test_game.rb
rename to test/faker/games/test_faker_game.rb
diff --git a/test/faker/default/test_faker_heroes.rb b/test/faker/games/test_faker_heroes.rb
similarity index 100%
rename from test/faker/default/test_faker_heroes.rb
rename to test/faker/games/test_faker_heroes.rb
diff --git a/test/faker/default/test_faker_games_heroes_of_the_storm.rb b/test/faker/games/test_faker_heroes_of_the_storm.rb
similarity index 86%
rename from test/faker/default/test_faker_games_heroes_of_the_storm.rb
rename to test/faker/games/test_faker_heroes_of_the_storm.rb
index 10503960ac..2cd41b3822 100644
--- a/test/faker/default/test_faker_games_heroes_of_the_storm.rb
+++ b/test/faker/games/test_faker_heroes_of_the_storm.rb
@@ -2,7 +2,7 @@
 
 require_relative '../../test_helper'
 
-class TestFakerGamesHeroesOfTheStorm < Test::Unit::TestCase
+class TestFakerHeroesOfTheStorm < Test::Unit::TestCase
   def setup
     @tester = Faker::Games::HeroesOfTheStorm
   end
diff --git a/test/faker/default/test_faker_league_of_legends.rb b/test/faker/games/test_faker_league_of_legends.rb
similarity index 100%
rename from test/faker/default/test_faker_league_of_legends.rb
rename to test/faker/games/test_faker_league_of_legends.rb
diff --git a/test/faker/default/test_faker_myst.rb b/test/faker/games/test_faker_myst.rb
similarity index 100%
rename from test/faker/default/test_faker_myst.rb
rename to test/faker/games/test_faker_myst.rb
diff --git a/test/faker/default/test_faker_overwatch.rb b/test/faker/games/test_faker_overwatch.rb
similarity index 100%
rename from test/faker/default/test_faker_overwatch.rb
rename to test/faker/games/test_faker_overwatch.rb
diff --git a/test/faker/default/test_faker_pokemon.rb b/test/faker/games/test_faker_pokemon.rb
similarity index 100%
rename from test/faker/default/test_faker_pokemon.rb
rename to test/faker/games/test_faker_pokemon.rb
diff --git a/test/faker/default/test_faker_sonic_the_hedgehog.rb b/test/faker/games/test_faker_sonic_the_hedgehog.rb
similarity index 100%
rename from test/faker/default/test_faker_sonic_the_hedgehog.rb
rename to test/faker/games/test_faker_sonic_the_hedgehog.rb
diff --git a/test/faker/default/test_faker_super_smash_bros.rb b/test/faker/games/test_faker_super_smash_bros.rb
similarity index 100%
rename from test/faker/default/test_faker_super_smash_bros.rb
rename to test/faker/games/test_faker_super_smash_bros.rb
diff --git a/test/faker/default/test_warhammer_fantasy.rb b/test/faker/games/test_faker_warhammer_fantasy.rb
similarity index 100%
rename from test/faker/default/test_warhammer_fantasy.rb
rename to test/faker/games/test_faker_warhammer_fantasy.rb
diff --git a/test/faker/default/test_faker_witcher.rb b/test/faker/games/test_faker_witcher.rb
similarity index 100%
rename from test/faker/default/test_faker_witcher.rb
rename to test/faker/games/test_faker_witcher.rb
diff --git a/test/faker/default/test_world_of_warcraft.rb b/test/faker/games/test_faker_world_of_warcraft.rb
similarity index 100%
rename from test/faker/default/test_world_of_warcraft.rb
rename to test/faker/games/test_faker_world_of_warcraft.rb
diff --git a/test/faker/default/test_faker_zelda.rb b/test/faker/games/test_faker_zelda.rb
similarity index 100%
rename from test/faker/default/test_faker_zelda.rb
rename to test/faker/games/test_faker_zelda.rb
diff --git a/test/faker/movies/test_faker_movie.rb b/test/faker/movies/test_faker_movie.rb
index 4cd11444f9..cb906724ad 100644
--- a/test/faker/movies/test_faker_movie.rb
+++ b/test/faker/movies/test_faker_movie.rb
@@ -10,4 +10,8 @@ def setup
   def test_title
     assert @tester.title.match(/\w+/)
   end
+
+  def test_quote
+    assert @tester.quote.match(/\w+/)
+  end
 end