diff --git a/test/aggs_test.rb b/test/aggs_test.rb
index fa3b3a3..daeab78 100644
--- a/test/aggs_test.rb
+++ b/test/aggs_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestAggs < Minitest::Test
+class AggsTest < Minitest::Test
 
   def setup
     super
diff --git a/test/autocomplete_test.rb b/test/autocomplete_test.rb
index fb4ccb5..807d64f 100644
--- a/test/autocomplete_test.rb
+++ b/test/autocomplete_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestAutocomplete < Minitest::Test
+class AutocompleteTest < Minitest::Test
 
   def test_autocomplete
     store_names ["Hummus"]
diff --git a/test/boost_test.rb b/test/boost_test.rb
index b1f6edb..2958b0b 100644
--- a/test/boost_test.rb
+++ b/test/boost_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestBoost < Minitest::Test
+class BoostTest < Minitest::Test
 
   # conversions
 
diff --git a/test/facets_test.rb b/test/facets_test.rb
index 4673549..1df971a 100644
--- a/test/facets_test.rb
+++ b/test/facets_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestFacets < Minitest::Test
+class FacetsTest < Minitest::Test
 
   def setup
     skip if elasticsearch2?
diff --git a/test/highlight_test.rb b/test/highlight_test.rb
index 27b8f66..8dc4363 100644
--- a/test/highlight_test.rb
+++ b/test/highlight_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestHighlight < Minitest::Test
+class HighlightTest < Minitest::Test
 
   def test_basic
     store_names ["Two Door Cinema Club"]
diff --git a/test/index_test.rb b/test/index_test.rb
index 367900a..c49e503 100644
--- a/test/index_test.rb
+++ b/test/index_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestIndex < Minitest::Test
+class IndexTest < Minitest::Test
 
   def test_clean_indices
     old_index = Searchkick::Index.new("products_test_20130801000000000")
diff --git a/test/inheritance_test.rb b/test/inheritance_test.rb
index c5f1100..60dd4ba 100644
--- a/test/inheritance_test.rb
+++ b/test/inheritance_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestInheritance < Minitest::Test
+class InheritanceTest < Minitest::Test
 
   def test_child_reindex
     store_names ["Max"], Cat
diff --git a/test/match_test.rb b/test/match_test.rb
index 68e9491..a9603d7 100644
--- a/test/match_test.rb
+++ b/test/match_test.rb
@@ -2,7 +2,7 @@
 
 require_relative "test_helper"
 
-class TestMatch < Minitest::Test
+class MatchTest < Minitest::Test
 
   # exact
 
diff --git a/test/model_test.rb b/test/model_test.rb
index 9e46680..7f8c453 100644
--- a/test/model_test.rb
+++ b/test/model_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestModel < Minitest::Test
+class ModelTest < Minitest::Test
 
   def test_disable_callbacks_model
     store_names ["product a"]
@@ -20,7 +20,7 @@ class TestModel < Minitest::Test
   def test_disable_callbacks_global
     # make sure callbacks default to on
     assert Searchkick.callbacks?
-    
+
     store_names ["product a"]
 
     Searchkick.disable_callbacks
diff --git a/test/query_test.rb b/test/query_test.rb
index 29d0f8b..7d51e6a 100644
--- a/test/query_test.rb
+++ b/test/query_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestQuery < Minitest::Test
+class QueryTest < Minitest::Test
 
   def test_basic
     store_names ["Milk", "Apple"]
diff --git a/test/reindex_job_test.rb b/test/reindex_job_test.rb
index 3259adb..43c28ec 100644
--- a/test/reindex_job_test.rb
+++ b/test/reindex_job_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestReindexJob < Minitest::Test
+class ReindexJobTest < Minitest::Test
 
   def setup
     super
diff --git a/test/reindex_v2_job_test.rb b/test/reindex_v2_job_test.rb
index 94c8bc4..86f9768 100644
--- a/test/reindex_v2_job_test.rb
+++ b/test/reindex_v2_job_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestReindexV2Job < Minitest::Test
+class ReindexV2JobTest < Minitest::Test
 
   def setup
     skip unless defined?(ActiveJob)
diff --git a/test/routing_test.rb b/test/routing_test.rb
index 5430ed8..ca816a6 100644
--- a/test/routing_test.rb
+++ b/test/routing_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestRouting < Minitest::Test
+class RoutingTest < Minitest::Test
 
   def test_routing_query
     skip if elasticsearch2?
@@ -13,4 +13,5 @@ class TestRouting < Minitest::Test
     index_options = Store.searchkick_index.index_options
     assert_equal index_options[:mappings][:_default_][:_routing], {required: true, path: "name"}
   end
+
 end
diff --git a/test/should_index_test.rb b/test/should_index_test.rb
index b143db5..bb5d66a 100644
--- a/test/should_index_test.rb
+++ b/test/should_index_test.rb
@@ -1,7 +1,6 @@
 require_relative "test_helper"
 
-class TestShouldIndex < Minitest::Test
-
+class ShouldIndexTest < Minitest::Test
   def test_basic
     store_names ["INDEX", "DO NOT INDEX"]
     assert_search "index", ["INDEX"]
@@ -30,5 +29,4 @@ class TestShouldIndex < Minitest::Test
     Product.searchkick_index.refresh
     assert_search "index", []
   end
-
 end
diff --git a/test/similar_test.rb b/test/similar_test.rb
index 685d514..bd21f02 100644
--- a/test/similar_test.rb
+++ b/test/similar_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestSimilar < Minitest::Test
+class SimilarTest < Minitest::Test
 
   def test_similar
     store_names ["Annie's Naturals Organic Shiitake & Sesame Dressing"]
diff --git a/test/sql_test.rb b/test/sql_test.rb
index dd1b105..f1c753a 100644
--- a/test/sql_test.rb
+++ b/test/sql_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestSql < Minitest::Test
+class SqlTest < Minitest::Test
 
   def test_limit
     store_names ["Product A", "Product B", "Product C", "Product D"]
diff --git a/test/suggest_test.rb b/test/suggest_test.rb
index 321114a..b0e2258 100644
--- a/test/suggest_test.rb
+++ b/test/suggest_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestSuggest < Minitest::Test
+class SuggestTest < Minitest::Test
 
   def test_basic
     store_names ["Great White Shark", "Hammerhead Shark", "Tiger Shark"]
diff --git a/test/synonyms_test.rb b/test/synonyms_test.rb
index d7ebba5..36b6a23 100644
--- a/test/synonyms_test.rb
+++ b/test/synonyms_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestSynonyms < Minitest::Test
+class SynonymsTest < Minitest::Test
 
   def test_bleach
     store_names ["Clorox Bleach", "Kroger Bleach"]
--
libgit2 0.21.0