diff --git a/.nant/bamboo.build b/.nant/bamboo.build
index 695807ca24..676206cd81 100644
--- a/.nant/bamboo.build
+++ b/.nant/bamboo.build
@@ -36,7 +36,7 @@
       <formatter type="Xml" usefile="true" extension=".xml" outputdir="../test-results" />
       <test>
         <assemblies>
-          <include name="../bin/OpenSim.Framework.Tests.dll" />
+          <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" />
diff --git a/OpenSim/Tests/OpenSim/Framework/UtilTest.cs b/OpenSim/Tests/Framework/UtilTest.cs
similarity index 100%
rename from OpenSim/Tests/OpenSim/Framework/UtilTest.cs
rename to OpenSim/Tests/Framework/UtilTest.cs
diff --git a/prebuild.xml b/prebuild.xml
index 4c7bc5d55a..b06122616f 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -124,19 +124,19 @@
       </Files>
     </Project>
 
-    <Project name="OpenSim.Framework.Tests" path="OpenSim/Tests/OpenSim/Framework" type="Library">
+    <Project name="OpenSim.Tests.Framework" path="OpenSim/Tests/Framework" 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"/>
       <Reference name="System.Xml"/>
       <Reference name="System.Data"/>