diff --git a/src/test/org/apache/commons/math/analysis/RombergIntegratorTest.java b/src/test/org/apache/commons/math/analysis/integration/RombergIntegratorTest.java
similarity index 94%
rename from src/test/org/apache/commons/math/analysis/RombergIntegratorTest.java
rename to src/test/org/apache/commons/math/analysis/integration/RombergIntegratorTest.java
index 1654b815c..5d727381f 100644
--- a/src/test/org/apache/commons/math/analysis/RombergIntegratorTest.java
+++ b/src/test/org/apache/commons/math/analysis/integration/RombergIntegratorTest.java
@@ -14,9 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis;
+package org.apache.commons.math.analysis.integration;
 
 import org.apache.commons.math.MathException;
+import org.apache.commons.math.analysis.QuinticFunction;
+import org.apache.commons.math.analysis.SinFunction;
+import org.apache.commons.math.analysis.UnivariateRealFunction;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/test/org/apache/commons/math/analysis/SimpsonIntegratorTest.java b/src/test/org/apache/commons/math/analysis/integration/SimpsonIntegratorTest.java
similarity index 94%
rename from src/test/org/apache/commons/math/analysis/SimpsonIntegratorTest.java
rename to src/test/org/apache/commons/math/analysis/integration/SimpsonIntegratorTest.java
index df303d482..f50445cd3 100644
--- a/src/test/org/apache/commons/math/analysis/SimpsonIntegratorTest.java
+++ b/src/test/org/apache/commons/math/analysis/integration/SimpsonIntegratorTest.java
@@ -14,9 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis;
+package org.apache.commons.math.analysis.integration;
 
 import org.apache.commons.math.MathException;
+import org.apache.commons.math.analysis.QuinticFunction;
+import org.apache.commons.math.analysis.SinFunction;
+import org.apache.commons.math.analysis.UnivariateRealFunction;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/test/org/apache/commons/math/analysis/TrapezoidIntegratorTest.java b/src/test/org/apache/commons/math/analysis/integration/TrapezoidIntegratorTest.java
similarity index 94%
rename from src/test/org/apache/commons/math/analysis/TrapezoidIntegratorTest.java
rename to src/test/org/apache/commons/math/analysis/integration/TrapezoidIntegratorTest.java
index 938045b85..4c6a3bd45 100644
--- a/src/test/org/apache/commons/math/analysis/TrapezoidIntegratorTest.java
+++ b/src/test/org/apache/commons/math/analysis/integration/TrapezoidIntegratorTest.java
@@ -14,9 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis;
+package org.apache.commons.math.analysis.integration;
 
 import org.apache.commons.math.MathException;
+import org.apache.commons.math.analysis.QuinticFunction;
+import org.apache.commons.math.analysis.SinFunction;
+import org.apache.commons.math.analysis.UnivariateRealFunction;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/test/org/apache/commons/math/analysis/DividedDifferenceInterpolatorTest.java b/src/test/org/apache/commons/math/analysis/interpolation/DividedDifferenceInterpolatorTest.java
similarity index 95%
rename from src/test/org/apache/commons/math/analysis/DividedDifferenceInterpolatorTest.java
rename to src/test/org/apache/commons/math/analysis/interpolation/DividedDifferenceInterpolatorTest.java
index 32cd52be7..3ef2311b3 100644
--- a/src/test/org/apache/commons/math/analysis/DividedDifferenceInterpolatorTest.java
+++ b/src/test/org/apache/commons/math/analysis/interpolation/DividedDifferenceInterpolatorTest.java
@@ -14,9 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis;
+package org.apache.commons.math.analysis.interpolation;
 
 import org.apache.commons.math.MathException;
+import org.apache.commons.math.analysis.Expm1Function;
+import org.apache.commons.math.analysis.SinFunction;
+import org.apache.commons.math.analysis.UnivariateRealFunction;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/test/org/apache/commons/math/analysis/NevilleInterpolatorTest.java b/src/test/org/apache/commons/math/analysis/interpolation/NevilleInterpolatorTest.java
similarity index 95%
rename from src/test/org/apache/commons/math/analysis/NevilleInterpolatorTest.java
rename to src/test/org/apache/commons/math/analysis/interpolation/NevilleInterpolatorTest.java
index 84a3c5855..a0453961f 100644
--- a/src/test/org/apache/commons/math/analysis/NevilleInterpolatorTest.java
+++ b/src/test/org/apache/commons/math/analysis/interpolation/NevilleInterpolatorTest.java
@@ -14,9 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis;
+package org.apache.commons.math.analysis.interpolation;
 
 import org.apache.commons.math.MathException;
