diff --git a/plugins/elasticsearch/test/test_helper.rb b/plugins/elasticsearch/test/test_helper.rb
index 34797fb..bdb3012 100644
--- a/plugins/elasticsearch/test/test_helper.rb
+++ b/plugins/elasticsearch/test/test_helper.rb
@@ -26,4 +26,8 @@ class ElasticsearchTestHelper < ActionController::TestCase
     @environment.enable_plugin(ElasticsearchPlugin)
   end
 
+  def indexed_models
+    []
+  end
+
 end
diff --git a/plugins/elasticsearch/test/unit/elasticsearch_test.rb b/plugins/elasticsearch/test/unit/elasticsearch_test.rb
index 8482093..f10e336 100644
--- a/plugins/elasticsearch/test/unit/elasticsearch_test.rb
+++ b/plugins/elasticsearch/test/unit/elasticsearch_test.rb
@@ -1,12 +1,6 @@
 require "#{File.dirname(__FILE__)}/../test_helper"
 
-class ElasticsearchTest < ActiveSupport::TestCase
-  def setup
-    @environment = Environment.default
-    @environment.enable_plugin(ElasticsearchPlugin)
-    @profile = create_user('testing').person
-  end
-
+class ElasticsearchTest < ElasticsearchTestHelper
 
   should 'be return yellow for health status' do
       cluster = Elasticsearch::Model.client.cluster
diff --git a/plugins/elasticsearch/test/unit/models/community_test.rb b/plugins/elasticsearch/test/unit/models/community_test.rb
index c959832..f73bc54 100644
--- a/plugins/elasticsearch/test/unit/models/community_test.rb
+++ b/plugins/elasticsearch/test/unit/models/community_test.rb
@@ -1,10 +1,14 @@
 require "#{File.dirname(__FILE__)}/../../test_helper"
 
-class CommunityTest < ActiveSupport::TestCase
+class CommunityTest < ElasticsearchTestHelper
+
+  def indexed_models
+    [Community, Person]
+  end
+
   def setup
-    @environment = Environment.default
-    @environment.enable_plugin(ElasticsearchPlugin)
     @profile = create_user('testing').person
+    super
   end
 
   should 'index custom fields for Event model' do
diff --git a/plugins/elasticsearch/test/unit/models/event_test.rb b/plugins/elasticsearch/test/unit/models/event_test.rb
index 7b095c3..f17b1d6 100644
--- a/plugins/elasticsearch/test/unit/models/event_test.rb
+++ b/plugins/elasticsearch/test/unit/models/event_test.rb
@@ -1,10 +1,14 @@
 require "#{File.dirname(__FILE__)}/../../test_helper"
 
-class EventTest < ActiveSupport::TestCase
+class EventTest < ElasticsearchTestHelper
+
+  def indexed_models
+    [Event]
+  end
+
   def setup
-    @environment = Environment.default
-    @environment.enable_plugin(ElasticsearchPlugin)
     @profile = create_user('testing').person
+    super
   end
 
   should 'index custom fields for Event model' do
diff --git a/plugins/elasticsearch/test/unit/models/person_test.rb b/plugins/elasticsearch/test/unit/models/person_test.rb
index e716032..3c24f87 100644
--- a/plugins/elasticsearch/test/unit/models/person_test.rb
+++ b/plugins/elasticsearch/test/unit/models/person_test.rb
@@ -1,10 +1,14 @@
 require "#{File.dirname(__FILE__)}/../../test_helper"
 
-class PersonTest < ActiveSupport::TestCase
+class PersonTest < ElasticsearchTestHelper
+
+  def indexed_models
+    [Event]
+  end
+
   def setup
-    @environment = Environment.default
-    @environment.enable_plugin(ElasticsearchPlugin)
     @profile = create_user('testing').person
+    super
   end
 
   should 'index custom fields for Event model' do
--
libgit2 0.21.2