diff --git a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
index ff324e78b9..fd6f508414 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.MySQL.Tests
 {
diff --git a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
index a2f0a4ca84..1f44b4b7e9 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.MySQL.Tests
 {
diff --git a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
index a1b973a004..23512dc382 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.MySQL.Tests
 {
diff --git a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
index 298b4fc59c..f5393592fa 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.MySQL.Tests
 {
diff --git a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
index ff64e59283..294a80e776 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.MySQL.Tests
 {
diff --git a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
index 920fcf1528..3da06c8c67 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.MySQL.Tests
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
index e60cb5a32f..66bb8b0b2b 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs
index 11c8575f94..b344bf0bc1 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
index 3f085f3668..6fd0b29182 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
index 8017f713c0..e9ca83a2e9 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
index 572ac2cb44..e04c5fa422 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
index 02b0dc8969..f78a30113a 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
index 63fcbc69ad..8f36a4a063 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
index 0915e0ddc5..1503838690 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
index 51f8cb1fcf..771ba58e3a 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
index 7417a2a960..982f8dbc73 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
index 57c07413b7..c446c24aa7 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs
index af61738294..149c01c21c 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs
index 1601121b15..914fabf180 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs
index 672a76d9e7..c51aabfb5e 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs
index 92f2385f4f..9397f74559 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs
index 98937bfe49..9969a8f0e5 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs
index 8df0061a3a..4a02befb32 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs
index aed54cc108..bc3c9cd04e 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
index 50ad0e92f0..fd4035d412 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
@@ -31,6 +31,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs
index e8b3dd3d0a..39e704a7b1 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs
@@ -31,6 +31,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
index fad2c7d0b1..0663a16f4e 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
@@ -31,6 +31,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
index 7ec3ccbb29..e30210d077 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
@@ -31,6 +31,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
index a7eb265bf5..56aecc2eba 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
@@ -31,6 +31,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
index 90958ec7ff..da57518b5e 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
@@ -31,6 +31,7 @@ using NUnit.Framework;
 using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
index db21892e1b..7221811467 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
@@ -28,6 +28,7 @@
 using System.IO;
 using NUnit.Framework;
 using OpenSim.Data.Tests;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.SQLite.Tests
 {
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
index dadc2da349..9ed9897b42 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
@@ -28,6 +28,7 @@
 using System.IO;
 using NUnit.Framework;
 using OpenSim.Data.Tests;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.SQLite.Tests
 {
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
index 9c65cd29e5..a5b2e0647b 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
@@ -28,6 +28,7 @@
 using System.IO;
 using NUnit.Framework;
 using OpenSim.Data.Tests;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.SQLite.Tests
 {
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
index 2c2dc3c011..be17a38615 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
@@ -28,6 +28,7 @@
 using System.IO;
 using NUnit.Framework;
 using OpenSim.Data.Tests;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.SQLite.Tests
 {
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
index f074b64025..1c0ba712d4 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
@@ -28,6 +28,7 @@
 using System.IO;
 using NUnit.Framework;
 using OpenSim.Data.Tests;
+using OpenSim.Tests.Common;
 
 namespace OpenSim.Data.SQLite.Tests
 {
diff --git a/OpenSim/Data/Tests/DatabaseTestAttribute.cs b/OpenSim/Tests/Common/DatabaseTestAttribute.cs
similarity index 54%
rename from OpenSim/Data/Tests/DatabaseTestAttribute.cs
rename to OpenSim/Tests/Common/DatabaseTestAttribute.cs
index b500f40535..9d21831993 100644
--- a/OpenSim/Data/Tests/DatabaseTestAttribute.cs
+++ b/OpenSim/Tests/Common/DatabaseTestAttribute.cs
@@ -3,15 +3,15 @@ using System.Collections.Generic;
 using System.Text;
 using NUnit.Framework;
 
-namespace OpenSim.Data.Tests
-{   
+namespace OpenSim.Tests.Common
+{
     [AttributeUsage(AttributeTargets.All, 
-                   AllowMultiple=false, 
-                   Inherited=true)]
-    public class DatabaseTestAttribute : CategoryAttribute
+        AllowMultiple=false, 
+        Inherited=true)]
+    public class DatabaseTestAttribute : LongRunningAttribute
     {
         public DatabaseTestAttribute() : base("Database")
         { 
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/LongRunningAttribute.cs b/OpenSim/Tests/Common/LongRunningAttribute.cs
new file mode 100644
index 0000000000..722217d9f1
--- /dev/null
+++ b/OpenSim/Tests/Common/LongRunningAttribute.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using NUnit.Framework;
+
+namespace OpenSim.Tests.Common
+{
+    [AttributeUsage(AttributeTargets.All,
+        AllowMultiple = false,
+        Inherited = true)]
+    public class LongRunningAttribute :  CategoryAttribute 
+    {
+        protected LongRunningAttribute() : this("Long Running Test")
+        {
+            
+        }
+
+        protected LongRunningAttribute(string category) : base(category)
+        {            
+        }
+    }
+}
diff --git a/prebuild.xml b/prebuild.xml
index 15be54ea26..067dc8d839 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2844,6 +2844,7 @@
       <Reference name="OpenMetaverseTypes.dll"/>
       <Reference name="OpenMetaverse.dll"/>
       <Reference name="MySql.Data.dll"/>
+      <Reference name="OpenSim.Tests.Common"/>
       <Reference name="OpenSim.Data.Tests"/>
       <Reference name="OpenSim.Data.MySQL"/>
       <Reference name="OpenSim.Framework.Console"/>
@@ -2878,6 +2879,7 @@
       <Reference name="OpenSim.Data"/>
       <Reference name="OpenSim.Data.NHibernate"/>
       <Reference name="OpenSim.Data.Tests"/>
+      <Reference name="OpenSim.Tests.Common"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Region.Framework"/>
       <Reference name="OpenMetaverseTypes.dll"/>
@@ -2914,6 +2916,7 @@
       <Reference name="System.Data.SQLite.dll"/>
       <Reference name="OpenSim.Data"/>
       <Reference name="OpenSim.Data.Tests"/>
+      <Reference name="OpenSim.Tests.Common"/>
       <Reference name="OpenSim.Data.SQLite" />
       <Reference name="System.Drawing"/>
       <Reference name="OpenSim.Framework"/>
@@ -2947,6 +2950,7 @@
       <Reference name="System"/>
       <Reference name="System.Xml"/>
       <Reference name="System.Data"/>
+      <Reference name="OpenMetaverse.dll"/>
       <Reference name="OpenMetaverseTypes.dll"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="OpenSim.Framework.Console"/>