diff --git a/searchkick.gemspec b/searchkick.gemspec
index 5785978..d54cc6a 100644
--- a/searchkick.gemspec
+++ b/searchkick.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "elasticsearch", ">= 1"
   spec.add_dependency "hashie"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest", "~> 4.7"
+  spec.add_development_dependency "minitest"
 end
diff --git a/test/autocomplete_test.rb b/test/autocomplete_test.rb
index c81ef2d..fb4ccb5 100644
--- a/test/autocomplete_test.rb
+++ b/test/autocomplete_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestAutocomplete < Minitest::Unit::TestCase
+class TestAutocomplete < Minitest::Test
 
   def test_autocomplete
     store_names ["Hummus"]
diff --git a/test/boost_test.rb b/test/boost_test.rb
index 9cb64d6..bbf74f0 100644
--- a/test/boost_test.rb
+++ b/test/boost_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestBoost < Minitest::Unit::TestCase
+class TestBoost < Minitest::Test
 
   # conversions
 
diff --git a/test/facets_test.rb b/test/facets_test.rb
index 1a1f92f..35954c1 100644
--- a/test/facets_test.rb
+++ b/test/facets_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestFacets < Minitest::Unit::TestCase
+class TestFacets < Minitest::Test
 
   def setup
     super
diff --git a/test/highlight_test.rb b/test/highlight_test.rb
index 0cb0bdc..17fad0a 100644
--- a/test/highlight_test.rb
+++ b/test/highlight_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestHighlight < Minitest::Unit::TestCase
+class TestHighlight < Minitest::Test
 
   def test_basic
     store_names ["Two Door Cinema Club"]
diff --git a/test/index_test.rb b/test/index_test.rb
index 5780796..cd18427 100644
--- a/test/index_test.rb
+++ b/test/index_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestIndex < Minitest::Unit::TestCase
+class TestIndex < 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 c6dde4f..c5f1100 100644
--- a/test/inheritance_test.rb
+++ b/test/inheritance_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestInheritance < Minitest::Unit::TestCase
+class TestInheritance < Minitest::Test
 
   def test_child_reindex
     store_names ["Max"], Cat
diff --git a/test/match_test.rb b/test/match_test.rb
index e2c5d22..20f2de2 100644
--- a/test/match_test.rb
+++ b/test/match_test.rb
@@ -2,7 +2,7 @@
 
 require_relative "test_helper"
 
-class TestMatch < Minitest::Unit::TestCase
+class TestMatch < Minitest::Test
 
   # exact
 
diff --git a/test/model_test.rb b/test/model_test.rb
index ba24070..4770dbb 100644
--- a/test/model_test.rb
+++ b/test/model_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestModel < Minitest::Unit::TestCase
+class TestModel < Minitest::Test
 
   def test_disable_callbacks_model
     store_names ["product a"]
diff --git a/test/query_test.rb b/test/query_test.rb
index 07d1bd6..29d0f8b 100644
--- a/test/query_test.rb
+++ b/test/query_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestQuery < Minitest::Unit::TestCase
+class TestQuery < Minitest::Test
 
   def test_basic
     store_names ["Milk", "Apple"]
diff --git a/test/reindex_job_test.rb b/test/reindex_job_test.rb
index dc4ab45..22be4ed 100644
--- a/test/reindex_job_test.rb
+++ b/test/reindex_job_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestReindexJob < Minitest::Unit::TestCase
+class TestReindexJob < Minitest::Test
 
   def setup
     super
diff --git a/test/should_index_test.rb b/test/should_index_test.rb
index fb79854..b143db5 100644
--- a/test/should_index_test.rb
+++ b/test/should_index_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestShouldIndex < Minitest::Unit::TestCase
+class TestShouldIndex < Minitest::Test
 
   def test_basic
     store_names ["INDEX", "DO NOT INDEX"]
diff --git a/test/similar_test.rb b/test/similar_test.rb
index b36ceac..685d514 100644
--- a/test/similar_test.rb
+++ b/test/similar_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestSimilar < Minitest::Unit::TestCase
+class TestSimilar < 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 5bb072b..c9ce576 100644
--- a/test/sql_test.rb
+++ b/test/sql_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestSql < Minitest::Unit::TestCase
+class TestSql < 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 8ac5766..75703fd 100644
--- a/test/suggest_test.rb
+++ b/test/suggest_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestSuggest < Minitest::Unit::TestCase
+class TestSuggest < 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 3e02c20..aea3d26 100644
--- a/test/synonyms_test.rb
+++ b/test/synonyms_test.rb
@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TestSynonyms < Minitest::Unit::TestCase
+class TestSynonyms < Minitest::Test
 
   def test_bleach
     store_names ["Clorox Bleach", "Kroger Bleach"]
diff --git a/test/test_helper.rb b/test/test_helper.rb
index edf974e..8ebb709 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -6,6 +6,8 @@ require "logger"
 
 ENV["RACK_ENV"] = "test"
 
+Minitest::Test = Minitest::Test unless defined?(Minitest::Test)
+
 File.delete("elasticsearch.log") if File.exists?("elasticsearch.log")
 Searchkick.client.transport.logger = Logger.new("elasticsearch.log")
 
@@ -179,7 +181,7 @@ Product.reindex # run twice for both index paths
 Store.reindex
 Animal.reindex
 
-class Minitest::Unit::TestCase
+class Minitest::Test
 
   def setup
     Product.destroy_all
--
libgit2 0.21.0