+import org.apache.commons.math.analysis.Expm1Function;
+import org.apache.commons.math.analysis.SinFunction;
+import org.apache.commons.math.analysis.UnivariateRealFunction;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/test/org/apache/commons/math/analysis/SplineInterpolatorTest.java b/src/test/org/apache/commons/math/analysis/interpolation/SplineInterpolatorTest.java
similarity index 97%
rename from src/test/org/apache/commons/math/analysis/SplineInterpolatorTest.java
rename to src/test/org/apache/commons/math/analysis/interpolation/SplineInterpolatorTest.java
index 99d27ba7a..887de3f5c 100644
--- a/src/test/org/apache/commons/math/analysis/SplineInterpolatorTest.java
+++ b/src/test/org/apache/commons/math/analysis/interpolation/SplineInterpolatorTest.java
@@ -14,10 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis;
+package org.apache.commons.math.analysis.interpolation;
 
 import org.apache.commons.math.MathException;
 import org.apache.commons.math.TestUtils;
+import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.polynomials.PolynomialFunction;
+import org.apache.commons.math.analysis.polynomials.PolynomialSplineFunction;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
diff --git a/src/test/org/apache/commons/math/analysis/PolynomialFunctionLagrangeFormTest.java b/src/test/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeFormTest.java
similarity index 98%
rename from src/test/org/apache/commons/math/analysis/PolynomialFunctionLagrangeFormTest.java
rename to src/test/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeFormTest.java
index 4906f289f..0aea230f8 100644
--- a/src/test/org/apache/commons/math/analysis/PolynomialFunctionLagrangeFormTest.java
+++ b/src/test/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeFormTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis;
+package org.apache.commons.math.analysis.polynomials;
 
 import org.apache.commons.math.MathException;
 import junit.framework.TestCase;
diff --git a/src/test/org/apache/commons/math/analysis/PolynomialFunctionNewtonFormTest.java b/src/test/org/apache/commons/math/analysis/polynomials/PolynomialFunctionNewtonFormTest.java
similarity index 98%
rename from src/test/org/apache/commons/math/analysis/PolynomialFunctionNewtonFormTest.java
rename to src/test/org/apache/commons/math/analysis/polynomials/PolynomialFunctionNewtonFormTest.java
index 005c79f6e..d415e15e4 100644
--- a/src/test/org/apache/commons/math/analysis/PolynomialFunctionNewtonFormTest.java
+++ b/src/test/org/apache/commons/math/analysis/polynomials/PolynomialFunctionNewtonFormTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis;
+package org.apache.commons.math.analysis.polynomials;
 
 import org.apache.commons.math.MathException;
 import junit.framework.TestCase;
diff --git a/src/test/org/apache/commons/math/analysis/PolynomialFunctionTest.java b/src/test/org/apache/commons/math/analysis/polynomials/PolynomialFunctionTest.java
similarity index 99%
rename from src/test/org/apache/commons/math/analysis/PolynomialFunctionTest.java
rename to src/test/org/apache/commons/math/analysis/polynomials/PolynomialFunctionTest.java
index 8bb069369..343ad1dce 100644
--- a/src/test/org/apache/commons/math/analysis/PolynomialFunctionTest.java
+++ b/src/test/org/apache/commons/math/analysis/polynomials/PolynomialFunctionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis;
+package org.apache.commons.math.analysis.polynomials;
 
 // commons-math
 import org.apache.commons.math.MathException;
