diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
index 807afcc6b7..44a28a21bc 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Framework.Communications.Tests
             UUID nonExistingUserId = UUID.Parse("00000000-0000-0000-0000-000000000001");
             UUID existingUserId = UUID.Parse("00000000-0000-0000-0000-000000000002");
             
-            CommunicationsManager commsManager = UserProfileTestUtils.SetupServices();
+            TestCommunicationsManager commsManager = new TestCommunicationsManager();
             CachedUserInfo existingUserInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager, existingUserId);
             
             Assert.That(existingUserInfo, Is.Not.Null, "Existing user info unexpectedly not found");
@@ -68,7 +68,7 @@ namespace OpenSim.Framework.Communications.Tests
         [Test]
         public void TestRequestInventoryForUser()
         {
-            CommunicationsManager commsManager = UserProfileTestUtils.SetupServices();
+            TestCommunicationsManager commsManager = new TestCommunicationsManager();
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);          
             
             Assert.That(userInfo.HasReceivedInventory, Is.True);
@@ -80,7 +80,7 @@ namespace OpenSim.Framework.Communications.Tests
         [Test]
         public void TestGetChildFolder()
         {
-            CommunicationsManager commsManager = UserProfileTestUtils.SetupServices();
+            TestCommunicationsManager commsManager = new TestCommunicationsManager();
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
             
             UUID folderId = UUID.Parse("00000000-0000-0000-0000-000000000011");
@@ -96,12 +96,12 @@ namespace OpenSim.Framework.Communications.Tests
         /// </summary>
         [Test]
         public void TestCreateFolder()
-        {
-            IUserDataPlugin userDataPlugin = new TestUserDataPlugin();
-            IInventoryDataPlugin inventoryDataPlugin = new TestInventoryDataPlugin();
+        {           
+            TestCommunicationsManager commsManager = new TestCommunicationsManager();
+            
+            IUserDataPlugin userDataPlugin = commsManager.UserDataPlugin;
+            IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin;
             
-            CommunicationsManager commsManager 
-                = UserProfileTestUtils.SetupServices(userDataPlugin, inventoryDataPlugin);
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
             
             UUID folderId = UUID.Parse("00000000-0000-0000-0000-000000000010");            
@@ -129,11 +129,11 @@ namespace OpenSim.Framework.Communications.Tests
         [Test]
         public void TestUpdateFolder()
         {
-            IUserDataPlugin userDataPlugin = new TestUserDataPlugin();
-            IInventoryDataPlugin inventoryDataPlugin = new TestInventoryDataPlugin();
+            TestCommunicationsManager commsManager = new TestCommunicationsManager();
+            
+            IUserDataPlugin userDataPlugin = commsManager.UserDataPlugin;
+            IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin;
             
-            CommunicationsManager commsManager 
-                = UserProfileTestUtils.SetupServices(userDataPlugin, inventoryDataPlugin);
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
             
             UUID folder1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
@@ -188,11 +188,11 @@ namespace OpenSim.Framework.Communications.Tests
         [Test]
         public void TestMoveFolder()
         {
-            IUserDataPlugin userDataPlugin = new TestUserDataPlugin();
-            IInventoryDataPlugin inventoryDataPlugin = new TestInventoryDataPlugin();
+            TestCommunicationsManager commsManager = new TestCommunicationsManager();
+            
+            IUserDataPlugin userDataPlugin = commsManager.UserDataPlugin;
+            IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin;
             
-            CommunicationsManager commsManager 
-                = UserProfileTestUtils.SetupServices(userDataPlugin, inventoryDataPlugin);
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
 
             UUID folder1Id = UUID.Parse("00000000-0000-0000-0000-000000000020");
@@ -226,11 +226,11 @@ namespace OpenSim.Framework.Communications.Tests
         {
             //log4net.Config.XmlConfigurator.Configure();
             
-            IUserDataPlugin userDataPlugin = new TestUserDataPlugin();
-            IInventoryDataPlugin inventoryDataPlugin = new TestInventoryDataPlugin();
+            TestCommunicationsManager commsManager = new TestCommunicationsManager();
+            
+            IUserDataPlugin userDataPlugin = commsManager.UserDataPlugin;
+            IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin;
             
-            CommunicationsManager commsManager 
-                = UserProfileTestUtils.SetupServices(userDataPlugin, inventoryDataPlugin);
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
             
             UUID folder1Id = UUID.Parse("00000000-0000-0000-0000-000000000070");
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs
index ea209fddb7..cf07ae5006 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs
@@ -37,33 +37,7 @@ namespace OpenSim.Framework.Communications.Tests
     /// Utility functions for carrying out user profile relate tests.
     /// </summary>
     public class UserProfileTestUtils
-    {
-        /// <summary>
-        /// Set up standard services required for user tests.
-        /// </summary>
-        /// <returns>CommunicationsManager used to access these services</returns>
-        public static CommunicationsManager SetupServices()
-        {
-            return SetupServices(new TestUserDataPlugin(), new TestInventoryDataPlugin());
-        }
-        
-        /// <summary>
-        /// Set up standard services required for user tests.
-        /// </summary>
-        /// <param name="userDataPlugin"></param>
-        /// <param name="inventoryDataPlugin"></param>
-        /// <returns>CommunicationsManager used to access these services</returns>
-        public static CommunicationsManager SetupServices(
-            IUserDataPlugin userDataPlugin, IInventoryDataPlugin inventoryDataPlugin)
-        {
-            CommunicationsManager commsManager = new TestCommunicationsManager();
-            
-            ((LocalUserServices)commsManager.UserService).AddPlugin(userDataPlugin);
-            ((LocalInventoryService)commsManager.InventoryService).AddPlugin(inventoryDataPlugin);
-            
-            return commsManager;
-        }
-        
+    {           
         /// <summary>
         /// Create a test user with a standard inventory
         /// </summary>
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
index 51adba1600..1e1fa73149 100644
--- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Framework.Communications.Tests
         [Test]
         public void TestNormalLoginResponse()
         {
-            log4net.Config.XmlConfigurator.Configure();
+            //log4net.Config.XmlConfigurator.Configure();
             
             string firstName = "Timmy";
             string lastName = "Mallet";
@@ -58,9 +58,6 @@ namespace OpenSim.Framework.Communications.Tests
             CommunicationsManager commsManager 
                 = new TestCommunicationsManager(new OpenSim.Framework.NetworkServersInfo(42, 43));
             
-            ((LocalUserServices)commsManager.UserService).AddPlugin(new TestUserDataPlugin());
-            ((LocalInventoryService)commsManager.InventoryService).AddPlugin(new TestInventoryDataPlugin());
-            
             commsManager.GridService.RegisterRegion(
                 new RegionInfo(42, 43, new IPEndPoint(IPAddress.Loopback, 9000), "localhost"));
             commsManager.GridService.RegionLoginsEnabled = true;
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
index e6648e11e2..e347e67c3c 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
@@ -313,9 +313,6 @@ namespace OpenSim.Region.Environment.Scenes.Tests
             TestScene scene = SceneTestUtils.SetupScene();                
             SceneObjectPart part = SceneTestUtils.AddSceneObject(scene, myObjectName);
             
-            ((LocalUserServices)scene.CommsManager.UserService).AddPlugin(new TestUserDataPlugin());
-            ((LocalInventoryService)scene.CommsManager.InventoryService).AddPlugin(new TestInventoryDataPlugin());
-            
             Assert.That(
                 scene.CommsManager.UserAdminService.AddUser(
                     "Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId),
diff --git a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
index 204ebd7a36..c234429409 100644
--- a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
+++ b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
@@ -35,6 +35,18 @@ namespace OpenSim.Tests.Common.Mock
 {
     public class TestCommunicationsManager : CommunicationsManager
     {
+        public IUserDataPlugin UserDataPlugin
+        {
+            get { return m_userDataPlugin; }
+        }
+        private IUserDataPlugin m_userDataPlugin;
+        
+        public IInventoryDataPlugin InventoryDataPlugin
+        {
+            get { return m_inventoryDataPlugin; }
+        }
+        private IInventoryDataPlugin m_inventoryDataPlugin;
+        
         public TestCommunicationsManager()
             : this(null)
         {          
@@ -43,16 +55,21 @@ namespace OpenSim.Tests.Common.Mock
         public TestCommunicationsManager(NetworkServersInfo serversInfo)
             : base(serversInfo, null, null, false, null)
         {
+            m_userDataPlugin = new TestUserDataPlugin();
+            m_inventoryDataPlugin = new TestInventoryDataPlugin();
+                     
             LocalInventoryService lis = new LocalInventoryService();
+            lis.AddPlugin(m_inventoryDataPlugin);
             m_interServiceInventoryService = lis;
-            AddInventoryService(lis);
+            AddInventoryService(lis);      
             
             LocalUserServices lus = new LocalUserServices(991, 992, lis);
+            lus.AddPlugin(m_userDataPlugin);
             m_userService = lus;
-            m_userAdminService = lus;   
+            m_userAdminService = lus;         
             
             LocalBackEndServices gs = new LocalBackEndServices();
-            m_gridService = gs;
+            m_gridService = gs;          
         }
     }
 }