diff --git a/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java b/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java
index af16ba927..d628cae9e 100644
--- a/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java
+++ b/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java
@@ -176,7 +176,7 @@ public class TestSSLSocketFactory {
 
     @Test
     public void testClientAuthSSLAliasChoice() throws Exception {
-    	// TODO unused - is there a bug in the test?
+        // TODO unused - is there a bug in the test?
         final PrivateKeyStrategy aliasStrategy = new PrivateKeyStrategy() {
 
             @Override
diff --git a/httpclient/src/test/java/org/apache/http/impl/auth/TestRFC2617Scheme.java b/httpclient/src/test/java/org/apache/http/impl/auth/TestRFC2617Scheme.java
index 9d45f05aa..eb24477cf 100644
--- a/httpclient/src/test/java/org/apache/http/impl/auth/TestRFC2617Scheme.java
+++ b/httpclient/src/test/java/org/apache/http/impl/auth/TestRFC2617Scheme.java
@@ -50,9 +50,9 @@ public class TestRFC2617Scheme {
 
     static class TestAuthScheme extends RFC2617Scheme {
 
-		private static final long serialVersionUID = 1L;
+        private static final long serialVersionUID = 1L;
 
-		public TestAuthScheme() {
+        public TestAuthScheme() {
             super();
         }
 
diff --git a/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientReauthentication.java b/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientReauthentication.java
index 3a4e3939a..e9897c5b0 100644
--- a/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientReauthentication.java
+++ b/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientReauthentication.java
@@ -162,9 +162,9 @@ public class TestClientReauthentication extends LocalServerTestBase {
             @Override
             public AuthScheme create(final HttpContext context) {
                 return new BasicScheme() {
-					private static final long serialVersionUID = 1L;
+                    private static final long serialVersionUID = 1L;
 
-					@Override
+                    @Override
                     public String getSchemeName() {
                         return "MyBasic";
                     }
diff --git a/httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartContentBody.java b/httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartContentBody.java
index 4a6fac22f..6c5a6e210 100644
--- a/httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartContentBody.java
+++ b/httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartContentBody.java
@@ -67,12 +67,12 @@ public class TestMultipartContentBody {
 
     @Test(expected=IllegalArgumentException.class)
     public void testStringBodyInvalidConstruction1() throws Exception {
-    	Assert.assertNotNull(new StringBody(null, ContentType.DEFAULT_TEXT)); // avoid unused warning
+        Assert.assertNotNull(new StringBody(null, ContentType.DEFAULT_TEXT)); // avoid unused warning
     }
 
     @Test(expected=IllegalArgumentException.class)
     public void testStringBodyInvalidConstruction2() throws Exception {
-    	Assert.assertNotNull(new StringBody("stuff", (ContentType) null)); // avoid unused warning
+        Assert.assertNotNull(new StringBody("stuff", (ContentType) null)); // avoid unused warning
     }
 
     @Test