diff --git a/tests/SIL.LCModel.Tests/DomainImpl/ScrImportSetTests.cs b/tests/SIL.LCModel.Tests/DomainImpl/ScrImportSetTests.cs
index 797458f1..0e716dbb 100644
--- a/tests/SIL.LCModel.Tests/DomainImpl/ScrImportSetTests.cs
+++ b/tests/SIL.LCModel.Tests/DomainImpl/ScrImportSetTests.cs
@@ -6,7 +6,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using NUnit.Framework;
-using Rhino.Mocks;
+using SIL.LCModel.Tests.Rhino.Mocks;
 using SIL.LCModel.Core.Scripture;
 using SIL.LCModel.DomainServices;
 using SIL.LCModel.Utils;
diff --git a/tests/SIL.LCModel.Tests/DomainImpl/ScrMappingListTests.cs b/tests/SIL.LCModel.Tests/DomainImpl/ScrMappingListTests.cs
index 65ac74a5..413e2cc2 100644
--- a/tests/SIL.LCModel.Tests/DomainImpl/ScrMappingListTests.cs
+++ b/tests/SIL.LCModel.Tests/DomainImpl/ScrMappingListTests.cs
@@ -5,7 +5,7 @@
 using System;
 using System.IO;
 using NUnit.Framework;
-using Rhino.Mocks;
+using SIL.LCModel.Tests.Rhino.Mocks;
 using SIL.LCModel.Core.KernelInterfaces;
 using SIL.LCModel.Core.Scripture;
 using SIL.LCModel.DomainServices;
diff --git a/tests/SIL.LCModel.Tests/DomainImpl/VectorTests.cs b/tests/SIL.LCModel.Tests/DomainImpl/VectorTests.cs
index 2d7983af..abfd0d2e 100644
--- a/tests/SIL.LCModel.Tests/DomainImpl/VectorTests.cs
+++ b/tests/SIL.LCModel.Tests/DomainImpl/VectorTests.cs
@@ -9,7 +9,7 @@
 using System;
 using System.Linq;
 using NUnit.Framework;
-using Rhino.Mocks;
+using SIL.LCModel.Tests.Rhino.Mocks;
 using SIL.LCModel.Core.Scripture;
 using SIL.LCModel.Core.Text;
 using SIL.LCModel.Infrastructure;
diff --git a/tests/SIL.LCModel.Tests/DomainServices/DataStoreInitializationServicesTests.cs b/tests/SIL.LCModel.Tests/DomainServices/DataStoreInitializationServicesTests.cs
index 9198f471..42cbd6d6 100644
--- a/tests/SIL.LCModel.Tests/DomainServices/DataStoreInitializationServicesTests.cs
+++ b/tests/SIL.LCModel.Tests/DomainServices/DataStoreInitializationServicesTests.cs
@@ -5,15 +5,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Moq;
 using NUnit.Framework;
-using Rhino.Mocks;
+using SIL.LCModel.Tests.Rhino.Mocks;
 using SIL.LCModel.Core.KernelInterfaces;
 using SIL.LCModel.Core.Scripture;
 using SIL.LCModel.Core.Text;
 using SIL.LCModel.DomainImpl;
 using SIL.LCModel.Utils;
