diff --git a/src/test/org/apache/commons/lang/AllLangTestSuite.java b/src/test/org/apache/commons/lang/AllLangTestSuite.java
deleted file mode 100644
index 6704a0238..000000000
--- a/src/test/org/apache/commons/lang/AllLangTestSuite.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.lang;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.apache.commons.lang.builder.BuilderTestSuite;
-import org.apache.commons.lang.exception.ExceptionTestSuite;
-import org.apache.commons.lang.math.MathTestSuite;
-import org.apache.commons.lang.mutable.MutableTestSuite;
-import org.apache.commons.lang.reflect.ReflectTestSuite;
-import org.apache.commons.lang.text.TextTestSuite;
-import org.apache.commons.lang.time.TimeTestSuite;
-
-/**
- * Test suite for [lang].
- *
- * @author Stephen Colebourne
- * @version $Id$
- */
-public class AllLangTestSuite extends TestCase {
-
- /**
- * Construct a new instance.
- */
- public AllLangTestSuite(String name) {
- super(name);
- }
-
- /**
- * Command-line interface.
- */
- public static void main(String[] args) {
- TestRunner.run(suite());
- }
-
- /**
- * Get the suite of tests
- */
- public static Test suite() {
- TestSuite suite = new TestSuite();
- suite.setName("Commons-Lang (all) Tests");
- suite.addTest(LangTestSuite.suite());
- suite.addTest(BuilderTestSuite.suite());
- suite.addTest(ExceptionTestSuite.suite());
- suite.addTest(MathTestSuite.suite());
- suite.addTest(MutableTestSuite.suite());
- suite.addTest(ReflectTestSuite.suite());
- suite.addTest(TextTestSuite.suite());
- suite.addTest(TimeTestSuite.suite());
- return suite;
- }
-}
diff --git a/src/test/org/apache/commons/lang/LangTestSuite.java b/src/test/org/apache/commons/lang/LangTestSuite.java
deleted file mode 100644
index c313e94f1..000000000
--- a/src/test/org/apache/commons/lang/LangTestSuite.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.lang;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-/**
- * Test suite for the Lang package.
- *
- * @author Stephen Colebourne
- * @author Ringo De Smet
- * @author Matthew Hawthorne
- * @version $Id$
- */
-public class LangTestSuite extends TestCase {
-
- /**
- * Construct a new instance.
- */
- public LangTestSuite(String name) {
- super(name);
- }
-
- /**
- * Command-line interface.
- */
- public static void main(String[] args) {
- TestRunner.run(suite());
- }
-
- /**
- * Get the suite of tests
- */
- public static Test suite() {
- TestSuite suite = new TestSuite();
- suite.setName("Commons-Lang Tests");
- suite.addTest(ArrayUtilsTest.suite());
- suite.addTest(ArrayUtilsAddTest.suite());
- suite.addTest(ArrayUtilsRemoveTest.suite());
- suite.addTest(BitFieldTest.suite());
- suite.addTest(BooleanUtilsTest.suite());
- suite.addTest(CharEncodingTest.suite());
- suite.addTest(CharRangeTest.suite());
- suite.addTest(CharSetTest.suite());
- suite.addTest(CharSetUtilsTest.suite());
- suite.addTest(CharUtilsTest.suite());
- suite.addTest(ClassUtilsTest.suite());
- suite.addTest(EnumUtilsTest.suite());
- suite.addTest(IllegalClassExceptionTest.suite());
- suite.addTest(IncompleteArgumentExceptionTest.suite());
- suite.addTest(LocaleUtilsTest.suite());
- suite.addTest(NotImplementedExceptionTest.suite());
- suite.addTest(NullArgumentExceptionTest.suite());
- suite.addTest(ObjectUtilsTest.suite());
- suite.addTest(RandomStringUtilsTest.suite());
- suite.addTest(SerializationUtilsTest.suite());
- suite.addTest(StringUtilsTest.suite());
- suite.addTest(StringUtilsTrimEmptyTest.suite());
- suite.addTest(StringUtilsSubstringTest.suite());
- suite.addTest(StringUtilsEqualsIndexOfTest.suite());
- suite.addTest(StringUtilsIsTest.suite());
- suite.addTest(StringUtilsStartsEndsWithTest.suite());
- suite.addTest(StringEscapeUtilsTest.suite());
- suite.addTest(SystemUtilsTest.suite());
- suite.addTest(UnhandledExceptionTest.suite());
- suite.addTest(ValidateTest.suite());
- suite.addTest(WordUtilsTest.suite());
- return suite;
- }
-}
diff --git a/src/test/org/apache/commons/lang/builder/BuilderTestSuite.java b/src/test/org/apache/commons/lang/builder/BuilderTestSuite.java
deleted file mode 100644
index b6b7c1b5f..000000000
--- a/src/test/org/apache/commons/lang/builder/BuilderTestSuite.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.lang.builder;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-/**
- * Test suite for the Lang Builder package.
- *
- * @author Stephen Colebourne
- * @version $Id$
- */
-public class BuilderTestSuite extends TestCase {
-
- /**
- * Construct a new instance.
- */
- public BuilderTestSuite(String name) {
- super(name);
- }
-
- /**
- * Command-line interface.
- */
- public static void main(String[] args) {
- TestRunner.run(suite());
- }
-
- /**
- * Get the suite of tests
- */
- public static Test suite() {
- TestSuite suite = new TestSuite();
- suite.setName("Commons-Lang-Builder Tests");
- suite.addTestSuite(CompareToBuilderTest.class);
- suite.addTestSuite(EqualsBuilderTest.class);
- suite.addTestSuite(HashCodeBuilderTest.class);
- suite.addTestSuite(HashCodeBuilderAndEqualsBuilderTest.class);
- suite.addTestSuite(ToStringBuilderTest.class);
- suite.addTestSuite(DefaultToStringStyleTest.class);
- suite.addTestSuite(NoFieldNamesToStringStyleTest.class);
- suite.addTestSuite(MultiLineToStringStyleTest.class);
- suite.addTestSuite(ReflectionToStringBuilderExcludeTest.class);
- suite.addTestSuite(ShortPrefixToStringStyleTest.class);
- suite.addTestSuite(SimpleToStringStyleTest.class);
- suite.addTestSuite(StandardToStringStyleTest.class);
- suite.addTestSuite(ToStringStyleTest.class);
- return suite;
- }
-}
diff --git a/src/test/org/apache/commons/lang/exception/ExceptionTestSuite.java b/src/test/org/apache/commons/lang/exception/ExceptionTestSuite.java
deleted file mode 100644
index 96d023018..000000000
--- a/src/test/org/apache/commons/lang/exception/ExceptionTestSuite.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.lang.exception;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-/**
- * Test manager for the org.apache.commons.lang.exception classes.
- *
- * @author Steven Caswell
- */
-public class ExceptionTestSuite extends TestCase
-{
- /**
- * Construct a new instance.
- */
- public ExceptionTestSuite(String name)
- {
- super(name);
- }
-
- /**
- * Command-line interface.
- */
- public static void main(String[] args)
- {
- TestRunner.run(suite());
- }
-
- public static Test suite()
- {
- TestSuite suite = new TestSuite();
- suite.addTest(ExceptionUtilsTest.suite());
- return suite;
- }
-}
diff --git a/src/test/org/apache/commons/lang/math/MathTestSuite.java b/src/test/org/apache/commons/lang/math/MathTestSuite.java
deleted file mode 100644
index 2c685dccd..000000000
--- a/src/test/org/apache/commons/lang/math/MathTestSuite.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.lang.math;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-/**
- * Test suite for the Math package.
- *
- * @author Stephen Colebourne
- * @version $Id$
- */
-public class MathTestSuite extends TestCase {
-
- /**
- * Construct a new instance.
- */
- public MathTestSuite(String name) {
- super(name);
- }
-
- /**
- * Command-line interface.
- */
- public static void main(String[] args) {
- TestRunner.run(suite());
- }
-
- /**
- * Get the suite of tests
- */
- public static Test suite() {
- TestSuite suite = new TestSuite();
- suite.setName("Commons-Lang-Math Tests");
- suite.addTest(DoubleRangeTest.suite());
- suite.addTest(FloatRangeTest.suite());
- suite.addTest(FractionTest.suite());
- suite.addTest(IntRangeTest.suite());
- suite.addTest(LongRangeTest.suite());
- suite.addTest(NumberRangeTest.suite());
- suite.addTest(NumberUtilsTest.suite());
- suite.addTest(RangeTest.suite());
- return suite;
- }
-}
diff --git a/src/test/org/apache/commons/lang/mutable/MutableTestSuite.java b/src/test/org/apache/commons/lang/mutable/MutableTestSuite.java
deleted file mode 100644
index c39210cc1..000000000
--- a/src/test/org/apache/commons/lang/mutable/MutableTestSuite.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.lang.mutable;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-/**
- * JUnit tests.
- *
- * @version $Id$
- */
-public class MutableTestSuite extends TestCase {
-
- public static void main(String[] args) {
- TestRunner.run(suite());
- }
-
- public MutableTestSuite(String name) {
- super(name);
- }
-
- public static Test suite() {
- final TestSuite suite = new TestSuite();
-
- suite.addTest(MutableBooleanTest.suite());
- suite.addTest(MutableByteTest.suite());
- suite.addTest(MutableShortTest.suite());
- suite.addTest(MutableIntTest.suite());
- suite.addTest(MutableLongTest.suite());
- suite.addTest(MutableFloatTest.suite());
- suite.addTest(MutableDoubleTest.suite());
- suite.addTest(MutableObjectTest.suite());
-
- return suite;
- }
-
-}
diff --git a/src/test/org/apache/commons/lang/reflect/ReflectTestSuite.java b/src/test/org/apache/commons/lang/reflect/ReflectTestSuite.java
deleted file mode 100644
index 113bce8b3..000000000
--- a/src/test/org/apache/commons/lang/reflect/ReflectTestSuite.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.lang.reflect;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-/**
- * Test suite for the reflect package.
- *
- * @author Matt Benson
- * @version $Id$
- */
-public class ReflectTestSuite extends TestCase {
-
- /**
- * Construct a new instance.
- */
- public ReflectTestSuite(String name) {
- super(name);
- }
-
- /**
- * Command-line interface.
- */
- public static void main(String[] args) {
- TestRunner.run(suite());
- }
-
- /**
- * Get the suite of tests
- */
- public static Test suite() {
- TestSuite suite = new TestSuite();
- suite.setName("Commons-Lang-Reflect Tests");
- suite.addTest(ConstructorUtilsTest.suite());
- suite.addTest(FieldUtilsTest.suite());
- suite.addTest(MethodUtilsTest.suite());
- return suite;
- }
-
-}
diff --git a/src/test/org/apache/commons/lang/text/TextTestSuite.java b/src/test/org/apache/commons/lang/text/TextTestSuite.java
deleted file mode 100644
index 6d58b0c17..000000000
--- a/src/test/org/apache/commons/lang/text/TextTestSuite.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.lang.text;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-/**
- * Test suite for the Text package.
- *
- * @author Stephen Colebourne
- * @version $Id$
- */
-public class TextTestSuite extends TestCase {
-
- /**
- * Construct a new instance.
- */
- public TextTestSuite(String name) {
- super(name);
- }
-
- /**
- * Command-line interface.
- */
- public static void main(String[] args) {
- TestRunner.run(suite());
- }
-
- /**
- * Get the suite of tests
- */
- public static Test suite() {
- TestSuite suite = new TestSuite();
- suite.setName("Commons-Lang-Text Tests");
- suite.addTest(CompositeFormatTest.suite());
- suite.addTest(ExtendedMessageFormatTest.suite());
- suite.addTest(StrBuilderTest.suite());
- suite.addTest(StrBuilderAppendInsertTest.suite());
- suite.addTest(StrLookupTest.suite());
- suite.addTest(StrMatcherTest.suite());
- suite.addTest(StrSubstitutorTest.suite());
- suite.addTest(StrTokenizerTest.suite());
- return suite;
- }
-
-}
diff --git a/src/test/org/apache/commons/lang/time/TimeTestSuite.java b/src/test/org/apache/commons/lang/time/TimeTestSuite.java
deleted file mode 100644
index d56a9a731..000000000
--- a/src/test/org/apache/commons/lang/time/TimeTestSuite.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.lang.time;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-/**
- * Test suite for the Time package.
- *
- * @author Stephen Colebourne
- * @version $Id$
- */
-public class TimeTestSuite extends TestCase {
-
- /**
- * Construct a new instance.
- */
- public TimeTestSuite(String name) {
- super(name);
- }
-
- /**
- * Command-line interface.
- */
- public static void main(String[] args) {
- TestRunner.run(suite());
- }
-
- /**
- * Get the suite of tests
- */
- public static Test suite() {
- TestSuite suite = new TestSuite();
- suite.setName("Commons-Lang-Time Tests");
- suite.addTest(DateUtilsTest.suite());
- suite.addTest(DateFormatUtilsTest.suite());
- suite.addTest(DurationFormatUtilsTest.suite());
- suite.addTest(StopWatchTest.suite());
- suite.addTest(FastDateFormatTest.suite());
- suite.addTest(DateUtilsFragmentTest.suite());
- suite.addTest(DateUtilsRoundingTest.suite());
- return suite;
- }
-}