diff --git a/jupyterhub/tests/conftest.py b/jupyterhub/tests/conftest.py
index d4e8f04c..4df40d8e 100644
--- a/jupyterhub/tests/conftest.py
+++ b/jupyterhub/tests/conftest.py
@@ -72,6 +72,7 @@ def cleanup_after(request):
         for uid, user in app.users.items():
             for name, spawner in list(user.spawners.items()):
                 if spawner.active:
+                    loop.run_until_complete(app.proxy.delete_user(user, name))
                     loop.run_until_complete(user.stop(name))
 
 
diff --git a/jupyterhub/tests/test_pages.py b/jupyterhub/tests/test_pages.py
index 5e446cb1..583c3545 100644
--- a/jupyterhub/tests/test_pages.py
+++ b/jupyterhub/tests/test_pages.py
@@ -110,9 +110,6 @@ def test_spawn_redirect(app):
     cookies = yield app.login_user(name)
     u = app.users[orm.User.find(app.db, name)]
 
-    # ensure wash's server isn't running:
-    r = yield api_request(app, 'users', name, 'server', method='delete', cookies=cookies)
-    r.raise_for_status()
     status = yield u.spawner.poll()
     assert status is not None