diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
index 62a42a9af4..e496e4549b 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
@@ -31,7 +31,7 @@ using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Communications.Local;
-using OpenSim.Tests.Infra.Mock;
+using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Framework.Communications.Tests
 {       
diff --git a/OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs b/OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs
index c0f2e5e9c2..405eddd81c 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs
@@ -36,7 +36,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.Environment.Scenes;
-using OpenSim.Tests.Infra.Mock;
+using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.Environment.Scenes.Tests
 {
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
index 370341491c..b073fd17dd 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
@@ -34,7 +34,7 @@ using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Communications.Local;
 using OpenSim.Region.Environment.Scenes;
-using OpenSim.Tests.Infra.Mock;
+using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.Environment.Scenes.Tests
 {
diff --git a/OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs
index 24c62d1c9a..548fea9e32 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs
@@ -30,7 +30,7 @@ using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Scenes;
-using OpenSim.Tests.Infra.Mock;
+using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.Environment.Scenes.Tests
 {  
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
index fa4c7ceda3..8a06eaadb7 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
@@ -33,7 +33,7 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Physics.Manager;
 using OpenSim.Region.Environment.Scenes;
-using OpenSim.Tests.Infra.Mock;
+using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.Environment.Scenes.Tests
 {        
diff --git a/OpenSim/Tests/Infra/Mock/TestAssetDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs
similarity index 98%
rename from OpenSim/Tests/Infra/Mock/TestAssetDataPlugin.cs
rename to OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs
index 6a5c31e3d8..f44339a82d 100644
--- a/OpenSim/Tests/Infra/Mock/TestAssetDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs
@@ -29,7 +29,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 
-namespace OpenSim.Tests.Infra.Mock
+namespace OpenSim.Tests.Common.Mock
 {
     /// <summary>
     /// In memory asset data plugin for test purposes.  Could be another dll when properly filled out and when the
diff --git a/OpenSim/Tests/Infra/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
similarity index 99%
rename from OpenSim/Tests/Infra/Mock/TestClient.cs
rename to OpenSim/Tests/Common/Mock/TestClient.cs
index ba643936a9..9b44ac4588 100644
--- a/OpenSim/Tests/Infra/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -33,7 +33,7 @@ using OpenMetaverse.Packets;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Scenes;
 
-namespace OpenSim.Tests.Infra.Mock
+namespace OpenSim.Tests.Common.Mock
 {
     public class TestClient : IClientAPI
     {
diff --git a/OpenSim/Tests/Infra/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
similarity index 98%
rename from OpenSim/Tests/Infra/Mock/TestCommunicationsManager.cs
rename to OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
index 38c1404438..a6a025b1ab 100644
--- a/OpenSim/Tests/Infra/Mock/TestCommunicationsManager.cs
+++ b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
@@ -31,7 +31,7 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Communications.Local;
 
-namespace OpenSim.Tests.Infra.Mock
+namespace OpenSim.Tests.Common.Mock
 {
     public class TestCommunicationsManager : CommunicationsManager
     {
diff --git a/OpenSim/Tests/Infra/Mock/TestInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
similarity index 99%
rename from OpenSim/Tests/Infra/Mock/TestInventoryDataPlugin.cs
rename to OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
index 826ce1bf55..9e2116a46b 100644
--- a/OpenSim/Tests/Infra/Mock/TestInventoryDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
 
-namespace OpenSim.Tests.Infra.Mock
+namespace OpenSim.Tests.Common.Mock
 {
     /// <summary>
     /// In memory inventory data plugin for test purposes.  Could be another dll when properly filled out and when the
diff --git a/OpenSim/Tests/Infra/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
similarity index 98%
rename from OpenSim/Tests/Infra/Mock/TestLandChannel.cs
rename to OpenSim/Tests/Common/Mock/TestLandChannel.cs
index 21a64938d7..5e9b9ff7a5 100644
--- a/OpenSim/Tests/Infra/Mock/TestLandChannel.cs
+++ b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
@@ -30,7 +30,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
 
-namespace OpenSim.Tests.Infra.Mock
+namespace OpenSim.Tests.Common.Mock
 {       
     /// <summary>
     /// Land channel for test purposes
diff --git a/OpenSim/Tests/Infra/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
similarity index 98%
rename from OpenSim/Tests/Infra/Mock/TestScene.cs
rename to OpenSim/Tests/Common/Mock/TestScene.cs
index ca66014948..6b176a12a3 100644
--- a/OpenSim/Tests/Infra/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -33,7 +33,7 @@ using OpenSim.Framework.Servers;
 using OpenSim.Region.Environment;
 using OpenSim.Region.Environment.Scenes;
 
-namespace OpenSim.Tests.Infra.Mock
+namespace OpenSim.Tests.Common.Mock
 {        
     public class TestScene : Scene
     {        
diff --git a/OpenSim/Tests/Infra/Mock/TestUserDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestUserDataPlugin.cs
similarity index 99%
rename from OpenSim/Tests/Infra/Mock/TestUserDataPlugin.cs
rename to OpenSim/Tests/Common/Mock/TestUserDataPlugin.cs
index c08fc90630..a5e2a3762a 100644
--- a/OpenSim/Tests/Infra/Mock/TestUserDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestUserDataPlugin.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
 
-namespace OpenSim.Tests.Infra.Mock
+namespace OpenSim.Tests.Common.Mock
 {
     /// <summary>
     /// In memory user data provider.  Might be quite useful as a proper user data plugin, though getting mono addins
diff --git a/prebuild.xml b/prebuild.xml
index 49b0ec8196..8c418d6da3 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2388,34 +2388,6 @@
     </Project>
 
     <!-- Test assemblies -->
-    <Project name="OpenSim.Tests.Infra.Mock" path="OpenSim/Tests/Infra/Mock" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-
-      <ReferencePath>../../../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
-      <Reference name="OpenMetaverse.dll"/>
-      <Reference name="OpenMetaverseTypes.dll"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Communications"/>
-      <Reference name="OpenSim.Framework.Servers"/>
-      <Reference name="OpenSim.Region.Communications.Local"/>
-      <Reference name="OpenSim.Region.Environment"/>
-      <Reference name="Nini.dll" />
-
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-
     <Project name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library">
       <Configuration name="Debug">
         <Options>
@@ -2433,10 +2405,18 @@
       <Reference name="System.Drawing"/>
       <Reference name="System.Xml"/>
       <Reference name="System.Data"/>
+      <Reference name="Nini.dll" />
       <Reference name="nunit.framework.dll" />
+      <Reference name="OpenMetaverse.dll"/>
       <Reference name="OpenMetaverseTypes.dll"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Framework.Servers"/>
+      <Reference name="OpenSim.Region.Communications.Local"/>
+      <Reference name="OpenSim.Region.Environment"/>
+
       <Files>
-        <Match pattern="*.cs" recurse="false"/>
+        <Match pattern="*.cs" recurse="true"/>
       </Files>
     </Project>
 
@@ -2618,7 +2598,7 @@
       <Reference name="OpenMetaverseTypes.dll"/>
       <Reference name="OpenSim.Framework.Communications"/>
       <Reference name="OpenSim.Region.Communications.Local"/>
-      <Reference name="OpenSim.Tests.Infra.Mock"/>
+      <Reference name="OpenSim.Tests.Common"/>
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>
@@ -2657,7 +2637,7 @@
 
       <!-- Unit tests -->
       <!-- <Reference name="OpenSim.Tests.Common"/> -->
-      <Reference name="OpenSim.Tests.Infra.Mock"/>
+      <Reference name="OpenSim.Tests.Common"/>
       <Reference name="Nini.dll"/>
       <Reference name="nunit.framework.dll"/>