diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelStatisticsTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorStatisticsTest.java
similarity index 98%
rename from jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelStatisticsTest.java
rename to jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorStatisticsTest.java
index 24523639330..08fb8544758 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelStatisticsTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorStatisticsTest.java
@@ -45,9 +45,9 @@ import org.junit.Ignore;
 import org.junit.Test;
 
 @Ignore("Ignored while refactoring the connection events and statistics")
-public class SelectChannelStatisticsTest
+public class ConnectorStatisticsTest
 {
-    private static final Logger LOG = Log.getLogger(SelectChannelStatisticsTest.class);
+    private static final Logger LOG = Log.getLogger(ConnectorStatisticsTest.class);
 
     private static Server _server;
     private static ConnectorStatistics _statistics;
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelAsyncContextTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorAsyncContextTest.java
similarity index 94%
rename from jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelAsyncContextTest.java
rename to jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorAsyncContextTest.java
index 206cd92bcff..41bc73e6935 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelAsyncContextTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorAsyncContextTest.java
@@ -23,7 +23,7 @@ import java.nio.charset.StandardCharsets;
 
 import org.eclipse.jetty.util.IO;
 
-public class SelectChannelAsyncContextTest extends LocalAsyncContextTest
+public class ServerConnectorAsyncContextTest extends LocalAsyncContextTest
 {
     @Override
     protected Connector initConnector()
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelConnectorCloseTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorCloseTest.java
similarity index 94%
rename from jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelConnectorCloseTest.java
rename to jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorCloseTest.java
index b05561e7595..aaa6b5cf899 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelConnectorCloseTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorCloseTest.java
@@ -23,7 +23,7 @@ import org.junit.Before;
 
 
 /* ------------------------------------------------------------ */
-public class SelectChannelConnectorCloseTest extends ConnectorCloseTestBase
+public class ServerConnectorCloseTest extends ConnectorCloseTestBase
 {
     
     /* ------------------------------------------------------------ */
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelServerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorHttpServerTest.java
similarity index 94%
rename from jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelServerTest.java
rename to jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorHttpServerTest.java
index ea35c0f90ef..a94f9518bd6 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelServerTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorHttpServerTest.java
@@ -26,7 +26,7 @@ import org.junit.runner.RunWith;
  * HttpServer Tester.
  */
 @RunWith(AdvancedRunner.class)
-public class SelectChannelServerTest extends HttpServerTestBase
+public class ServerConnectorHttpServerTest extends HttpServerTestBase
 {
     @Before
     public void init() throws Exception
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorTimeoutTest.java
similarity index 98%
rename from jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java
rename to jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorTimeoutTest.java
index 44eeb75d17e..27e96c4d7bb 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorTimeoutTest.java
@@ -32,7 +32,7 @@ import org.eclipse.jetty.util.IO;
 import org.junit.Before;
 import org.junit.Test;
 
-public class SelectChannelTimeoutTest extends ConnectorTimeoutTest
+public class ServerConnectorTimeoutTest extends ConnectorTimeoutTest
 {
     @Before
     public void init() throws Exception