diff --git a/core/src/test/java/hudson/AbstractChannelTest.java b/core/src/test/java/hudson/ChannelTestCase.java
similarity index 97%
rename from core/src/test/java/hudson/AbstractChannelTest.java
rename to core/src/test/java/hudson/ChannelTestCase.java
index 6d6a99ea0e..0f237ba46f 100644
--- a/core/src/test/java/hudson/AbstractChannelTest.java
+++ b/core/src/test/java/hudson/ChannelTestCase.java
@@ -16,7 +16,7 @@ import hudson.remoting.Channel;
  *
  * @author Kohsuke Kawaguchi
  */
-public class AbstractChannelTest extends TestCase {
+public class ChannelTestCase extends TestCase {
     /**
      * Two channels that are connected to each other, but shares the same classloader.
      */
diff --git a/core/src/test/java/hudson/FilePathTest.java b/core/src/test/java/hudson/FilePathTest.java
index 384e877fab..c1fc0a7463 100644
--- a/core/src/test/java/hudson/FilePathTest.java
+++ b/core/src/test/java/hudson/FilePathTest.java
@@ -23,24 +23,16 @@
  */
 package hudson;
 
-import junit.framework.TestCase;
-import hudson.remoting.Channel;
 import hudson.util.NullStream;
 
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
 import java.io.File;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Future;
 
 import org.apache.commons.io.output.NullOutputStream;
 
 /**
  * @author Kohsuke Kawaguchi
  */
-public class FilePathTest extends AbstractChannelTest {
+public class FilePathTest extends ChannelTestCase {
 
     public void testCopyTo() throws Exception {
         File tmp = File.createTempFile("testCopyTo","");
diff --git a/core/src/test/java/hudson/LauncherTest.java b/core/src/test/java/hudson/LauncherTest.java
index 10fd082bb5..429d107908 100644
--- a/core/src/test/java/hudson/LauncherTest.java
+++ b/core/src/test/java/hudson/LauncherTest.java
@@ -31,7 +31,7 @@ import org.apache.commons.io.FileUtils;
 
 import java.io.File;
 
-public class LauncherTest extends AbstractChannelTest {
+public class LauncherTest extends ChannelTestCase {
     //@Bug(4611)
     public void testRemoteKill() throws Exception {
         if (File.pathSeparatorChar != ':') {