diff --git a/OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs b/OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs
index b9ce4308b0..dbd23b25a3 100644
--- a/OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 using NUnit.Framework;
-using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Setup;
 
 namespace OpenSim.Framework.Servers.HttpServer.Tests
 {
diff --git a/OpenSim/Tests/Common/BaseRequestHandlerTestHelper.cs b/OpenSim/Tests/Common/Setup/BaseRequestHandlerTestHelper.cs
similarity index 98%
rename from OpenSim/Tests/Common/BaseRequestHandlerTestHelper.cs
rename to OpenSim/Tests/Common/Setup/BaseRequestHandlerTestHelper.cs
index 6c506443c6..65c66b0130 100644
--- a/OpenSim/Tests/Common/BaseRequestHandlerTestHelper.cs
+++ b/OpenSim/Tests/Common/Setup/BaseRequestHandlerTestHelper.cs
@@ -7,7 +7,7 @@ using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Tests.Common.Mock;
 
-namespace OpenSim.Tests.Common
+namespace OpenSim.Tests.Common.Setup
 {
     public class BaseRequestHandlerTestHelper
     {
@@ -56,4 +56,4 @@ namespace OpenSim.Tests.Common
             Assert.AreEqual(EmptyByteArray, handler.Handle(assetsPath + "/badGuid", null, null, null), "Failed on bad guid.");
         }
     }
-}
+}
\ No newline at end of file