diff --git a/src/diffpy/srfit/tests/__init__.py b/tests/__init__.py
similarity index 100%
rename from src/diffpy/srfit/tests/__init__.py
rename to tests/__init__.py
diff --git a/src/diffpy/srfit/tests/debug.py b/tests/debug.py
similarity index 100%
rename from src/diffpy/srfit/tests/debug.py
rename to tests/debug.py
diff --git a/src/diffpy/srfit/tests/run.py b/tests/run.py
similarity index 100%
rename from src/diffpy/srfit/tests/run.py
rename to tests/run.py
diff --git a/src/diffpy/srfit/tests/speedtest.py b/tests/speedtest.py
similarity index 100%
rename from src/diffpy/srfit/tests/speedtest.py
rename to tests/speedtest.py
diff --git a/src/diffpy/srfit/tests/testbuilder.py b/tests/testbuilder.py
similarity index 100%
rename from src/diffpy/srfit/tests/testbuilder.py
rename to tests/testbuilder.py
diff --git a/src/diffpy/srfit/tests/testcharacteristicfunctions.py b/tests/testcharacteristicfunctions.py
similarity index 100%
rename from src/diffpy/srfit/tests/testcharacteristicfunctions.py
rename to tests/testcharacteristicfunctions.py
diff --git a/src/diffpy/srfit/tests/testconstraint.py b/tests/testconstraint.py
similarity index 100%
rename from src/diffpy/srfit/tests/testconstraint.py
rename to tests/testconstraint.py
diff --git a/src/diffpy/srfit/tests/testcontribution.py b/tests/testcontribution.py
similarity index 100%
rename from src/diffpy/srfit/tests/testcontribution.py
rename to tests/testcontribution.py
diff --git a/src/diffpy/srfit/tests/testdata/LaMnO3.stru b/tests/testdata/LaMnO3.stru
similarity index 100%
rename from src/diffpy/srfit/tests/testdata/LaMnO3.stru
rename to tests/testdata/LaMnO3.stru
diff --git a/src/diffpy/srfit/tests/testdata/ni-q27r100-neutron.gr b/tests/testdata/ni-q27r100-neutron.gr
similarity index 100%
rename from src/diffpy/srfit/tests/testdata/ni-q27r100-neutron.gr
rename to tests/testdata/ni-q27r100-neutron.gr
diff --git a/src/diffpy/srfit/tests/testdata/ni.cif b/tests/testdata/ni.cif
similarity index 100%
rename from src/diffpy/srfit/tests/testdata/ni.cif
rename to tests/testdata/ni.cif
diff --git a/src/diffpy/srfit/tests/testdata/results.res b/tests/testdata/results.res
similarity index 100%
rename from src/diffpy/srfit/tests/testdata/results.res
rename to tests/testdata/results.res
diff --git a/src/diffpy/srfit/tests/testdata/sas_ascii_test_1.txt b/tests/testdata/sas_ascii_test_1.txt
similarity index 100%
rename from src/diffpy/srfit/tests/testdata/sas_ascii_test_1.txt
rename to tests/testdata/sas_ascii_test_1.txt
diff --git a/src/diffpy/srfit/tests/testdata/sas_ellipsoid_testdata.txt b/tests/testdata/sas_ellipsoid_testdata.txt
similarity index 100%
rename from src/diffpy/srfit/tests/testdata/sas_ellipsoid_testdata.txt
rename to tests/testdata/sas_ellipsoid_testdata.txt
diff --git a/src/diffpy/srfit/tests/testdata/si-q27r60-xray.gr b/tests/testdata/si-q27r60-xray.gr
similarity index 100%
rename from src/diffpy/srfit/tests/testdata/si-q27r60-xray.gr
rename to tests/testdata/si-q27r60-xray.gr
diff --git a/src/diffpy/srfit/tests/testdata/testdata.txt b/tests/testdata/testdata.txt
similarity index 100%
rename from src/diffpy/srfit/tests/testdata/testdata.txt
rename to tests/testdata/testdata.txt
diff --git a/src/diffpy/srfit/tests/testdiffpyparset.py b/tests/testdiffpyparset.py
similarity index 100%
rename from src/diffpy/srfit/tests/testdiffpyparset.py
rename to tests/testdiffpyparset.py
diff --git a/src/diffpy/srfit/tests/testequation.py b/tests/testequation.py
similarity index 100%
rename from src/diffpy/srfit/tests/testequation.py
rename to tests/testequation.py
diff --git a/src/diffpy/srfit/tests/testfitrecipe.py b/tests/testfitrecipe.py
similarity index 100%
rename from src/diffpy/srfit/tests/testfitrecipe.py
rename to tests/testfitrecipe.py
diff --git a/src/diffpy/srfit/tests/testfitresults.py b/tests/testfitresults.py
similarity index 100%
rename from src/diffpy/srfit/tests/testfitresults.py
rename to tests/testfitresults.py
diff --git a/src/diffpy/srfit/tests/testliterals.py b/tests/testliterals.py
similarity index 100%
rename from src/diffpy/srfit/tests/testliterals.py
rename to tests/testliterals.py
diff --git a/src/diffpy/srfit/tests/testobjcrystparset.py b/tests/testobjcrystparset.py
similarity index 100%
rename from src/diffpy/srfit/tests/testobjcrystparset.py
rename to tests/testobjcrystparset.py
diff --git a/src/diffpy/srfit/tests/testparameter.py b/tests/testparameter.py
similarity index 100%
rename from src/diffpy/srfit/tests/testparameter.py
rename to tests/testparameter.py
diff --git a/src/diffpy/srfit/tests/testparameterset.py b/tests/testparameterset.py
similarity index 100%
rename from src/diffpy/srfit/tests/testparameterset.py
rename to tests/testparameterset.py
diff --git a/src/diffpy/srfit/tests/testpdf.py b/tests/testpdf.py
similarity index 100%
rename from src/diffpy/srfit/tests/testpdf.py
rename to tests/testpdf.py
diff --git a/src/diffpy/srfit/tests/testprofile.py b/tests/testprofile.py
similarity index 100%
rename from src/diffpy/srfit/tests/testprofile.py
rename to tests/testprofile.py
diff --git a/src/diffpy/srfit/tests/testprofilegenerator.py b/tests/testprofilegenerator.py
similarity index 100%
rename from src/diffpy/srfit/tests/testprofilegenerator.py
rename to tests/testprofilegenerator.py
diff --git a/src/diffpy/srfit/tests/testrecipeorganizer.py b/tests/testrecipeorganizer.py
similarity index 100%
rename from src/diffpy/srfit/tests/testrecipeorganizer.py
rename to tests/testrecipeorganizer.py
diff --git a/src/diffpy/srfit/tests/testrestraint.py b/tests/testrestraint.py
similarity index 100%
rename from src/diffpy/srfit/tests/testrestraint.py
rename to tests/testrestraint.py
diff --git a/src/diffpy/srfit/tests/testsas.py b/tests/testsas.py
similarity index 100%
rename from src/diffpy/srfit/tests/testsas.py
rename to tests/testsas.py
diff --git a/src/diffpy/srfit/tests/testsgconstraints.py b/tests/testsgconstraints.py
similarity index 100%
rename from src/diffpy/srfit/tests/testsgconstraints.py
rename to tests/testsgconstraints.py
diff --git a/src/diffpy/srfit/tests/testtagmanager.py b/tests/testtagmanager.py
similarity index 100%
rename from src/diffpy/srfit/tests/testtagmanager.py
rename to tests/testtagmanager.py
diff --git a/src/diffpy/srfit/tests/testvisitors.py b/tests/testvisitors.py
similarity index 100%
rename from src/diffpy/srfit/tests/testvisitors.py
rename to tests/testvisitors.py
diff --git a/src/diffpy/srfit/tests/testweakrefcallable.py b/tests/testweakrefcallable.py
similarity index 100%
rename from src/diffpy/srfit/tests/testweakrefcallable.py
rename to tests/testweakrefcallable.py
diff --git a/src/diffpy/srfit/tests/utils.py b/tests/utils.py
similarity index 100%
rename from src/diffpy/srfit/tests/utils.py
rename to tests/utils.py