diff --git a/.nant/local.include b/.nant/local.include
index 1b526e6ac4..1612358433 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -37,11 +37,29 @@
           <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" />
         </assemblies>
       </test>
     </nunit2>
 </target>
 
+<target name="test-xml" depends="build">
+      <nunit2 failonerror="true" verbose="true">
+      <formatter type="Xml" usefile="true" extension=".xml" outputdir="./test-results" />
+      <test>
+        <assemblies>
+          <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.Tests.dll" />
+          <include name="./bin/OpenSim.Data.SQLite.Tests.dll" />
+        </assemblies>
+      </test>
+    </nunit2>
+</target>
+
+
 <target name="dist" depends="distdir">
     <zip zipfile="${projectdir}.zip">
     <fileset basedir=".">
diff --git a/Makefile b/Makefile
index a1858b7057..d5c7146326 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,9 @@ clean:
 test:
 	${NANT} test
 
+test-xml:
+	${NANT} test-xml
+
 tags:
 	find OpenSim -name \*\.cs | xargs etags 
 
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
new file mode 100644
index 0000000000..725573ee29
--- /dev/null
+++ b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
@@ -0,0 +1,49 @@
+/*
+ * 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;
+using OpenSim.Data.SQLite;
+
+namespace OpenSim.Data.SQLite.Tests
+{
+    [TestFixture]
+    public class SQLiteRegionTest
+    {
+        public string file = "regiontest.db";
+        public string connect;
+        public SQLiteRegionData db;
+        
+        [SetUp]
+        public void Init()
+        {
+            connect = "URI=file:" + file + ",version=3";
+            db = new SQLiteRegionData();
+            db.Initialise(connect);
+        }
+    }
+}
\ No newline at end of file
diff --git a/prebuild.xml b/prebuild.xml
index 00c07b4876..dc3e8f640e 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1448,12 +1448,50 @@
       <Reference name="log4net.dll"/>
 
       <Files>
-        <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.cs" recurse="true" >
+          <Exclude name="Tests" pattern="Tests" />
+        </Match>
         <Match path="Resources" pattern="*.sql" buildAction="EmbeddedResource"/>
         <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>
 
+    <Project name="OpenSim.Data.SQLite.Tests" path="OpenSim/Data/SQLite/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" localCopy="false"/>
+      <Reference name="System.Xml"/>
+      <Reference name="System.Data"/>
+      <Reference name="System.Data.SQLite.dll"/>
+      <Reference name="OpenSim.Data"/>
+      <Reference name="OpenSim.Data.SQLite" />
+      <Reference name="System.Drawing"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Region.Environment"/>
+      <Reference name="OpenMetaverseTypes.dll"/>
+      <Reference name="OpenMetaverse.dll"/>
+      <Reference name="Mono.Data.SqliteClient"/>
+      <Reference name="Mono.Addins.dll" />
+      <Reference name="log4net.dll"/>
+      <Reference name="nunit.framework.dll" />
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+
     <Project name="OpenSim.Data.NHibernate" path="OpenSim/Data/NHibernate" type="Library">
       <Configuration name="Debug">
         <Options>