diff --git a/jupyterhub/tests/conftest.py b/jupyterhub/tests/conftest.py
index 77c42ddd..742c7953 100644
--- a/jupyterhub/tests/conftest.py
+++ b/jupyterhub/tests/conftest.py
@@ -22,7 +22,7 @@ def db():
     """Get a db session"""
     global _db
     if _db is None:
-        _db = orm.new_session_factory('sqlite:///:memory:', echo=True)()
+        _db = orm.new_session_factory('sqlite:///:memory:')()
         user = orm.User(
             name=getuser(),
             server=orm.Server(),
diff --git a/jupyterhub/tests/test_orm.py b/jupyterhub/tests/test_orm.py
index 544a9cf8..98cb03c1 100644
--- a/jupyterhub/tests/test_orm.py
+++ b/jupyterhub/tests/test_orm.py
@@ -14,12 +14,12 @@ def test_server(db):
     server = orm.Server()
     db.add(server)
     db.commit()
-    assert server.ip == 'localhost'
+    assert server.ip == ''
     assert server.base_url == '/'
     assert server.proto == 'http'
     assert isinstance(server.port, int)
     assert isinstance(server.cookie_name, str)
-    assert server.url == 'http://localhost:%i/' % server.port
+    assert server.url == 'http://*:%i/' % server.port
 
 
 def test_proxy(db):
@@ -65,7 +65,7 @@ def test_user(db):
     db.add(user)
     db.commit()
     assert user.name == 'kaylee'
-    assert user.server.ip == 'localhost'
+    assert user.server.ip == ''
     assert user.state == {'pid': 4234}
 
     found = orm.User.find(db, 'kaylee')
diff --git a/jupyterhub/tests/test_spawner.py b/jupyterhub/tests/test_spawner.py
index df0f222b..8c8a9b24 100644
--- a/jupyterhub/tests/test_spawner.py
+++ b/jupyterhub/tests/test_spawner.py
@@ -45,6 +45,7 @@ def new_spawner(db, **kwargs):
 def test_spawner(db, io_loop):
     spawner = new_spawner(db)
     io_loop.run_sync(spawner.start)
+    assert spawner.user.server.ip == 'localhost'
     
     # wait for the process to get to the while True: loop
     time.sleep(1)