diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index eb254859b..d9676383e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -544,10 +544,10 @@ stages:
       variables:
         pattern: 'Radarr.*.linux-core-x64.tar.gz'
         artifactName: linux-x64-tests
-        Radarr__Postgres__Host: 'localhost'
-        Radarr__Postgres__Port: '5432'
-        Radarr__Postgres__User: 'radarr'
-        Radarr__Postgres__Password: 'radarr'
+        Radarr__PostgresHost: 'localhost'
+        Radarr__PostgresPort: '5432'
+        Radarr__PostgresUser: 'radarr'
+        Radarr__PostgresPassword: 'radarr'
 
       pool:
         vmImage: 'ubuntu-18.04'
@@ -681,10 +681,10 @@ stages:
       condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
       variables:
         pattern: 'Radarr.*.linux-core-x64.tar.gz'
-        Radarr__Postgres__Host: 'localhost'
-        Radarr__Postgres__Port: '5432'
-        Radarr__Postgres__User: 'radarr'
-        Radarr__Postgres__Password: 'radarr'
+        Radarr__PostgresHost: 'localhost'
+        Radarr__PostgresPort: '5432'
+        Radarr__PostgresUser: 'radarr'
+        Radarr__PostgresPassword: 'radarr'
 
       pool:
         vmImage: 'ubuntu-18.04'
diff --git a/src/NzbDrone.Common.Test/ServiceFactoryFixture.cs b/src/NzbDrone.Common.Test/ServiceFactoryFixture.cs
index d37d6c6ff..0a52a956c 100644
--- a/src/NzbDrone.Common.Test/ServiceFactoryFixture.cs
+++ b/src/NzbDrone.Common.Test/ServiceFactoryFixture.cs
@@ -2,6 +2,7 @@ using System.Linq;
 using DryIoc;
 using DryIoc.Microsoft.DependencyInjection;
 using FluentAssertions;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
@@ -32,7 +33,8 @@ namespace NzbDrone.Common.Test
                 .AddStartupContext(new StartupContext("first", "second"));
 
             container.RegisterInstance(new Mock<IHostLifetime>().Object);
-            container.RegisterInstance(new Mock<IOptions<ConfigFileOptions>>().Object);
+            container.RegisterInstance(new Mock<IConfiguration>().Object);
+            container.RegisterInstance(new Mock<IOptionsMonitor<ConfigFileOptions>>().Object);
 
             var serviceProvider = container.GetServiceProvider();
 
diff --git a/src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs b/src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs
index c2b665f78..6edb94918 100644
--- a/src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs
@@ -80,7 +80,7 @@ namespace NzbDrone.Core.Test.UpdateTests
         {
             Mocker.GetMock<IOptionsMonitor<ConfigFileOptions>>()
                 .Setup(s => s.CurrentValue)
-                .Returns(new ConfigFileOptions { UpdateMechanism = UpdateMechanism.Script, UpdateScriptPath = path });
+                .Returns(new ConfigFileOptions { UpdateAutomatically = true, UpdateMechanism = UpdateMechanism.Script, UpdateScriptPath = path });
 
             Mocker.GetMock<IDiskProvider>()
                   .Setup(s => s.FileExists(path, StringComparison.Ordinal))
diff --git a/src/NzbDrone.Integration.Test/IntegrationTest.cs b/src/NzbDrone.Integration.Test/IntegrationTest.cs
index 3ee59f31d..7377ac6b3 100644
--- a/src/NzbDrone.Integration.Test/IntegrationTest.cs
+++ b/src/NzbDrone.Integration.Test/IntegrationTest.cs
@@ -36,7 +36,7 @@ namespace NzbDrone.Integration.Test
         {
             Port = Interlocked.Increment(ref StaticPort);
 
-            Options = ConfigFileOptions.GetOptions();
+            Options = PostgresDatabase.GetTestOptions();
 
             if (Options?.PostgresHost != null)
             {