diff --git a/.nant/bamboo.build b/.nant/bamboo.build
index 8fe4c636e6..fcb22b15bf 100644
--- a/.nant/bamboo.build
+++ b/.nant/bamboo.build
@@ -35,10 +35,10 @@
       <formatter type="Xml" usefile="true" extension=".xml" outputdir="../test-results" />
       <test>
         <assemblies>
-          <include name="../bin/OpenSim.Tests.Framework.dll" />
-          <include name="../bin/OpenSim.Tests.Region.ScriptEngine.Common.dll" />
-          <include name="../bin/OpenSim.Tests.Region.ScriptEngine.Shared.dll" />
-          <include name="../bin/OpenSim.Tests.Region.ScriptEngine.Shared.CodeTools.dll" />
+          <include name="../bin/OpenSim.Framework.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.dll" />
         </assemblies>
       </test>
diff --git a/.nant/local.include b/.nant/local.include
index 7d0b690b29..0328d42b32 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -32,10 +32,10 @@
       <formatter type="Plain" />
       <test>
         <assemblies>
-          <include name="./bin/OpenSim.Tests.Framework.dll" />
-          <include name="./bin/OpenSim.Tests.Region.ScriptEngine.Common.dll" />
-          <include name="./bin/OpenSim.Tests.Region.ScriptEngine.Shared.dll" />
-          <include name="./bin/OpenSim.Tests.Region.ScriptEngine.Shared.CodeTools.dll" />
+          <include name="./bin/OpenSim.Framework.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.dll" />
         </assemblies>
       </test>
diff --git a/Makefile b/Makefile
index af504acc00..a1858b7057 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,18 @@
 NANT	= $(shell if test "$$EMACS" = "t" ; then echo "nant"; else echo "./nant-color"; fi)
 
 all:
-	@export PATH=/usr/local/bin:$(PATH)
+	# @export PATH=/usr/local/bin:$(PATH)
 	./runprebuild.sh
 	${NANT}
 	find OpenSim -name \*.mdb -exec cp {} bin \; 
 
 clean:
-	@export PATH=/usr/local/bin:$(PATH)
+	# @export PATH=/usr/local/bin:$(PATH)
 	${NANT} clean
 
+test:
+	${NANT} test
+
 tags:
 	find OpenSim -name \*\.cs | xargs etags 
 
diff --git a/OpenSim/Tests/Framework/UtilTest.cs b/OpenSim/Framework/Tests/UtilTest.cs
similarity index 100%
rename from OpenSim/Tests/Framework/UtilTest.cs
rename to OpenSim/Framework/Tests/UtilTest.cs
diff --git a/OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestLSLFloat.cs b/OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestLSLFloat.cs
similarity index 100%
rename from OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestLSLFloat.cs
rename to OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestLSLFloat.cs
diff --git a/OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestLSLInteger.cs b/OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestLSLInteger.cs
similarity index 100%
rename from OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestLSLInteger.cs
rename to OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestLSLInteger.cs
diff --git a/OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestLSLString.cs b/OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestLSLString.cs
similarity index 100%
rename from OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestLSLString.cs
rename to OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestLSLString.cs
diff --git a/OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestList.cs b/OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestList.cs
similarity index 100%
rename from OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestList.cs
rename to OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestList.cs
diff --git a/OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestVector3.cs b/OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestVector3.cs
similarity index 100%
rename from OpenSim/Tests/Region/ScriptEngine/Common/LSL_TypesTestVector3.cs
rename to OpenSim/Region/ScriptEngine/Common/Tests/LSL_TypesTestVector3.cs
diff --git a/OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs
similarity index 100%
rename from OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs
rename to OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs
diff --git a/OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools/CompilerTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
similarity index 100%
rename from OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools/CompilerTest.cs
rename to OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
diff --git a/OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestLSLFloat.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs
similarity index 100%
rename from OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestLSLFloat.cs
rename to OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs
diff --git a/OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestLSLInteger.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs
similarity index 100%
rename from OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestLSLInteger.cs
rename to OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs
diff --git a/OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestLSLString.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs
similarity index 100%
rename from OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestLSLString.cs
rename to OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs
diff --git a/OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestList.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestList.cs
similarity index 100%
rename from OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestList.cs
rename to OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestList.cs
diff --git a/OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestVector3.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestVector3.cs
similarity index 100%
rename from OpenSim/Tests/Region/ScriptEngine/Shared/LSL_TypesTestVector3.cs
rename to OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestVector3.cs
diff --git a/prebuild.xml b/prebuild.xml
index bd75843c7d..abf83d4112 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -125,7 +125,7 @@
       </Files>
     </Project>
 
-    <Project name="OpenSim.Tests.Framework" path="OpenSim/Tests/Framework" type="Library">
+    <Project name="OpenSim.Framework.Tests" path="OpenSim/Framework/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -1496,7 +1496,7 @@
       </Files>
     </Project>
 
-    <Project name="OpenSim.Tests.Region.ScriptEngine.Shared" path="OpenSim/Tests/Region/ScriptEngine/Shared" type="Library">
+    <Project name="OpenSim.Region.ScriptEngine.Shared.Tests" path="OpenSim/Region/ScriptEngine/Shared/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../bin/</OutputPath>
@@ -1651,11 +1651,13 @@
       <Reference name="Tools.dll"/>
 
       <Files>
-        <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.cs" recurse="true">
+          <Exclude name="Tests" pattern="Tests" />
+        </Match>
       </Files>
     </Project>
 
-    <Project name="OpenSim.Tests.Region.ScriptEngine.Shared.CodeTools" path="OpenSim/Tests/Region/ScriptEngine/Shared/CodeTools" type="Library">
+    <Project name="OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests" path="OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../../bin/</OutputPath>
@@ -1974,11 +1976,13 @@
       <Reference name="log4net.dll"/>
 
       <Files>
-        <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.cs" recurse="true" >
+          <Exclude name="Tests" pattern="Tests" />
+        </Match>
       </Files>
     </Project>
 
-    <Project name="OpenSim.Tests.Region.ScriptEngine.Common" path="OpenSim/Tests/Region/ScriptEngine/Common" type="Library">
+    <Project name="OpenSim.Region.ScriptEngine.Common.Tests" path="OpenSim/Region/ScriptEngine/Common/Tests" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../../../bin/</OutputPath>