diff --git a/jupyterhub/tests/test_api.py b/jupyterhub/tests/test_api.py
index 06ec377d..b28453bc 100644
--- a/jupyterhub/tests/test_api.py
+++ b/jupyterhub/tests/test_api.py
@@ -143,10 +143,6 @@ def test_referer_check(app):
     if user is None:
         user = add_user(app.db, name='admin', admin=True)
     cookies = yield app.login_user('admin')
-    app_user = app.users[user]
-    # stop the admin's server so we don't mess up future tests
-    yield app.proxy.delete_user(app_user)
-    yield app_user.stop()
 
     r = yield api_request(app, 'users',
         headers={
diff --git a/jupyterhub/tests/test_named_servers.py b/jupyterhub/tests/test_named_servers.py
index ddb025d6..b1f84a62 100644
--- a/jupyterhub/tests/test_named_servers.py
+++ b/jupyterhub/tests/test_named_servers.py
@@ -99,13 +99,13 @@ def test_create_named_server(app, named_servers):
         'kind': 'user',
         'admin': False,
         'pending': None,
-        'server': user.url,
+        'server': None,
         'servers': {
-            name: {
+            servername: {
                 'name': name,
                 'url': url_path_join(user.url, name, '/'),
             }
-            for name in ['', servername]
+            for name in [servername]
         },
     }
 
@@ -127,7 +127,7 @@ def test_delete_named_server(app, named_servers):
 
     r = yield api_request(app, 'users', username)
     r.raise_for_status()
-    
+
     user_model = r.json()
     user_model.pop('last_activity')
     assert user_model == {
@@ -136,13 +136,13 @@ def test_delete_named_server(app, named_servers):
         'kind': 'user',
         'admin': False,
         'pending': None,
-        'server': user.url,
+        'server': None,
         'servers': {
             name: {
                 'name': name,
                 'url': url_path_join(user.url, name, '/'),
             }
-            for name in ['']
+            for name in []
         },
     }