diff --git a/setup.py b/setup.py
index f838e84..eba24cd 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ setup(name="magic-wormhole",
                 "wormhole.blocking", "wormhole.twisted",
                 "wormhole.scripts", "wormhole.test", "wormhole.util",
                 "wormhole_server"],
-      package_data={"wormhole": ["db-schemas/*.sql"]},
+      package_data={"wormhole_server": ["db-schemas/*.sql"]},
       entry_points={"console_scripts":
                     ["wormhole = wormhole.scripts.runner:entry",
                      "wormhole-server = wormhole_server.runner:entry",
diff --git a/src/wormhole/test/common.py b/src/wormhole/test/common.py
index ee2de77..4503eb1 100644
--- a/src/wormhole/test/common.py
+++ b/src/wormhole/test/common.py
@@ -2,7 +2,7 @@ from twisted.application import service
 from twisted.internet import reactor, defer
 from twisted.python import log
 from ..twisted.transit import allocate_tcp_port
-from ..servers.server import RelayServer
+from wormhole_server.server import RelayServer
 from .. import __version__
 
 class ServerBase:
diff --git a/src/wormhole/test/test_load.py b/src/wormhole/test/test_load.py
index 99fa242..45dccf8 100644
--- a/src/wormhole/test/test_load.py
+++ b/src/wormhole/test/test_load.py
@@ -4,3 +4,5 @@ class Import(unittest.TestCase):
     def test_import(self):
         import wormhole
         self.assertTrue(len(wormhole.__version__))
+        import wormhole_server
+        self.assertTrue(len(wormhole_server.__version__))
diff --git a/src/wormhole/test/test_server.py b/src/wormhole/test/test_server.py
index 09bea1e..ff54b7e 100644
--- a/src/wormhole/test/test_server.py
+++ b/src/wormhole/test/test_server.py
@@ -10,7 +10,7 @@ from twisted.internet.endpoints import clientFromString, connectProtocol
 from twisted.web.client import getPage, Agent, readBody
 from .. import __version__
 from .common import ServerBase
-from ..servers import relay_server, transit_server
+from wormhole_server import relay_server, transit_server
 from ..twisted.eventsource_twisted import EventSource
 
 class Reachable(ServerBase, unittest.TestCase):