diff --git a/lib/searchkick/query.rb b/lib/searchkick/query.rb
index 6344840..139f746 100644
--- a/lib/searchkick/query.rb
+++ b/lib/searchkick/query.rb
@@ -960,10 +960,6 @@ module Searchkick
       end
     end
 
-    def below60?
-      Searchkick.server_below?("6.0.0-alpha1")
-    end
-
     def below61?
       Searchkick.server_below?("6.1.0-alpha1")
     end
diff --git a/test/geo_shape_test.rb b/test/geo_shape_test.rb
index 6d2e92e..77fd681 100644
--- a/test/geo_shape_test.rb
+++ b/test/geo_shape_test.rb
@@ -116,9 +116,6 @@ class GeoShapeTest < Minitest::Test
   end
 
   def test_search_math
-    # TODO find out why this is failing
-    skip unless elasticsearch_below60?
-
     assert_search "witch", ["Region A"], {
       where: {
         territory: {
diff --git a/test/index_test.rb b/test/index_test.rb
index f5f42b8..9937f54 100644
--- a/test/index_test.rb
+++ b/test/index_test.rb
@@ -150,11 +150,7 @@ class IndexTest < Minitest::Test
     store [{name: "Product A", text: large_value}], Region
     assert_search "product", ["Product A"], {}, Region
     assert_search "hello", ["Product A"], {fields: [:name, :text]}, Region
-
-    # needs fields for ES 6
-    if elasticsearch_below60?
-      assert_search "hello", ["Product A"], {}, Region
-    end
+    assert_search "hello", ["Product A"], {}, Region
   end
 
   def test_very_large_value
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 2ad2255..0a3c4db 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -38,14 +38,6 @@ end
 
 ActiveSupport::LogSubscriber.logger = ActiveSupport::Logger.new(STDOUT) if ENV["NOTIFICATIONS"]
 
-def elasticsearch_below60?
-  Searchkick.server_below?("6.0.0-alpha1")
-end
-
-def elasticsearch_below61?
-  Searchkick.server_below?("6.1.0-alpha1")
-end
-
 def nobrainer?
   defined?(NoBrainer)
 end
--
libgit2 0.21.0