diff --git a/.nant/bamboo.build b/.nant/bamboo.build
index 2e5d7a65b1..196d04fb1b 100644
--- a/.nant/bamboo.build
+++ b/.nant/bamboo.build
@@ -36,16 +36,17 @@
       <formatter type="Xml" usefile="true" extension=".xml" outputdir="../test-results" />
       <test>
         <assemblies>
-          <include name="../bin/OpenSim.Framework.Tests.dll" />
+          <include name="../bin/OpenSim.Framework.Tests.dll"/>
           <include name="../bin/OpenSim.Framework.Communications.Tests.dll"/>
-          <include name="../bin/OpenSim.Framework.Servers.Tests.dll" />
-          <include name="../bin/OpenSim.Region.ScriptEngine.Common.Tests.dll" />
-          <include name="../bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
-          <include name="../bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
-          <include name="../bin/OpenSim.Region.Environment.Tests.dll" />
-          <include name="../bin/OpenSim.Data.SQLite.Tests.dll" />
-          <include name="../bin/OpenSim.Data.MySQL.Tests.dll" />  
-          <include name="../bin/OpenSim.Region.Physics.OdePlugin.dll" />  
+          <include name="../bin/OpenSim.Framework.Servers.Tests.dll"/>
+          <include name="../bin/OpenSim.Region.ScriptEngine.Common.Tests.dll"/>
+          <include name="../bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll"/>
+          <include name="../bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll"/>
+          <include name="../bin/OpenSim.Region.Environment.Tests.dll"/>
+          <include name="../bin/OpenSim.Region.Framework.Tests.dll"/>
+          <include name="../bin/OpenSim.Data.SQLite.Tests.dll"/>
+          <include name="../bin/OpenSim.Data.MySQL.Tests.dll"/>  
+          <include name="../bin/OpenSim.Region.Physics.OdePlugin.dll"/>  
   
 
         </assemblies>
diff --git a/.nant/local.include b/.nant/local.include
index 899bb2f67b..41e0742f4f 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -41,6 +41,7 @@
           <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
           <include name="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
           <include name="./bin/OpenSim.Region.Environment.Tests.dll" />
+          <include name="./bin/OpenSim.Region.Framework.Tests.dll" />
           <include name="./bin/OpenSim.Data.SQLite.Tests.dll" />
           <include name="./bin/OpenSim.Data.MySQL.Tests.dll" />
         </assemblies>
@@ -116,6 +117,17 @@
     <exec program="monocov">
       <arg value="--export-html=./cov/OpenSim.Region.Environment ./cov/OpenSim.Region.Environment.cov" />
     </exec>    
+
+    <exec program="mono">
+      <arg value="--debug" />
+      <arg value="--profile=monocov:outfile=./cov/OpenSim.Region.Framework.cov,+[OpenSim.Region.Framework]" />
+      <arg value="/usr/lib/nunit/nunit-console.exe" />
+      <arg value="./bin/OpenSim.Region.Framework.Tests.dll" />
+    </exec>
+    <delete dir="./cov/OpenSim.Region.Framework" />
+    <exec program="monocov">
+      <arg value="--export-html=./cov/OpenSim.Region.Framework ./cov/OpenSim.Region.Framework.cov" />
+    </exec>    
     
     <exec program="mono">
       <arg value="--debug" />
@@ -157,6 +169,7 @@
           <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
           <include name="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
           <include name="./bin/OpenSim.Region.Environment.Tests.dll" />
+          <include name="./bin/OpenSim.Region.Framework.Tests.dll" />
           <include name="./bin/OpenSim.Data.SQLite.Tests.dll" />
           <include name="./bin/OpenSim.Data.MySQL.Tests.dll" />
         </assemblies>
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index d063eae56f..dc27a551d9 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -33,7 +33,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Communications.Local;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common.Mock;
 using OpenSim.Tests.Common.Setup;
 
@@ -133,7 +133,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests
             
             // Check that the taken part has actually disappeared
             SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
-            Assert.That(retrievedPart, Is.Null);                             
+            Assert.That(retrievedPart, Is.Null);
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index 30b0987432..3efb8865a7 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -33,7 +33,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Communications.Local;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common.Mock;
 using OpenSim.Tests.Common.Setup;
 
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index a78faa6f5b..0b9937a5dc 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -31,7 +31,6 @@ using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
-using OpenSim.Region.Environment;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Environment.Modules.Communications.REST;
 using OpenSim.Tests.Common.Mock;
diff --git a/prebuild.xml b/prebuild.xml
index f46a1aa7ec..0ebc3f8f85 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2617,6 +2617,62 @@
         <Match path="Modules/World/Terrain/Tests" pattern="*.cs" recurse="true" />
         <Match path="Modules/World/Archiver/Tests" pattern="*.cs" recurse="true" />
         <Match path="Modules/Agent/TextureSender/Tests" pattern="*.cs" recurse="true" />
+      </Files>
+    </Project>
+
+    <Project name="OpenSim.Region.Framework.Tests" path="OpenSim/Region/Framework" 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="System.Xml"/>
+      <Reference name="System.Drawing"/>
+      <Reference name="System.Runtime.Remoting"/>
+      <Reference name="OpenMetaverseTypes.dll"/>
+      <Reference name="OpenMetaverse.dll"/>
+      <Reference name="OpenSim.Data"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Servers"/>
+      <Reference name="OpenSim.Framework.Statistics"/>
+      <Reference name="OpenSim.Region.Communications.Local"/>
+      <Reference name="OpenSim.Region.Framework"/>
+      <Reference name="OpenSim.Region.Environment"/>
+      <Reference name="OpenSim.Region.Physics.Manager"/>
+
+      <!-- Unit tests -->
+      <!-- <Reference name="OpenSim.Tests.Common"/> -->
+      <Reference name="OpenSim.Tests.Common"/>
+      <Reference name="Nini.dll"/>
+      <Reference name="nunit.framework.dll"/>
+
+      <!-- For scripting in funny languages by default -->
+      <Reference name="Microsoft.JScript"/>
+      <Reference name="XMLRPC.dll"/>
+      <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Data.Base"/>
+      <Reference name="Nini.dll" />
+      <Reference name="log4net.dll"/>
+      <Reference name="DotNetOpenMail.dll"/>
+
+      <!--
+           TODO: this is kind of lame, we basically build a duplicate
+           assembly but with tests added in, just so that we don't
+           need to hard code in a bunch of Test directories here.  If
+           pattern="Tests/*.cs" worked, we wouldn't need this.
+      -->
+      <Files>
+        <!-- SADLY the way this works means you need to keep adding these paths -->
         <Match path="Scenes/Tests" pattern="*.cs" recurse="false" />
       </Files>
     </Project>