diff --git a/.nant/local.include b/.nant/local.include
index 51146dcd42..84e775dc8d 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -35,6 +35,7 @@
       <test>
         <assemblies>
           <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.ClientStack.LindenUDP.Tests.dll" />
           <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
@@ -60,6 +61,17 @@
     <exec program="monocov">
       <arg value="--export-html=./cov/OpenSim.Framework.Servers ./cov/OpenSim.Framework.Servers.cov" />
     </exec>
+
+    <exec program="mono">
+      <arg value="--debug" />
+      <arg value="--profile=monocov:outfile=./cov/OpenSim.Framework.Communications.cov,+[OpenSim.Framework.Communications]" />
+      <arg value="/usr/lib/nunit/nunit-console.exe" />
+      <arg value="./bin/OpenSim.Framework.Communications.Tests.dll" />
+    </exec>
+    <delete dir="./cov/OpenSim.Framework.Communications" />
+    <exec program="monocov">
+      <arg value="--export-html=./cov/OpenSim.Framework.Servers ./cov/OpenSim.Framework.Communications.cov" />
+    </exec>
     
     <exec program="mono">
       <arg value="--debug" />
@@ -137,6 +149,7 @@
       <test>
         <assemblies>
           <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.ClientStack.LindenUDP.Tests.dll" />
           <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
diff --git a/OpenSim/Framework/Communications/Tests/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/UserProfileCacheServiceTests.cs
new file mode 100644
index 0000000000..0d239aab72
--- /dev/null
+++ b/OpenSim/Framework/Communications/Tests/UserProfileCacheServiceTests.cs
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using NUnit.Framework;
+
+namespace OpenSim.Framework.Communications.Tests
+{       
+    /// <summary>
+    /// User profile cache service tests
+    /// </summary>
+    [TestFixture]    
+    public class UserProfileCacheServiceTests
+    {        
+        /// <summary>
+        /// Test folder moving.  Doesn't do what is says on the tin yet
+        /// </summary>
+        [Test]
+        public void TestMoveFolder()
+        {
+            // Temporarily empty     
+        }  
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
index ba231ca9ee..9e6e4a730c 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
@@ -42,12 +42,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests
     /// </summary>
     [TestFixture]
     public class SceneObjectTests
-    {
-        [SetUp]
-        public void Init()
-        {        
-        }
-                
+    {         
         /// <summary>
         /// Test adding an object to a scene.
         /// </summary>
diff --git a/prebuild.xml b/prebuild.xml
index 981c0bb108..d2355a7304 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -745,10 +745,35 @@
       <Reference name="Nini.dll" />
       <Reference name="XMLRPC.dll"/>
       <Reference name="log4net.dll"/>
-	  <Reference name="GlynnTucker.Cache.dll"/>
+	    <Reference name="GlynnTucker.Cache.dll"/>
 
       <Files>
-        <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.cs" recurse="true">
+          <Exclude name="Tests" pattern="Tests"/>
+        </Match>
+      </Files>
+    </Project>
+
+    <Project name="OpenSim.Framework.Communications.Tests" path="OpenSim/Framework/Communications/Tests" 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"/>
+      <Reference name="log4net.dll"/>
+      <Reference name="nunit.framework.dll" />
+      <Reference name="OpenSim.Framework.Communications"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="false"/>
       </Files>
     </Project>