diff --git a/.nant/bamboo.build b/.nant/bamboo.build
index 676206cd81..766a0ff32c 100644
--- a/.nant/bamboo.build
+++ b/.nant/bamboo.build
@@ -37,9 +37,9 @@
       <test>
         <assemblies>
           <include name="../bin/OpenSim.Tests.Framework.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.Tests.Region.ScriptEngine.Common.Tests.dll" />
+          <include name="../bin/OpenSim.Tests.Region.ScriptEngine.Shared.Tests.dll" />
+          <include name="../bin/OpenSim.Tests.Region.ScriptEngine.Shared.CodeTools.dll" />
           <include name="../bin/OpenSim.Region.Environment.dll" />
         </assemblies>
       </test>
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLFloat.cs b/OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestLSLFloat.cs
similarity index 100%
rename from OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLFloat.cs
rename to OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestLSLFloat.cs
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLInteger.cs b/OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestLSLInteger.cs
similarity index 100%
rename from OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLInteger.cs
rename to OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestLSLInteger.cs
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLString.cs b/OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestLSLString.cs
similarity index 100%
rename from OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLString.cs
rename to OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestLSLString.cs
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestList.cs b/OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestList.cs
similarity index 100%
rename from OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestList.cs
rename to OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestList.cs
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestVector3.cs b/OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestVector3.cs
similarity index 100%
rename from OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestVector3.cs
rename to OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestVector3.cs
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs b/OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs
similarity index 100%
rename from OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs
rename to OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/CodeTools/CompilerTest.cs b/OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools/CompilerTest.cs
similarity index 100%
rename from OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/CodeTools/CompilerTest.cs
rename to OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools/CompilerTest.cs
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLFloat.cs b/OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestLSLFloat.cs
similarity index 100%
rename from OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLFloat.cs
rename to OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestLSLFloat.cs
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLInteger.cs b/OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestLSLInteger.cs
similarity index 100%
rename from OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLInteger.cs
rename to OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestLSLInteger.cs
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLString.cs b/OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestLSLString.cs
similarity index 100%
rename from OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLString.cs
rename to OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestLSLString.cs
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestList.cs b/OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestList.cs
similarity index 100%
rename from OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestList.cs
rename to OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestList.cs
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestVector3.cs b/OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestVector3.cs
similarity index 100%
rename from OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestVector3.cs
rename to OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestVector3.cs
diff --git a/prebuild.xml b/prebuild.xml
index b06122616f..8b55ff37be 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1487,19 +1487,19 @@
       </Files>
     </Project>
 
-    <Project name="OpenSim.Region.ScriptEngine.Shared.Tests" path="OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared" type="Library">
+    <Project name="OpenSim.Tests.Region.ScriptEngine.Shared" path="OpenSim/Tests/Region/ScriptEngine/Shared" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../../../../../../bin/</OutputPath>
+          <OutputPath>../../../../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../../../../../../bin/</OutputPath>
+          <OutputPath>../../../../../bin/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../../../../../../bin/</ReferencePath>
+      <ReferencePath>../../../../../bin/</ReferencePath>
       <Reference name="System" localCopy="false"/>
       <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
       <Reference name="OpenSim.Tests.Common"/>
@@ -1648,19 +1648,19 @@
       </Files>
     </Project>
 
-    <Project name="OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests" path="OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/CodeTools" type="Library">
+    <Project name="OpenSim.Tests.Region.ScriptEngine.Shared.CodeTools" path="OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../../../../../../../bin/</OutputPath>
+          <OutputPath>../../../../../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../../../../../../../bin/</OutputPath>
+          <OutputPath>../../../../../../bin/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../../../../../../../bin/</ReferencePath>
+      <ReferencePath>../../../../../../bin/</ReferencePath>
       <Reference name="System" localCopy="false"/>
       <Reference name="OpenSim.Region.ScriptEngine.Shared.CodeTools"/>
       <Reference name="nunit.framework.dll" />
@@ -1969,19 +1969,19 @@
       </Files>
     </Project>
 
-    <Project name="OpenSim.Region.ScriptEngine.Common.Tests" path="OpenSim/Tests/OpenSim/Region/ScriptEngine/Common" type="Library">
+    <Project name="OpenSim.Tests.Region.ScriptEngine.Common" path="OpenSim/Tests/Region/ScriptEngine/Common" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../../../../../../bin/</OutputPath>
+          <OutputPath>../../../../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../../../../../../bin/</OutputPath>
+          <OutputPath>../../../../../bin/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../../../../../../bin/</ReferencePath>
+      <ReferencePath>../../../../../bin/</ReferencePath>
       <Reference name="OpenSim.Region.ScriptEngine.Common"/>
       <Reference name="OpenSim.Tests.Common"/>
       <Reference name="nunit.framework.dll" />