diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/AbstractHttpClientServerTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/AbstractHttpClientServerTest.java
index 33376e0ae8f..48ce8e3efa7 100644
--- a/jetty-client/src/test/java/org/eclipse/jetty/client/AbstractHttpClientServerTest.java
+++ b/jetty-client/src/test/java/org/eclipse/jetty/client/AbstractHttpClientServerTest.java
@@ -63,11 +63,12 @@ public class AbstractHttpClientServerTest
     }
 
     @After
-    public void destroy() throws Exception
+    public void dispose() throws Exception
     {
         if (client != null)
             client.stop();
         if (server != null)
             server.stop();
+        server = null;
     }
 }