diff --git a/module-client/src/test/java/org/apache/http/client/methods/TestHttpOptions.java b/module-client/src/test/java/org/apache/http/client/methods/TestHttpOptions.java
index 00489d0b7..41b358f57 100644
--- a/module-client/src/test/java/org/apache/http/client/methods/TestHttpOptions.java
+++ b/module-client/src/test/java/org/apache/http/client/methods/TestHttpOptions.java
@@ -30,7 +30,6 @@
 
 package org.apache.http.client.methods;
 
-import java.io.IOException;
 import java.util.Set;
 
 import junit.framework.Test;
@@ -44,7 +43,7 @@ import org.apache.http.message.BasicStatusLine;
 public class TestHttpOptions extends TestCase {
 
     // ------------------------------------------------------------ Constructor
-    public TestHttpOptions(final String testName) throws IOException {
+    public TestHttpOptions(final String testName) {
         super(testName);
     }
 
diff --git a/module-client/src/test/java/org/apache/http/client/methods/TestHttpRequestBase.java b/module-client/src/test/java/org/apache/http/client/methods/TestHttpRequestBase.java
index 7ab3106e9..740dde0de 100644
--- a/module-client/src/test/java/org/apache/http/client/methods/TestHttpRequestBase.java
+++ b/module-client/src/test/java/org/apache/http/client/methods/TestHttpRequestBase.java
@@ -31,7 +31,6 @@
 package org.apache.http.client.methods;
 
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
 
 import org.apache.http.Header;
 import org.apache.http.HttpVersion;
@@ -47,7 +46,7 @@ import junit.framework.TestSuite;
 public class TestHttpRequestBase extends TestCase {
 
     // ------------------------------------------------------------ Constructor
-    public TestHttpRequestBase(final String testName) throws IOException {
+    public TestHttpRequestBase(final String testName) {
         super(testName);
     }
 
diff --git a/module-client/src/test/java/org/apache/http/client/protocol/TestCookie2Support.java b/module-client/src/test/java/org/apache/http/client/protocol/TestCookie2Support.java
index 06233f643..35cde2513 100644
--- a/module-client/src/test/java/org/apache/http/client/protocol/TestCookie2Support.java
+++ b/module-client/src/test/java/org/apache/http/client/protocol/TestCookie2Support.java
@@ -61,14 +61,12 @@ import org.apache.http.protocol.HttpRequestHandler;
 /**
  * Cookie2 support tests.
  *
- * @author Oleg Kalnichevski
- * 
  * @version $Revision$
  */
 public class TestCookie2Support extends ServerTestBase {
 
     // ------------------------------------------------------------ Constructor
-    public TestCookie2Support(final String testName) throws IOException {
+    public TestCookie2Support(final String testName) {
         super(testName);
     }
 
diff --git a/module-client/src/test/java/org/apache/http/client/protocol/TestRedirects.java b/module-client/src/test/java/org/apache/http/client/protocol/TestRedirects.java
index f85fc0a27..7e77cf700 100644
--- a/module-client/src/test/java/org/apache/http/client/protocol/TestRedirects.java
+++ b/module-client/src/test/java/org/apache/http/client/protocol/TestRedirects.java
@@ -68,14 +68,12 @@ import junit.framework.TestSuite;
 /**
  * Redirection test cases.
  *
- * @author Oleg Kalnichevski
- * 
  * @version $Revision$
  */
 public class TestRedirects extends ServerTestBase {
 
     // ------------------------------------------------------------ Constructor
-    public TestRedirects(final String testName) throws IOException {
+    public TestRedirects(final String testName) {
         super(testName);
     }
 
diff --git a/module-client/src/test/java/org/apache/http/client/protocol/TestUriEscapes.java b/module-client/src/test/java/org/apache/http/client/protocol/TestUriEscapes.java
index 029035145..78bfe3337 100644
--- a/module-client/src/test/java/org/apache/http/client/protocol/TestUriEscapes.java
+++ b/module-client/src/test/java/org/apache/http/client/protocol/TestUriEscapes.java
@@ -49,7 +49,7 @@ import org.apache.http.protocol.HttpRequestHandler;
 
 public class TestUriEscapes extends ServerTestBase {
 
-    public TestUriEscapes(final String testName) throws IOException {
+    public TestUriEscapes(final String testName) {
         super(testName);
     }
 
diff --git a/module-client/src/test/java/org/apache/http/impl/auth/TestBasicScheme.java b/module-client/src/test/java/org/apache/http/impl/auth/TestBasicScheme.java
index a182ed767..431027c2a 100644
--- a/module-client/src/test/java/org/apache/http/impl/auth/TestBasicScheme.java
+++ b/module-client/src/test/java/org/apache/http/impl/auth/TestBasicScheme.java
@@ -29,8 +29,6 @@
 
 package org.apache.http.impl.auth;
 
-import java.io.IOException;
-
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
@@ -49,14 +47,12 @@ import org.apache.http.util.EncodingUtils;
 /**
  * Basic authentication test cases.
  *
- * @author Oleg Kalnichevski
- * 
  * @version $Id$
  */
 public class TestBasicScheme extends TestCase {
 
     // ------------------------------------------------------------ Constructor
-    public TestBasicScheme(final String testName) throws IOException {
+    public TestBasicScheme(final String testName) {
         super(testName);
     }
 
diff --git a/module-client/src/test/java/org/apache/http/impl/client/TestDefaultClientRequestDirector.java b/module-client/src/test/java/org/apache/http/impl/client/TestDefaultClientRequestDirector.java
index c1117e324..22b105d41 100644
--- a/module-client/src/test/java/org/apache/http/impl/client/TestDefaultClientRequestDirector.java
+++ b/module-client/src/test/java/org/apache/http/impl/client/TestDefaultClientRequestDirector.java
@@ -85,7 +85,7 @@ import org.apache.http.protocol.HttpRequestHandler;
  */
 public class TestDefaultClientRequestDirector extends ServerTestBase {
 
-    public TestDefaultClientRequestDirector(final String testName) throws IOException {
+    public TestDefaultClientRequestDirector(final String testName) {
         super(testName);
     }
 
@@ -428,8 +428,7 @@ public class TestDefaultClientRequestDirector extends ServerTestBase {
             throw new UnsupportedOperationException("just a mockup");   
         }
 
-        public ManagedClientConnection getConnection(HttpRoute route)
-                throws InterruptedException {
+        public ManagedClientConnection getConnection(HttpRoute route) {
             throw new UnsupportedOperationException("just a mockup");
         }
 
@@ -500,8 +499,7 @@ public class TestDefaultClientRequestDirector extends ServerTestBase {
             throw new UnsupportedOperationException("just a mockup");            
         }
 
-        public ManagedClientConnection getConnection(HttpRoute route)
-                throws InterruptedException {
+        public ManagedClientConnection getConnection(HttpRoute route) {
             throw new UnsupportedOperationException("just a mockup");
         }
 
diff --git a/module-client/src/test/java/org/apache/http/impl/client/TestDefaultConnKeepAliveStrategy.java b/module-client/src/test/java/org/apache/http/impl/client/TestDefaultConnKeepAliveStrategy.java
index 1119fe20c..3fbc67cb1 100644
--- a/module-client/src/test/java/org/apache/http/impl/client/TestDefaultConnKeepAliveStrategy.java
+++ b/module-client/src/test/java/org/apache/http/impl/client/TestDefaultConnKeepAliveStrategy.java
@@ -29,8 +29,6 @@
 
 package org.apache.http.impl.client;
 
-import java.io.IOException;
-
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
@@ -52,7 +50,7 @@ import org.apache.http.protocol.HttpContext;
 public class TestDefaultConnKeepAliveStrategy extends TestCase {
 
     // ------------------------------------------------------------ Constructor
-    public TestDefaultConnKeepAliveStrategy(final String testName) throws IOException {
+    public TestDefaultConnKeepAliveStrategy(final String testName) {
         super(testName);
     }
 
diff --git a/module-client/src/test/java/org/apache/http/impl/client/TestRequestWrapper.java b/module-client/src/test/java/org/apache/http/impl/client/TestRequestWrapper.java
index cba50c4f3..c1c97149f 100644
--- a/module-client/src/test/java/org/apache/http/impl/client/TestRequestWrapper.java
+++ b/module-client/src/test/java/org/apache/http/impl/client/TestRequestWrapper.java
@@ -55,7 +55,7 @@ import org.apache.http.protocol.HttpRequestHandler;
 public class TestRequestWrapper extends ServerTestBase {
 
     // ------------------------------------------------------------ Constructor
-    public TestRequestWrapper(final String testName) throws IOException {
+    public TestRequestWrapper(final String testName) {
         super(testName);
     }
 
diff --git a/module-client/src/test/java/org/apache/http/impl/client/TestStatefulConnManagement.java b/module-client/src/test/java/org/apache/http/impl/client/TestStatefulConnManagement.java
index 522bbe111..e61402272 100644
--- a/module-client/src/test/java/org/apache/http/impl/client/TestStatefulConnManagement.java
+++ b/module-client/src/test/java/org/apache/http/impl/client/TestStatefulConnManagement.java
@@ -59,7 +59,7 @@ import org.apache.http.protocol.HttpRequestHandler;
  */
 public class TestStatefulConnManagement extends ServerTestBase {
 
-    public TestStatefulConnManagement(final String testName) throws IOException {
+    public TestStatefulConnManagement(final String testName) {
         super(testName);
     }
 
diff --git a/module-client/src/test/java/org/apache/http/impl/cookie/TestAbstractCookieSpec.java b/module-client/src/test/java/org/apache/http/impl/cookie/TestAbstractCookieSpec.java
index 37d7a155b..21f821c54 100644
--- a/module-client/src/test/java/org/apache/http/impl/cookie/TestAbstractCookieSpec.java
+++ b/module-client/src/test/java/org/apache/http/impl/cookie/TestAbstractCookieSpec.java
@@ -30,7 +30,6 @@
 
 package org.apache.http.impl.cookie;
 
-import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
 
@@ -102,7 +101,7 @@ public class TestAbstractCookieSpec extends TestCase {
         
     }
     
-    public void testSimpleRegisterAndGet() throws IOException {
+    public void testSimpleRegisterAndGet() {
         CookieAttributeHandler h1 = new DummyCookieAttribHandler();
         CookieAttributeHandler h2 = new DummyCookieAttribHandler();
         
@@ -125,7 +124,7 @@ public class TestAbstractCookieSpec extends TestCase {
         assertFalse(it.hasNext());
     }
 
-    public void testInvalidHandler() throws IOException {
+    public void testInvalidHandler() {
         CookieAttributeHandler h1 = new DummyCookieAttribHandler();
         CookieAttributeHandler h2 = new DummyCookieAttribHandler();
         
diff --git a/module-httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartContentBody.java b/module-httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartContentBody.java
index ab87fdbec..81bf43e2d 100644
--- a/module-httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartContentBody.java
+++ b/module-httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartContentBody.java
@@ -32,7 +32,6 @@
 package org.apache.http.entity.mime;
 
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.nio.charset.Charset;
 
 import junit.framework.Test;
@@ -45,7 +44,7 @@ import org.apache.http.entity.mime.content.StringBody;
 public class TestMultipartContentBody extends TestCase {
 
     // ------------------------------------------------------------ Constructor
-    public TestMultipartContentBody(final String testName) throws IOException {
+    public TestMultipartContentBody(final String testName) {
         super(testName);
     }
 
diff --git a/module-httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartForm.java b/module-httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartForm.java
index 12d1d9803..2fb3dae94 100644
--- a/module-httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartForm.java
+++ b/module-httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartForm.java
@@ -35,7 +35,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileWriter;
-import java.io.IOException;
 import java.io.Writer;
 import java.nio.charset.Charset;
 
@@ -57,7 +56,7 @@ import org.apache.james.mime4j.message.Message;
 public class TestMultipartForm extends TestCase {
 
     // ------------------------------------------------------------ Constructor
-    public TestMultipartForm(final String testName) throws IOException {
+    public TestMultipartForm(final String testName) {
         super(testName);
     }
 
diff --git a/module-httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartFormHttpEntity.java b/module-httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartFormHttpEntity.java
index 40c7960e4..54843360e 100644
--- a/module-httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartFormHttpEntity.java
+++ b/module-httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartFormHttpEntity.java
@@ -33,7 +33,6 @@ package org.apache.http.entity.mime;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 
 import org.apache.http.Header;
 import org.apache.http.HeaderElement;
@@ -51,7 +50,7 @@ import junit.framework.TestSuite;
 public class TestMultipartFormHttpEntity extends TestCase {
 
     // ------------------------------------------------------------ Constructor
-    public TestMultipartFormHttpEntity(final String testName) throws IOException {
+    public TestMultipartFormHttpEntity(final String testName) {
         super(testName);
     }