-using MockRepository = Rhino.Mocks.MockRepository;
 
 namespace SIL.LCModel.DomainServices
 {
diff --git a/tests/SIL.LCModel.Tests/DomainServices/ScrSfFileListTests.cs b/tests/SIL.LCModel.Tests/DomainServices/ScrSfFileListTests.cs
index bb225f7e..3750f4e0 100644
--- a/tests/SIL.LCModel.Tests/DomainServices/ScrSfFileListTests.cs
+++ b/tests/SIL.LCModel.Tests/DomainServices/ScrSfFileListTests.cs
@@ -4,7 +4,7 @@
 
 using System.Collections.Generic;
 using NUnit.Framework;
-using Rhino.Mocks;
+using SIL.LCModel.Tests.Rhino.Mocks;
 using SIL.LCModel.Core.Scripture;
 using SIL.LCModel.DomainImpl;
 
diff --git a/tests/SIL.LCModel.Tests/Infrastructure/Impl/IActionHandlerTests.cs b/tests/SIL.LCModel.Tests/Infrastructure/Impl/IActionHandlerTests.cs
index f0d60ea4..1b6fe2a2 100644
--- a/tests/SIL.LCModel.Tests/Infrastructure/Impl/IActionHandlerTests.cs
+++ b/tests/SIL.LCModel.Tests/Infrastructure/Impl/IActionHandlerTests.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
-using Rhino.Mocks;
+using SIL.LCModel.Tests.Rhino.Mocks;
 using SIL.LCModel.Application;
 using SIL.LCModel.Core.Cellar;
 using SIL.LCModel.Core.KernelInterfaces;
diff --git a/tests/SIL.LCModel.Tests/RhinoMocksToMoq/Expect.cs b/tests/SIL.LCModel.Tests/RhinoMocksToMoq/Expect.cs
index a8b8e5c3..c4af7aac 100644
--- a/tests/SIL.LCModel.Tests/RhinoMocksToMoq/Expect.cs
+++ b/tests/SIL.LCModel.Tests/RhinoMocksToMoq/Expect.cs
@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Linq.Expressions;
 using Moq;
 
-namespace Rhino.Mocks
+namespace SIL.LCModel.Tests.Rhino.Mocks
 {
     public interface IExpect<T> where T : class
     {
diff --git a/tests/SIL.LCModel.Tests/RhinoMocksToMoq/MockExtensions.cs b/tests/SIL.LCModel.Tests/RhinoMocksToMoq/MockExtensions.cs
index a5a1ff8b..ec4614dc 100644
--- a/tests/SIL.LCModel.Tests/RhinoMocksToMoq/MockExtensions.cs
+++ b/tests/SIL.LCModel.Tests/RhinoMocksToMoq/MockExtensions.cs
@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Linq.Expressions;
 using Moq;
 
-namespace Rhino.Mocks
+namespace SIL.LCModel.Tests.Rhino.Mocks
 {
     public static class MockExtensions
     {
diff --git a/tests/SIL.LCModel.Tests/RhinoMocksToMoq/MockRepository.cs b/tests/SIL.LCModel.Tests/RhinoMocksToMoq/MockRepository.cs
index e3057a82..4a72ba1b 100644
--- a/tests/SIL.LCModel.Tests/RhinoMocksToMoq/MockRepository.cs
+++ b/tests/SIL.LCModel.Tests/RhinoMocksToMoq/MockRepository.cs
@@ -1,6 +1,6 @@
-using Moq;
+using Moq;
 
-namespace Rhino.Mocks
+namespace SIL.LCModel.Tests.Rhino.Mocks
 {
     public static class MockRepository
     {
diff --git a/tests/SIL.LCModel.Tests/RhinoMocksToMoq/MoqAdapter.cs b/tests/SIL.LCModel.Tests/RhinoMocksToMoq/MoqAdapter.cs
index 9e432e8c..763420a0 100644
--- a/tests/SIL.LCModel.Tests/RhinoMocksToMoq/MoqAdapter.cs
+++ b/tests/SIL.LCModel.Tests/RhinoMocksToMoq/MoqAdapter.cs
@@ -2,7 +2,7 @@
 using System.Linq.Expressions;
 using Moq;
 
-namespace Rhino.Mocks
+namespace SIL.LCModel.Tests.Rhino.Mocks
 {
 	class MoqAdapter<T, TR> where T : class
 	{
diff --git a/tests/SIL.LCModel.Tests/RhinoMocksToMoq/MoqExtensions.cs b/tests/SIL.LCModel.Tests/RhinoMocksToMoq/MoqExtensions.cs
index a8f10899..59a734a1 100644
--- a/tests/SIL.LCModel.Tests/RhinoMocksToMoq/MoqExtensions.cs
+++ b/tests/SIL.LCModel.Tests/RhinoMocksToMoq/MoqExtensions.cs
@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Moq.Language.Flow;
 
-namespace Rhino.Mocks
+namespace SIL.LCModel.Tests.Rhino.Mocks
 {
     public static class MoqExtensions
     {