diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/BaseIntegratedTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/BaseIntegratedTest.cs
index a3f03643..731157a8 100644
--- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/BaseIntegratedTest.cs
+++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/BaseIntegratedTest.cs
@@ -344,10 +344,7 @@ protected virtual MSSQLDataService CreateMssqlDataService(string connectionStrin
             var securityManager = new EmptySecurityManager();
             var mockAuditService = new Mock<IAuditService>();
 
-            if (_useGisDataService)
-                return new GisMSSQLDataService(securityManager, mockAuditService.Object, businessServerProvider) { CustomizationString = connectionString };
-
-            return new MSSQLDataService(securityManager, mockAuditService.Object, businessServerProvider) { CustomizationString = connectionString };
+            return new MSSQLDataService(securityManager, mockAuditService.Object) { CustomizationString = connectionString };
         }
 
         /// <summary>
@@ -360,10 +357,7 @@ protected virtual PostgresDataService CreatePostgresDataService(string connectio
             var securityManager = new EmptySecurityManager();
             var mockAuditService = new Mock<IAuditService>();
 
-            if (_useGisDataService)
-                return new GisPostgresDataService(securityManager, mockAuditService.Object, businessServerProvider) { CustomizationString = connectionString };
-            
-            return new PostgresDataService(securityManager, mockAuditService.Object, businessServerProvider) { CustomizationString = connectionString };
+            return new PostgresDataService(securityManager, mockAuditService.Object) { CustomizationString = connectionString };
         }
 
         /// <summary>
@@ -375,7 +369,7 @@ protected virtual OracleDataService CreateOracleDataService(string connectionStr
         {
             var securityManager = new EmptySecurityManager();
             var mockAuditService = new Mock<IAuditService>();
-            return new OracleDataService(securityManager, mockAuditService.Object, businessServerProvider) { CustomizationString = connectionString };
+            return new OracleDataService(securityManager, mockAuditService.Object) { CustomizationString = connectionString };
         }
 
         /// <summary>
diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Offline/OfflineAuditServiceIntegratedTest.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Offline/OfflineAuditServiceIntegratedTest.cs
index b7473e5e..9c9001e1 100644
--- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Offline/OfflineAuditServiceIntegratedTest.cs
+++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Offline/OfflineAuditServiceIntegratedTest.cs
@@ -114,7 +114,7 @@ public void TestSettingAuditFieldsForTypeWithEnabledAudit()
         /// <returns>The <see cref="MSSQLDataService" /> instance.</returns>
         protected override MSSQLDataService CreateMssqlDataService(string connectionString)
         {
-            return new MSSQLDataService(new EmptySecurityManager(), GetAuditServiceForTest(), businessServerProvider) { CustomizationString = connectionString };
+            return new MSSQLDataService(new EmptySecurityManager(), GetAuditServiceForTest()) { CustomizationString = connectionString };
         }
 
         /// <summary>
@@ -124,7 +124,7 @@ protected override MSSQLDataService CreateMssqlDataService(string connectionStri
         /// <returns>The <see cref="PostgresDataService" /> instance.</returns>
         protected override PostgresDataService CreatePostgresDataService(string connectionString)
         {
-            return new PostgresDataService(new EmptySecurityManager(), GetAuditServiceForTest(), businessServerProvider) { CustomizationString = connectionString };
+            return new PostgresDataService(new EmptySecurityManager(), GetAuditServiceForTest()) { CustomizationString = connectionString };
         }
 
         /// <summary>
diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Startup.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Startup.cs
index 3ef52a19..444dc282 100644
--- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Startup.cs
+++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/Startup.cs
@@ -69,8 +69,7 @@ public virtual void ConfigureServices(IServiceCollection services)
 
                 var securityManager = new EmptySecurityManager();
                 Mock<IAuditService> mockAuditService = new Mock<IAuditService>();
-                Mock<IBusinessServerProvider> mockBusinessServerProvider = new Mock<IBusinessServerProvider>();
-                IDataService dataService = new PostgresDataService(securityManager, mockAuditService.Object, mockBusinessServerProvider.Object) { CustomizationString = CustomizationString };
+                IDataService dataService = new PostgresDataService(securityManager, mockAuditService.Object) { CustomizationString = CustomizationString };
 
                 unityContainer.RegisterInstance(dataService);
 
diff --git a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/XUnitTestRunnerInitializer.cs b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/XUnitTestRunnerInitializer.cs
index bdc11a43..5e8a1f8a 100644
--- a/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/XUnitTestRunnerInitializer.cs
+++ b/Tests/NewPlatform.Flexberry.ORM.ODataService.Tests/XUnitTestRunnerInitializer.cs
@@ -35,10 +35,7 @@ public XUnitTestRunnerInitializer(IMessageSink messageSink)
             : base(messageSink)
         {
             var container = new UnityContainer();
-            IServiceProvider serviceProvider = new UnityServiceProvider(container);
-            IBusinessServerProvider businessServerProvider = new BusinessServerProvider(serviceProvider);
-            IDataService ds = new MSSQLDataService(new Mock<ISecurityManager>().Object, new Mock<IAuditService>().Object, businessServerProvider);
-            BaseIntegratedTest.BSProvider = businessServerProvider;
+            IDataService ds = new MSSQLDataService(new Mock<ISecurityManager>().Object, new Mock<IAuditService>().Object);
 
             DataServiceProvider.DataService = ds;
             ExternalLangDef.LanguageDef = new ExternalLangDef(ds);