diff --git a/core/src/test/java/hudson/BulkChangeTest.java b/core/src/test/java/hudson/BulkChangeTest.java
index d7802fb8a05698765144ce7c8d8fb172010a4cf8..449e28d2fc16aba7bcfee2f0869642ebede7c078 100644
--- a/core/src/test/java/hudson/BulkChangeTest.java
+++ b/core/src/test/java/hudson/BulkChangeTest.java
@@ -41,6 +41,7 @@ public class BulkChangeTest extends TestCase {
          */
         int saveCount = 0;
 
+        @SuppressWarnings("unused")
         int x,y;
 
         public void setX(int x) throws IOException {
diff --git a/core/src/test/java/hudson/FilePathTest.java b/core/src/test/java/hudson/FilePathTest.java
index 26aeab23cb884c204158a1bd829bb0c07afc4633..c91ce8997887a51757596a566d296a5da9952ada 100644
--- a/core/src/test/java/hudson/FilePathTest.java
+++ b/core/src/test/java/hudson/FilePathTest.java
@@ -23,7 +23,6 @@
  */
 package hudson;
 
-import hudson.remoting.Future;
 import hudson.remoting.VirtualChannel;
 import hudson.util.IOException2;
 import hudson.util.NullStream;
@@ -102,7 +101,7 @@ public class FilePathTest extends ChannelTestCase {
 
         ExecutorService es = Executors.newFixedThreadPool(100);
         try {
-            List<java.util.concurrent.Future> r = new ArrayList<java.util.concurrent.Future>();
+            List<java.util.concurrent.Future<Object>> r = new ArrayList<java.util.concurrent.Future<Object>>();
             for (int i=0; i<100; i++) {
                 r.add(es.submit(new Callable<Object>() {
                     public Object call() throws Exception {
@@ -150,7 +149,7 @@ public class FilePathTest extends ChannelTestCase {
                 }));
             }
 
-            for (java.util.concurrent.Future f : r)
+            for (java.util.concurrent.Future<Object> f : r)
                 f.get();
         } finally {
             es.shutdown();
@@ -166,7 +165,7 @@ public class FilePathTest extends ChannelTestCase {
         try {
             assertTrue(src.mkdir());
             assertTrue(dst.mkdir());
-            File f = File.createTempFile("foo", ".tmp", src);
+            File.createTempFile("foo", ".tmp", src);
             FilePath fp = new FilePath(src);
             assertEquals(1, fp.copyRecursiveTo(new FilePath(dst)));
             // copy again should still report 1
diff --git a/core/src/test/java/hudson/LauncherTest.java b/core/src/test/java/hudson/LauncherTest.java
index 07d20a4b0865f2aae967d8026ce70f7e866b762c..b3a629109f68b69839bcd735200336a6ce99db83 100644
--- a/core/src/test/java/hudson/LauncherTest.java
+++ b/core/src/test/java/hudson/LauncherTest.java
@@ -70,8 +70,8 @@ public class LauncherTest extends ChannelTestCase {
         }
     }
 
-    private static final Callable<Object,RuntimeException> NOOP = new Callable() {
-        public Object call() throws Exception {
+    private static final Callable<Object,RuntimeException> NOOP = new Callable<Object,RuntimeException>() {
+        public Object call() throws RuntimeException {
             return null;
         }
     };