diff --git a/test/reindex_job_test.rb b/test/reindex_job_test.rb
index 22be4ed..ade1266 100644
--- a/test/reindex_job_test.rb
+++ b/test/reindex_job_test.rb
@@ -12,20 +12,20 @@ class TestReindexJob < Minitest::Test
   end
 
   def test_create
-    Product.create!(id: 1, name: "Boom")
+    product = Product.create!(name: "Boom")
     Product.searchkick_index.refresh
     assert_search "*", []
-    Searchkick::ReindexJob.new("Product", 1).perform
+    Searchkick::ReindexJob.new("Product", product.id).perform
     Product.searchkick_index.refresh
     assert_search "*", ["Boom"]
   end
 
   def test_destroy
-    product = Product.create!(id: 1, name: "Boom")
+    product = Product.create!(name: "Boom")
     Product.reindex
     assert_search "*", ["Boom"]
     product.destroy
-    Searchkick::ReindexJob.new("Product", 1).perform
+    Searchkick::ReindexJob.new("Product", product.id).perform
     Product.searchkick_index.refresh
     assert_search "*", []
   end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 8ebb709..e41d97f 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -6,7 +6,7 @@ require "logger"
 
 ENV["RACK_ENV"] = "test"
 
-Minitest::Test = Minitest::Test unless defined?(Minitest::Test)
+Minitest::Test = Minitest::Unit::TestCase unless defined?(Minitest::Test)
 
 File.delete("elasticsearch.log") if File.exists?("elasticsearch.log")
 Searchkick.client.transport.logger = Logger.new("elasticsearch.log")
--
libgit2 0.21.0