diff --git a/pom.xml b/pom.xml
index 0f8005b92..020bf6152 100644
--- a/pom.xml
+++ b/pom.xml
@@ -401,11 +401,10 @@
 
   <!-- Lang should depend on very little -->
   <dependencies>
-    <!-- TODO: replace with TestNG -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.2</version>
+      <version>4.7</version>
       <scope>test</scope>
     </dependency>
   </dependencies> 
diff --git a/src/test/org/apache/commons/lang/CharUtilsPerfTest.java b/src/test/org/apache/commons/lang/CharUtilsPerfRun.java
similarity index 98%
rename from src/test/org/apache/commons/lang/CharUtilsPerfTest.java
rename to src/test/org/apache/commons/lang/CharUtilsPerfRun.java
index 75da8db87..b410ef432 100644
--- a/src/test/org/apache/commons/lang/CharUtilsPerfTest.java
+++ b/src/test/org/apache/commons/lang/CharUtilsPerfRun.java
@@ -56,7 +56,7 @@ run_inlined_CharUtils_isAsciiNumeric: 84,420 milliseconds.
 
  * @version $Id$
  */
-public class CharUtilsPerfTest {
+public class CharUtilsPerfRun {
     final static String VERSION = "$Id$";
 
     final static int WARM_UP = 100;
@@ -72,7 +72,7 @@ public class CharUtilsPerfTest {
     }
 
     public static void main(String[] args) {
-        new CharUtilsPerfTest().run();
+        new CharUtilsPerfRun().run();
     }
 
     private void printSysInfo() {
diff --git a/src/test/org/apache/commons/lang/SerializationUtilsTest.java b/src/test/org/apache/commons/lang/SerializationUtilsTest.java
index 050a686ed..90a41de4d 100644
--- a/src/test/org/apache/commons/lang/SerializationUtilsTest.java
+++ b/src/test/org/apache/commons/lang/SerializationUtilsTest.java
@@ -42,7 +42,7 @@ import junit.textui.TestRunner;
  */
 public class SerializationUtilsTest extends TestCase {
 
-  static final String CLASS_NOT_FOUND_MESSAGE = "ClassNotFoundSerializationTest.readObject fake exception";
+  static final String CLASS_NOT_FOUND_MESSAGE = "ClassNotFoundSerialization.readObject fake exception";
     protected static final String SERIALIZE_IO_EXCEPTION_MESSAGE = "Anonymous OutputStream I/O exception";
   
     private String iString;
@@ -252,7 +252,7 @@ public class SerializationUtilsTest extends TestCase {
     public void testDeserializeStreamClassNotFound() throws Exception {
         ByteArrayOutputStream streamReal = new ByteArrayOutputStream();
         ObjectOutputStream oos = new ObjectOutputStream(streamReal);
-        oos.writeObject(new ClassNotFoundSerializationTest());
+        oos.writeObject(new ClassNotFoundSerialization());
         oos.flush();
         oos.close();
 
@@ -391,10 +391,10 @@ public class SerializationUtilsTest extends TestCase {
 
 }
 
-class ClassNotFoundSerializationTest implements Serializable
+class ClassNotFoundSerialization implements Serializable
 {
 
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException    {
         throw new ClassNotFoundException(SerializationUtilsTest.CLASS_NOT_FOUND_MESSAGE);
     }
-}
\ No newline at end of file
+}