diff --git a/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java b/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
index 5f26ce1ad..9b9b0e9ea 100644
--- a/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
@@ -39,6 +39,7 @@ import org.junit.Test;
  *
  * @version $Id$
  */
+@SuppressWarnings("deprecation") // deliberate use of deprecated code
 public class ArrayUtilsTest  {
 
     //-----------------------------------------------------------------------
@@ -1243,7 +1244,7 @@ public class ArrayUtilsTest  {
 
     }
 
-    @Test
+	@Test
     public void testSubarrayFloat() {
         final float[] nullArray = null;
         final float[] array = { 10, 11, 12, 13, 14, 15 };
diff --git a/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java b/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java
index b9f3f6417..df86eeb9c 100644
--- a/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java
@@ -45,6 +45,7 @@ import org.junit.Test;
  *
  * @version $Id$
  */
+@SuppressWarnings("deprecation") // deliberate use of deprecated code
 public class ObjectUtilsTest {
     private static final String FOO = "foo";
     private static final String BAR = "bar";
diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsTest.java
index a120d504e..966c83862 100644
--- a/src/test/java/org/apache/commons/lang3/StringUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringUtilsTest.java
@@ -44,6 +44,7 @@ import org.junit.Test;
  *
  * @version $Id$
  */
+@SuppressWarnings("deprecation") // deliberate use of deprecated code
 public class StringUtilsTest {
     
     static final String WHITESPACE;
@@ -1304,7 +1305,6 @@ public class StringUtilsTest {
         }
     }
 
-    @SuppressWarnings("deprecation") // intentional test of deprecated method
     @Test
     public void testChomp() {
 
diff --git a/src/test/java/org/apache/commons/lang3/text/StrTokenizerTest.java b/src/test/java/org/apache/commons/lang3/text/StrTokenizerTest.java
index 8bf434bf3..998c9999e 100644
--- a/src/test/java/org/apache/commons/lang3/text/StrTokenizerTest.java
+++ b/src/test/java/org/apache/commons/lang3/text/StrTokenizerTest.java
@@ -18,7 +18,9 @@
 package org.apache.commons.lang3.text;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -31,6 +33,7 @@ import org.apache.commons.lang3.ObjectUtils;
  * Unit test for Tokenizer.
  * 
  */
+@SuppressWarnings("deprecation") // deliberate use of deprecated code
 public class StrTokenizerTest {
 
     private static final String CSV_SIMPLE_FIXTURE = "A,b,c";