diff --git a/httpclient/src/test/java/org/apache/http/client/protocol/TestRedirects.java b/httpclient/src/test/java/org/apache/http/client/protocol/TestRedirects.java
index 278479a87..776d2552c 100644
--- a/httpclient/src/test/java/org/apache/http/client/protocol/TestRedirects.java
+++ b/httpclient/src/test/java/org/apache/http/client/protocol/TestRedirects.java
@@ -93,7 +93,7 @@ public class TestRedirects extends BasicServerTestBase {
         localServer.start();
     }
     
-    private class BasicRedirectService implements HttpRequestHandler {
+    private static class BasicRedirectService implements HttpRequestHandler {
         
         private int statuscode = HttpStatus.SC_MOVED_TEMPORARILY;
         private String host = null;
@@ -133,7 +133,7 @@ public class TestRedirects extends BasicServerTestBase {
         }
     }
 
-    private class CircularRedirectService implements HttpRequestHandler {
+    private static class CircularRedirectService implements HttpRequestHandler {
 
         public CircularRedirectService() {
             super();
@@ -157,7 +157,7 @@ public class TestRedirects extends BasicServerTestBase {
         }
     }
 
-    private class RelativeRedirectService implements HttpRequestHandler {
+    private static class RelativeRedirectService implements HttpRequestHandler {
         
         public RelativeRedirectService() {
             super();
@@ -182,7 +182,7 @@ public class TestRedirects extends BasicServerTestBase {
         }
     }
 
-    private class RelativeRedirectService2 implements HttpRequestHandler {
+    private static class RelativeRedirectService2 implements HttpRequestHandler {
         
         public RelativeRedirectService2() {
             super();
@@ -207,7 +207,7 @@ public class TestRedirects extends BasicServerTestBase {
         }
     }
 
-    private class BogusRedirectService implements HttpRequestHandler {
+    private static class BogusRedirectService implements HttpRequestHandler {
         private String url;
         
         public BogusRedirectService(String redirectUrl) {
diff --git a/httpclient/src/test/java/org/apache/http/client/protocol/TestUriEscapes.java b/httpclient/src/test/java/org/apache/http/client/protocol/TestUriEscapes.java
index 34ea3e8d4..ae1d15aa0 100644
--- a/httpclient/src/test/java/org/apache/http/client/protocol/TestUriEscapes.java
+++ b/httpclient/src/test/java/org/apache/http/client/protocol/TestUriEscapes.java
@@ -67,7 +67,7 @@ public class TestUriEscapes extends BasicServerTestBase {
         localServer.start();
     }
     
-    private class UriListeningService implements HttpRequestHandler {
+    private static class UriListeningService implements HttpRequestHandler {
         
         private volatile String requestedUri;
 
diff --git a/httpclient/src/test/java/org/apache/http/impl/client/TestDefaultClientRequestDirector.java b/httpclient/src/test/java/org/apache/http/impl/client/TestDefaultClientRequestDirector.java
index 63ca55da1..b879eaee8 100644
--- a/httpclient/src/test/java/org/apache/http/impl/client/TestDefaultClientRequestDirector.java
+++ b/httpclient/src/test/java/org/apache/http/impl/client/TestDefaultClientRequestDirector.java
@@ -328,7 +328,7 @@ public class TestDefaultClientRequestDirector extends BasicServerTestBase {
         }
     }
     
-   private class BasicRedirectService implements HttpRequestHandler {
+   private static class BasicRedirectService implements HttpRequestHandler {
         private int statuscode = HttpStatus.SC_SEE_OTHER;
         private int port;
 
@@ -584,7 +584,7 @@ public class TestDefaultClientRequestDirector extends BasicServerTestBase {
         
     }
 
-    private class SimpleService implements HttpRequestHandler {
+    private static class SimpleService implements HttpRequestHandler {
         
         public SimpleService() {
             super();
diff --git a/httpclient/src/test/java/org/apache/http/impl/client/TestRequestWrapper.java b/httpclient/src/test/java/org/apache/http/impl/client/TestRequestWrapper.java
index 8d14ce9e6..088a8c2d1 100644
--- a/httpclient/src/test/java/org/apache/http/impl/client/TestRequestWrapper.java
+++ b/httpclient/src/test/java/org/apache/http/impl/client/TestRequestWrapper.java
@@ -75,7 +75,7 @@ public class TestRequestWrapper extends BasicServerTestBase {
         localServer.start();
     }
     
-    private class SimpleService implements HttpRequestHandler {
+    private static class SimpleService implements HttpRequestHandler {
         
         public SimpleService() {
             super();
diff --git a/httpclient/src/test/java/org/apache/http/impl/client/TestStatefulConnManagement.java b/httpclient/src/test/java/org/apache/http/impl/client/TestStatefulConnManagement.java
index fa62c7605..31f802984 100644
--- a/httpclient/src/test/java/org/apache/http/impl/client/TestStatefulConnManagement.java
+++ b/httpclient/src/test/java/org/apache/http/impl/client/TestStatefulConnManagement.java
@@ -69,7 +69,7 @@ public class TestStatefulConnManagement extends ServerTestBase {
         return new TestSuite(TestStatefulConnManagement.class);
     }
     
-    private class SimpleService implements HttpRequestHandler {
+    private static class SimpleService implements HttpRequestHandler {
         
         public SimpleService() {
             super();