diff --git a/OpenSim/Tests/Common/Setup/AssetHelpers.cs b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
similarity index 100%
rename from OpenSim/Tests/Common/Setup/AssetHelpers.cs
rename to OpenSim/Tests/Common/Helpers/AssetHelpers.cs
diff --git a/OpenSim/Tests/Common/Setup/BaseRequestHandlerHelpers.cs b/OpenSim/Tests/Common/Helpers/BaseRequestHandlerHelpers.cs
similarity index 100%
rename from OpenSim/Tests/Common/Setup/BaseRequestHandlerHelpers.cs
rename to OpenSim/Tests/Common/Helpers/BaseRequestHandlerHelpers.cs
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneSetupHelpers.cs
similarity index 100%
rename from OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
rename to OpenSim/Tests/Common/Helpers/SceneSetupHelpers.cs
diff --git a/OpenSim/Tests/Common/Setup/TaskInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs
similarity index 100%
rename from OpenSim/Tests/Common/Setup/TaskInventoryHelpers.cs
rename to OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs
diff --git a/OpenSim/Tests/Common/Setup/UserAccountHelpers.cs b/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs
similarity index 100%
rename from OpenSim/Tests/Common/Setup/UserAccountHelpers.cs
rename to OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs
diff --git a/OpenSim/Tests/Common/Setup/UserInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
similarity index 100%
rename from OpenSim/Tests/Common/Setup/UserInventoryHelpers.cs
rename to OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs