diff --git a/tests/functional/openlp_core_lib/test_projectordb.py b/tests/functional/openlp_core_lib/test_projectordb.py
index 8717825bb..ba79b59c3 100644
--- a/tests/functional/openlp_core_lib/test_projectordb.py
+++ b/tests/functional/openlp_core_lib/test_projectordb.py
@@ -36,7 +36,7 @@ PREREQUISITE: add_record() and get_all() functions validated.
 from unittest import TestCase
 from tests.functional import MagicMock, patch
 
-from openlp.core.lib.projectordb import Projector, ProjectorDB
+from openlp.core.lib.projector.db import Projector, ProjectorDB
 
 from tests.resources.projector.data import TEST1_DATA, TEST2_DATA, TEST3_DATA
 
@@ -85,7 +85,7 @@ class TestProjectorDB(TestCase):
         Set up anything necessary for all tests
         """
         if not hasattr(self, 'projector'):
-            with patch('openlp.core.lib.projectordb.init_url') as mocked_init_url:
+            with patch('openlp.core.lib.projector.db.init_url') as mocked_init_url:
                 mocked_init_url.start()
                 mocked_init_url.return_value = 'sqlite:///%s' % tmpfile
                 self.projector = ProjectorDB()
diff --git a/tests/interfaces/openlp_core_ui/test_projectormanager.py b/tests/interfaces/openlp_core_ui/test_projectormanager.py
index e12f9a74a..c9218e0aa 100644
--- a/tests/interfaces/openlp_core_ui/test_projectormanager.py
+++ b/tests/interfaces/openlp_core_ui/test_projectormanager.py
@@ -36,7 +36,7 @@ from tests.functional import patch, MagicMock
 from tests.helpers.testmixin import TestMixin
 
 from openlp.core.ui import ProjectorManager, ProjectorWizard
-from openlp.core.lib.projectordb import Projector, ProjectorDB
+from openlp.core.lib.projector.db import Projector, ProjectorDB
 
 from tests.resources.projector.data import TEST1_DATA, TEST2_DATA, TEST3_DATA
 
@@ -55,7 +55,7 @@ class TestProjectorManager(TestCase, TestMixin):
         self.get_application()
         Registry.create()
         if not hasattr(self, 'projector_manager'):
-            with patch('openlp.core.lib.projectordb.init_url') as mocked_init_url:
+            with patch('openlp.core.lib.projector.db.init_url') as mocked_init_url:
                 mocked_init_url.start()
                 mocked_init_url.return_value = 'sqlite:///%s' % tmpfile
                 self.projectordb = ProjectorDB()
diff --git a/tests/resources/projector/data.py b/tests/resources/projector/data.py
index 798e8af36..37923d5b7 100644
--- a/tests/resources/projector/data.py
+++ b/tests/resources/projector/data.py
@@ -30,7 +30,7 @@
 The :mod:`tests.resources.projector.data file contains test data
 """
 
-from openlp.core.lib.projectordb import Projector
+from openlp.core.lib.projector.db import Projector
 
 # Test data
 TEST1_DATA = Projector(ip='111.111.111.111',