diff --git a/wagtail/wagtailsearch/signal_handlers.py b/wagtail/wagtailsearch/signal_handlers.py
index 903ce24e21..230a62b0cf 100644
--- a/wagtail/wagtailsearch/signal_handlers.py
+++ b/wagtail/wagtailsearch/signal_handlers.py
@@ -1,16 +1,16 @@
 from django.db.models.signals import post_save, post_delete
 from django.db import models
 
-from search import Search
-from indexed import Indexed
+from wagtail.wagtailsearch.indexed import Indexed
+from wagtail.wagtailsearch.backends import get_search_backend
 
 
 def post_save_signal_handler(instance, **kwargs):
-    Search().add(instance)
+    get_search_backend().add(instance)
 
 
 def post_delete_signal_handler(instance, **kwargs):
-    Search().delete(instance)
+    get_search_backend().delete(instance)
 
 
 def register_signal_handlers():
diff --git a/wagtail/wagtailsearch/tests.py b/wagtail/wagtailsearch/tests.py
index b1e2014796..ca6e71994a 100644
--- a/wagtail/wagtailsearch/tests.py
+++ b/wagtail/wagtailsearch/tests.py
@@ -1,13 +1,13 @@
 from django.test import TestCase
 
 import models
-from search import Search
+from wagtail.wagtailsearch.backends import get_search_backend()
 
 
 class TestSearch(TestCase):
     def test_search(self):
-        # Create search interface and reset the index
-        s = Search()
+        # Create search backend and reset the index
+        s = get_search_backend()
         s.reset_index()
 
         # Create a couple of objects and add them to the index