diff --git a/test/conversions_test.rb b/test/conversions_test.rb
index cd991cf..e96c7ef 100644
--- a/test/conversions_test.rb
+++ b/test/conversions_test.rb
@@ -1,6 +1,11 @@
 require_relative "test_helper"
 
 class ConversionsTest < Minitest::Test
+  def setup
+    super
+    setup_speaker
+  end
+
   def test_conversions
     store [
       {name: "Tomato A", conversions: {"tomato" => 1}},
diff --git a/test/geo_shape_test.rb b/test/geo_shape_test.rb
index cc531bb..26df275 100644
--- a/test/geo_shape_test.rb
+++ b/test/geo_shape_test.rb
@@ -2,7 +2,7 @@ require_relative "test_helper"
 
 class GeoShapeTest < Minitest::Test
   def setup
-    Region.destroy_all
+    setup_region
     store [
       {
         name: "Region A",
diff --git a/test/index_test.rb b/test/index_test.rb
index d024822..a00587a 100644
--- a/test/index_test.rb
+++ b/test/index_test.rb
@@ -3,7 +3,7 @@ require_relative "test_helper"
 class IndexTest < Minitest::Test
   def setup
     super
-    Region.destroy_all
+    setup_region
   end
 
   def test_tokens
diff --git a/test/match_test.rb b/test/match_test.rb
index dc977b3..439ef6f 100644
--- a/test/match_test.rb
+++ b/test/match_test.rb
@@ -1,6 +1,11 @@
 require_relative "test_helper"
 
 class MatchTest < Minitest::Test
+  def setup
+    super
+    setup_speaker
+  end
+
   # exact
 
   def test_match
diff --git a/test/multi_indices_test.rb b/test/multi_indices_test.rb
index 6aa165b..3d4244d 100644
--- a/test/multi_indices_test.rb
+++ b/test/multi_indices_test.rb
@@ -1,6 +1,11 @@
 require_relative "test_helper"
 
 class MultiIndicesTest < Minitest::Test
+  def setup
+    super
+    setup_speaker
+  end
+
   def test_basic
     store_names ["Product A"]
     store_names ["Product B"], Speaker
diff --git a/test/query_test.rb b/test/query_test.rb
index 8eadfdd..ef21c22 100644
--- a/test/query_test.rb
+++ b/test/query_test.rb
@@ -1,6 +1,11 @@
 require_relative "test_helper"
 
 class QueryTest < Minitest::Test
+  def setup
+    super
+    setup_speaker
+  end
+
   def test_basic
     store_names ["Milk", "Apple"]
     query = Product.search("milk", body: {query: {match_all: {}}})
diff --git a/test/search_synonyms_test.rb b/test/search_synonyms_test.rb
index fca4ea1..465a4a4 100644
--- a/test/search_synonyms_test.rb
+++ b/test/search_synonyms_test.rb
@@ -1,6 +1,11 @@
 require_relative "test_helper"
 
 class SearchSynonymsTest < Minitest::Test
+  def setup
+    super
+    setup_speaker
+  end
+
   def test_bleach
     store_names ["Clorox Bleach", "Kroger Bleach"]
     assert_search "clorox", ["Clorox Bleach", "Kroger Bleach"]
diff --git a/test/support/helpers.rb b/test/support/helpers.rb
index d9ae0a9..0315e00 100644
--- a/test/support/helpers.rb
+++ b/test/support/helpers.rb
@@ -11,18 +11,25 @@ class Minitest::Test
 
       Store.reindex
       Animal.reindex
-      Speaker.reindex
-      Region.reindex
     end
 
     Product.destroy_all
     Store.destroy_all
     Animal.destroy_all
-    Speaker.destroy_all
   end
 
   protected
 
+  def setup_region
+    $setup_region ||= (Region.reindex || true)
+    Region.destroy_all
+  end
+
+  def setup_speaker
+    $setup_speaker ||= (Speaker.reindex || true)
+    Speaker.destroy_all
+  end
+
   def store(documents, model = default_model, reindex: true)
     if reindex
       documents.shuffle.each do |document|
--
libgit2 0.21.0