diff --git a/src/test/org/apache/commons/math/analysis/PolynomialSplineFunctionTest.java b/src/test/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunctionTest.java
similarity index 97%
rename from src/test/org/apache/commons/math/analysis/PolynomialSplineFunctionTest.java
rename to src/test/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunctionTest.java
index 926e81ce4..1bb39a1c2 100644
--- a/src/test/org/apache/commons/math/analysis/PolynomialSplineFunctionTest.java
+++ b/src/test/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunctionTest.java
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis;
+package org.apache.commons.math.analysis.polynomials;
 
 import java.util.Arrays;
 import junit.framework.TestCase;
 
 import org.apache.commons.math.FunctionEvaluationException;
+import org.apache.commons.math.analysis.UnivariateRealFunction;
 
 /**
  * Tests the PolynomialSplineFunction implementation.
diff --git a/src/test/org/apache/commons/math/analysis/BisectionSolverTest.java b/src/test/org/apache/commons/math/analysis/solvers/BisectionSolverTest.java
similarity index 97%
rename from src/test/org/apache/commons/math/analysis/BisectionSolverTest.java
rename to src/test/org/apache/commons/math/analysis/solvers/BisectionSolverTest.java
index c41dbc594..ccfe2ce9c 100644
--- a/src/test/org/apache/commons/math/analysis/BisectionSolverTest.java
+++ b/src/test/org/apache/commons/math/analysis/solvers/BisectionSolverTest.java
@@ -14,10 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis;
+package org.apache.commons.math.analysis.solvers;
 
 import org.apache.commons.math.MathException;
 import org.apache.commons.math.TestUtils;
+import org.apache.commons.math.analysis.QuinticFunction;
+import org.apache.commons.math.analysis.SinFunction;
+import org.apache.commons.math.analysis.UnivariateRealFunction;
 
 import junit.framework.TestCase;
 
diff --git a/src/test/org/apache/commons/math/analysis/BrentSolverTest.java b/src/test/org/apache/commons/math/analysis/solvers/BrentSolverTest.java
similarity index 98%
rename from src/test/org/apache/commons/math/analysis/BrentSolverTest.java
rename to src/test/org/apache/commons/math/analysis/solvers/BrentSolverTest.java
index d756c3a7c..d1c36e34e 100644
--- a/src/test/org/apache/commons/math/analysis/BrentSolverTest.java
+++ b/src/test/org/apache/commons/math/analysis/solvers/BrentSolverTest.java
@@ -14,9 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis;
+package org.apache.commons.math.analysis.solvers;
 
 import org.apache.commons.math.MathException;
+import org.apache.commons.math.analysis.MonitoredFunction;
+import org.apache.commons.math.analysis.QuinticFunction;
+import org.apache.commons.math.analysis.SinFunction;
+import org.apache.commons.math.analysis.UnivariateRealFunction;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
diff --git a/src/test/org/apache/commons/math/analysis/LaguerreSolverTest.java b/src/test/org/apache/commons/math/analysis/solvers/LaguerreSolverTest.java
similarity index 97%
rename from src/test/org/apache/commons/math/analysis/LaguerreSolverTest.java
rename to src/test/org/apache/commons/math/analysis/solvers/LaguerreSolverTest.java
index 301c44309..745a2d56f 100644
--- a/src/test/org/apache/commons/math/analysis/LaguerreSolverTest.java
+++ b/src/test/org/apache/commons/math/analysis/solvers/LaguerreSolverTest.java
@@ -14,10 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis;
+package org.apache.commons.math.analysis.solvers;
 
 import org.apache.commons.math.MathException;
 import org.apache.commons.math.TestUtils;
+import org.apache.commons.math.analysis.SinFunction;
+import org.apache.commons.math.analysis.polynomials.PolynomialFunction;
 import org.apache.commons.math.complex.Complex;
 import junit.framework.TestCase;
 
diff --git a/src/test/org/apache/commons/math/analysis/MullerSolverTest.java b/src/test/org/apache/commons/math/analysis/solvers/MullerSolverTest.java
similarity index 97%
rename from src/test/org/apache/commons/math/analysis/MullerSolverTest.java
rename to src/test/org/apache/commons/math/analysis/solvers/MullerSolverTest.java
index 9ef5b50ab..56e08f17b 100644
--- a/src/test/org/apache/commons/math/analysis/MullerSolverTest.java
+++ b/src/test/org/apache/commons/math/analysis/solvers/MullerSolverTest.java
@@ -14,9 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis;
+package org.apache.commons.math.analysis.solvers;
 
 import org.apache.commons.math.MathException;
+import org.apache.commons.math.analysis.Expm1Function;
+import org.apache.commons.math.analysis.QuinticFunction;
+import org.apache.commons.math.analysis.SinFunction;
+import org.apache.commons.math.analysis.UnivariateRealFunction;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/test/org/apache/commons/math/analysis/NewtonSolverTest.java b/src/test/org/apache/commons/math/analysis/solvers/NewtonSolverTest.java
similarity index 96%
rename from src/test/org/apache/commons/math/analysis/NewtonSolverTest.java
rename to src/test/org/apache/commons/math/analysis/solvers/NewtonSolverTest.java
index f6b4cb6cd..b4d0696bf 100644
--- a/src/test/org/apache/commons/math/analysis/NewtonSolverTest.java
+++ b/src/test/org/apache/commons/math/analysis/solvers/NewtonSolverTest.java
@@ -14,10 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis;
+package org.apache.commons.math.analysis.solvers;
 
 import org.apache.commons.math.MathException;
 import org.apache.commons.math.TestUtils;
+import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.QuinticFunction;
+import org.apache.commons.math.analysis.SinFunction;
 
 
 import junit.framework.TestCase;
diff --git a/src/test/org/apache/commons/math/analysis/RiddersSolverTest.java b/src/test/org/apache/commons/math/analysis/solvers/RiddersSolverTest.java
similarity index 95%
rename from src/test/org/apache/commons/math/analysis/RiddersSolverTest.java
rename to src/test/org/apache/commons/math/analysis/solvers/RiddersSolverTest.java
index e174c8268..1b4774f96 100644
--- a/src/test/org/apache/commons/math/analysis/RiddersSolverTest.java
+++ b/src/test/org/apache/commons/math/analysis/solvers/RiddersSolverTest.java
@@ -14,9 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis;
+package org.apache.commons.math.analysis.solvers;
 
 import org.apache.commons.math.MathException;
+import org.apache.commons.math.analysis.Expm1Function;
+import org.apache.commons.math.analysis.QuinticFunction;
+import org.apache.commons.math.analysis.SinFunction;
+import org.apache.commons.math.analysis.UnivariateRealFunction;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/test/org/apache/commons/math/analysis/UnivariateRealSolverFactoryImplTest.java b/src/test/org/apache/commons/math/analysis/solvers/UnivariateRealSolverFactoryImplTest.java
similarity index 97%
rename from src/test/org/apache/commons/math/analysis/UnivariateRealSolverFactoryImplTest.java
rename to src/test/org/apache/commons/math/analysis/solvers/UnivariateRealSolverFactoryImplTest.java
index f7cd28074..8ec3a08e0 100644
--- a/src/test/org/apache/commons/math/analysis/UnivariateRealSolverFactoryImplTest.java
+++ b/src/test/org/apache/commons/math/analysis/solvers/UnivariateRealSolverFactoryImplTest.java
@@ -16,7 +16,7 @@
  *  limitations under the License.
  */
 
-package org.apache.commons.math.analysis;
+package org.apache.commons.math.analysis.solvers;
 
 import junit.framework.TestCase;
 
diff --git a/src/test/org/apache/commons/math/analysis/UnivariateRealSolverUtilsTest.java b/src/test/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtilsTest.java
similarity index 96%
rename from src/test/org/apache/commons/math/analysis/UnivariateRealSolverUtilsTest.java
rename to src/test/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtilsTest.java
index 49c310c0a..9afd18e58 100644
--- a/src/test/org/apache/commons/math/analysis/UnivariateRealSolverUtilsTest.java
+++ b/src/test/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtilsTest.java
@@ -15,10 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.analysis;
+package org.apache.commons.math.analysis.solvers;
 
 import org.apache.commons.math.ConvergenceException;
 import org.apache.commons.math.MathException;
+import org.apache.commons.math.analysis.SinFunction;
+import org.apache.commons.math.analysis.UnivariateRealFunction;
 
 import junit.framework.TestCase;