diff --git a/core/pom.xml b/core/pom.xml
index 260805839..879448ece 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -438,9 +438,11 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.8.1</version>
+            <version>5.15.2</version>
             <scope>test</scope>
         </dependency>
+
+
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
diff --git a/core/src/test/java/org/nzbhydra/NzbHandlerTest.java b/core/src/test/java/org/nzbhydra/NzbHandlerTest.java
index 286b9a254..695920571 100644
--- a/core/src/test/java/org/nzbhydra/NzbHandlerTest.java
+++ b/core/src/test/java/org/nzbhydra/NzbHandlerTest.java
@@ -1,17 +1,19 @@
 package org.nzbhydra;
 
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
 import org.nzbhydra.downloading.FileDownloadEntity;
 import org.nzbhydra.downloading.FileDownloadRepository;
 import org.nzbhydra.downloading.FileHandler;
 
-import static org.mockito.Mockito.when;
-
+import static org.mockito.Mockito.when;
+
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class NzbHandlerTest {
 
     @InjectMocks
@@ -26,7 +28,7 @@ public class NzbHandlerTest {
 
     @BeforeEach
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+
         when(configProviderMock.getBaseConfig()).thenReturn(baseConfig);
     }
 
diff --git a/core/src/test/java/org/nzbhydra/api/CapsGeneratorTest.java b/core/src/test/java/org/nzbhydra/api/CapsGeneratorTest.java
index 684cac52d..be2ee4f7c 100644
--- a/core/src/test/java/org/nzbhydra/api/CapsGeneratorTest.java
+++ b/core/src/test/java/org/nzbhydra/api/CapsGeneratorTest.java
@@ -20,7 +20,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
 import org.nzbhydra.config.category.CategoriesConfig;
@@ -32,6 +33,7 @@
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.mockito.Mockito.when;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class CapsGeneratorTest {
 
     @Mock
@@ -42,7 +44,7 @@ public class CapsGeneratorTest {
 
     @BeforeEach
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+
         BaseConfig baseConfig = new BaseConfig();
 
         CategoriesConfig categoriesConfig = new CategoriesConfig();
diff --git a/core/src/test/java/org/nzbhydra/api/CategoryConverterTest.java b/core/src/test/java/org/nzbhydra/api/CategoryConverterTest.java
index f012e5760..d7405eb72 100644
--- a/core/src/test/java/org/nzbhydra/api/CategoryConverterTest.java
+++ b/core/src/test/java/org/nzbhydra/api/CategoryConverterTest.java
@@ -4,13 +4,15 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.category.Category;
 import org.nzbhydra.searching.CategoryProvider;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class CategoryConverterTest {
 
     @InjectMocks
@@ -21,7 +23,7 @@ public class CategoryConverterTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
         testee.setCategoryProvider(categoryProviderMock);
     }
 
diff --git a/core/src/test/java/org/nzbhydra/api/ExternalApiTest.java b/core/src/test/java/org/nzbhydra/api/ExternalApiTest.java
index dcab320ea..3a37e8f22 100644
--- a/core/src/test/java/org/nzbhydra/api/ExternalApiTest.java
+++ b/core/src/test/java/org/nzbhydra/api/ExternalApiTest.java
@@ -4,8 +4,9 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.mockito.stubbing.Answer;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
@@ -39,7 +40,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.*;
 
-
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class ExternalApiTest {
 
     BaseConfig baseConfig = new BaseConfig();
@@ -76,7 +77,7 @@ public class ExternalApiTest {
 
     @BeforeEach
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+
         when(configProvider.getBaseConfig()).thenReturn(baseConfig);
         baseConfig.setMain(new MainConfig());
         baseConfig.getMain().setApiKey("apikey");
diff --git a/core/src/test/java/org/nzbhydra/api/NewznabXmlTransformerTest.java b/core/src/test/java/org/nzbhydra/api/NewznabXmlTransformerTest.java
index ef8bb3330..03edf09ee 100644
--- a/core/src/test/java/org/nzbhydra/api/NewznabXmlTransformerTest.java
+++ b/core/src/test/java/org/nzbhydra/api/NewznabXmlTransformerTest.java
@@ -20,7 +20,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
 import org.nzbhydra.config.MainConfig;
@@ -39,6 +40,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class NewznabXmlTransformerTest {
 
     @Mock
@@ -56,7 +58,7 @@ public class NewznabXmlTransformerTest {
 
     @BeforeEach
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+
         when(configProvider.getBaseConfig()).thenReturn(baseConfig);
         baseConfig.setMain(new MainConfig());
         baseConfig.getMain().setApiKey("apikey");
diff --git a/core/src/test/java/org/nzbhydra/backup/BackupTaskTest.java b/core/src/test/java/org/nzbhydra/backup/BackupTaskTest.java
index 70a708f1d..87b7295d4 100644
--- a/core/src/test/java/org/nzbhydra/backup/BackupTaskTest.java
+++ b/core/src/test/java/org/nzbhydra/backup/BackupTaskTest.java
@@ -6,7 +6,8 @@
 import org.mockito.Captor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
 import org.nzbhydra.genericstorage.GenericStorage;
@@ -22,8 +23,10 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class BackupTaskTest {
 
+    BaseConfig config = new BaseConfig();
     @Mock
     private BackupAndRestore backupAndRestore;
     @Mock
@@ -32,14 +35,12 @@ public class BackupTaskTest {
     private ConfigProvider configProvider;
     @Captor
     private ArgumentCaptor<BackupData> backupDataArgumentCaptor;
-    BaseConfig config = new BaseConfig();
-
     @InjectMocks
     private BackupTask testee = new BackupTask();
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
 
         when(configProvider.getBaseConfig()).thenReturn(config);
         config.getMain().setBackupEveryXDays(7);
diff --git a/core/src/test/java/org/nzbhydra/config/BaseConfigTest.java b/core/src/test/java/org/nzbhydra/config/BaseConfigTest.java
index 81e25d00b..e5745f350 100644
--- a/core/src/test/java/org/nzbhydra/config/BaseConfigTest.java
+++ b/core/src/test/java/org/nzbhydra/config/BaseConfigTest.java
@@ -9,7 +9,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.category.Category;
 import org.nzbhydra.config.validation.BaseConfigValidator;
 import org.nzbhydra.config.validation.ConfigValidationTools;
@@ -27,22 +28,21 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class BaseConfigTest {
 
     //If true the actual content of the config in code and in baseConfig.yml will be compared
     //If false only the structure will be compare, meaning both sides have to have the same keys but the values can be different
     private static final boolean COMPARE_CONFIG_VALUES = false;
     private Set<String> dontCheckTheseLists = Sets.newHashSet("categories");
-
-    @BeforeEach
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-    }
-
     @InjectMocks
     private BaseConfig testee = new BaseConfig();
     private BaseConfigValidator baseConfigValidator = new BaseConfigValidator();
 
+    @BeforeEach
+    public void setUp() throws Exception {
+
+    }
 
     @Test
     void shouldRecognizeRestartRequired() {
@@ -88,8 +88,6 @@ void applicationPropertiesShouldHaveTheSameKeysAsConfigClasses() throws Exceptio
     }
 
 
-
-
     private void compare(Object left, Object right) {
         if (left instanceof HashMap) {
             compareMaps((HashMap) left, (HashMap) right);
diff --git a/core/src/test/java/org/nzbhydra/config/migration/ConfigMigrationTest.java b/core/src/test/java/org/nzbhydra/config/migration/ConfigMigrationTest.java
index 88a5f3f87..36994cda9 100644
--- a/core/src/test/java/org/nzbhydra/config/migration/ConfigMigrationTest.java
+++ b/core/src/test/java/org/nzbhydra/config/migration/ConfigMigrationTest.java
@@ -23,7 +23,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.MainConfig;
 
@@ -40,6 +41,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class ConfigMigrationTest {
 
     @Mock
@@ -55,7 +57,7 @@ public class ConfigMigrationTest {
 
     @BeforeEach
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+
         objectMapper.registerModule(new Jdk8Module());
     }
 
diff --git a/core/src/test/java/org/nzbhydra/downloading/DownloadStatusUpdaterTest.java b/core/src/test/java/org/nzbhydra/downloading/DownloadStatusUpdaterTest.java
index 2375a0a64..5069efe96 100644
--- a/core/src/test/java/org/nzbhydra/downloading/DownloadStatusUpdaterTest.java
+++ b/core/src/test/java/org/nzbhydra/downloading/DownloadStatusUpdaterTest.java
@@ -20,7 +20,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
 import org.nzbhydra.downloading.downloaders.Downloader;
@@ -38,6 +39,7 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class DownloadStatusUpdaterTest {
 
     @Mock
@@ -54,7 +56,7 @@ public class DownloadStatusUpdaterTest {
 
     @BeforeEach
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+
         when(downloaderProvider.getAllDownloaders()).thenReturn(Collections.singletonList(downloaderMock));
         when(downloaderMock.isEnabled()).thenReturn(true);
         when(configProvider.getBaseConfig()).thenReturn(new BaseConfig());
diff --git a/core/src/test/java/org/nzbhydra/downloading/IndexerUniquenessScoreSaverTest.java b/core/src/test/java/org/nzbhydra/downloading/IndexerUniquenessScoreSaverTest.java
index 74f2bdf95..f445f9c57 100644
--- a/core/src/test/java/org/nzbhydra/downloading/IndexerUniquenessScoreSaverTest.java
+++ b/core/src/test/java/org/nzbhydra/downloading/IndexerUniquenessScoreSaverTest.java
@@ -26,7 +26,8 @@
 import org.mockito.Captor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
 import org.nzbhydra.config.SearchSource;
@@ -53,6 +54,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class IndexerUniquenessScoreSaverTest {
 
     @Mock
@@ -80,7 +82,7 @@ public class IndexerUniquenessScoreSaverTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
         final BaseConfig value = new BaseConfig();
         value.getMain().setKeepHistory(true);
         when(configProviderMock.getBaseConfig()).thenReturn(value);
diff --git a/core/src/test/java/org/nzbhydra/downloading/downloaders/DownloaderTest.java b/core/src/test/java/org/nzbhydra/downloading/downloaders/DownloaderTest.java
index 936424e49..a4e6bf39a 100644
--- a/core/src/test/java/org/nzbhydra/downloading/downloaders/DownloaderTest.java
+++ b/core/src/test/java/org/nzbhydra/downloading/downloaders/DownloaderTest.java
@@ -21,7 +21,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
 import org.nzbhydra.config.downloading.DownloaderConfig;
 import org.nzbhydra.downloading.FileDownloadEntity;
 import org.nzbhydra.downloading.FileDownloadStatus;
@@ -56,7 +56,7 @@ public class DownloaderTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
         testee.nzbHandler = nzbHandler;
         testee.searchResultRepository = searchResultRepository;
         testee.downloaderConfig = new DownloaderConfig();
diff --git a/core/src/test/java/org/nzbhydra/downloading/torrents/TorrentFileHandlerTest.java b/core/src/test/java/org/nzbhydra/downloading/torrents/TorrentFileHandlerTest.java
index 962c46110..af7a1db5d 100644
--- a/core/src/test/java/org/nzbhydra/downloading/torrents/TorrentFileHandlerTest.java
+++ b/core/src/test/java/org/nzbhydra/downloading/torrents/TorrentFileHandlerTest.java
@@ -22,7 +22,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
 import org.nzbhydra.downloading.DownloadResult;
@@ -32,6 +33,7 @@
 
 import static org.mockito.Mockito.when;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class TorrentFileHandlerTest {
 
     @Mock
@@ -44,7 +46,7 @@ public class TorrentFileHandlerTest {
 
     @BeforeEach
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+
 
         final BaseConfig baseConfig = new BaseConfig();
         when(configProviderMock.getBaseConfig()).thenReturn(baseConfig);
diff --git a/core/src/test/java/org/nzbhydra/indexers/AnizbTest.java b/core/src/test/java/org/nzbhydra/indexers/AnizbTest.java
index aea016d7c..770e96b06 100644
--- a/core/src/test/java/org/nzbhydra/indexers/AnizbTest.java
+++ b/core/src/test/java/org/nzbhydra/indexers/AnizbTest.java
@@ -4,8 +4,9 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.mockito.stubbing.Answer;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
@@ -23,11 +24,12 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class AnizbTest {
 
+    BaseConfig baseConfig = new BaseConfig();
     @Mock
     private ConfigProvider configProviderMock;
-    BaseConfig baseConfig = new BaseConfig();
     @Mock
     private QueryGenerator queryGeneratorMock;
 
@@ -37,7 +39,7 @@ public class AnizbTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
         when(configProviderMock.getBaseConfig()).thenReturn(baseConfig);
         testee.config = new IndexerConfig();
         testee.config.setName("anizb");
diff --git a/core/src/test/java/org/nzbhydra/indexers/BinsearchTest.java b/core/src/test/java/org/nzbhydra/indexers/BinsearchTest.java
index a2cf82146..b2b755b7a 100644
--- a/core/src/test/java/org/nzbhydra/indexers/BinsearchTest.java
+++ b/core/src/test/java/org/nzbhydra/indexers/BinsearchTest.java
@@ -9,7 +9,8 @@
 import org.mockito.Captor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.mockito.stubbing.Answer;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
@@ -37,14 +38,16 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
+import org.mockito.quality.Strictness;
 @SuppressWarnings("ConstantConditions")
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class BinsearchTest {
 
+    BaseConfig baseConfig = new BaseConfig();
     @Mock
     private ConfigProvider configProviderMock;
     @Mock
     private CategoryProvider categoryProviderMock;
-    BaseConfig baseConfig = new BaseConfig();
     @Captor
     private ArgumentCaptor<URI> uriCaptor;
     @Mock
@@ -57,7 +60,7 @@ public class BinsearchTest {
     @BeforeEach
     public void setUp() throws Exception {
         Binsearch.clock = Clock.fixed(Instant.ofEpochSecond(1707391628L), ZoneId.of("UTC"));
-        MockitoAnnotations.initMocks(this);
+
         when(configProviderMock.getBaseConfig()).thenReturn(baseConfig);
         testee.config = new IndexerConfig();
         testee.config.setName("binsearch");
diff --git a/core/src/test/java/org/nzbhydra/indexers/IndexerStatusesCleanupTaskTest.java b/core/src/test/java/org/nzbhydra/indexers/IndexerStatusesCleanupTaskTest.java
index ab8379442..ec8edba69 100644
--- a/core/src/test/java/org/nzbhydra/indexers/IndexerStatusesCleanupTaskTest.java
+++ b/core/src/test/java/org/nzbhydra/indexers/IndexerStatusesCleanupTaskTest.java
@@ -20,7 +20,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.BaseConfigHandler;
 import org.nzbhydra.config.ConfigProvider;
@@ -34,6 +35,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class IndexerStatusesCleanupTaskTest {
 
     @Mock
@@ -57,7 +59,7 @@ public class IndexerStatusesCleanupTaskTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
         testee = new IndexerStatusesCleanupTask(configProvider, baseConfigHandler);
         indexerConfigEnabled.setState(IndexerConfig.State.ENABLED);
         indexerConfigUserDisabled.setState(IndexerConfig.State.DISABLED_USER);
diff --git a/core/src/test/java/org/nzbhydra/indexers/IndexerTest.java b/core/src/test/java/org/nzbhydra/indexers/IndexerTest.java
index 369879f9e..341cff4f9 100644
--- a/core/src/test/java/org/nzbhydra/indexers/IndexerTest.java
+++ b/core/src/test/java/org/nzbhydra/indexers/IndexerTest.java
@@ -8,8 +8,9 @@
 import org.mockito.Captor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.mockito.stubbing.Answer;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.BaseConfigHandler;
@@ -57,6 +58,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.*;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class IndexerTest {
 
     private Logger testLogger = LoggerFactory.getLogger("test");
@@ -150,7 +152,7 @@ protected List<SearchResultItem> persistSearchResults(List<SearchResultItem> sea
     @BeforeEach
     public void setUp() throws Exception {
 
-        MockitoAnnotations.initMocks(this);
+
         when(indexerMock.getIndexerEntity()).thenReturn(indexerEntityMock);
         when(indexerMock.getConfig()).thenReturn(indexerConfig);
 
diff --git a/core/src/test/java/org/nzbhydra/indexers/IndexerWebAccessTest.java b/core/src/test/java/org/nzbhydra/indexers/IndexerWebAccessTest.java
index c6f7e9d95..3f065cf12 100644
--- a/core/src/test/java/org/nzbhydra/indexers/IndexerWebAccessTest.java
+++ b/core/src/test/java/org/nzbhydra/indexers/IndexerWebAccessTest.java
@@ -6,7 +6,8 @@
 import org.mockito.Captor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
 import org.nzbhydra.config.SearchingConfig;
@@ -25,6 +26,7 @@
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class IndexerWebAccessTest {
 
     @Mock
@@ -46,7 +48,7 @@ public class IndexerWebAccessTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
         String xml = "<?xml version=\"1.0\" ?>\n" +
                 "<metadata>\n" +
                 "</metadata>";
diff --git a/core/src/test/java/org/nzbhydra/indexers/NewznabTest.java b/core/src/test/java/org/nzbhydra/indexers/NewznabTest.java
index 91e27d7bc..183667e5b 100644
--- a/core/src/test/java/org/nzbhydra/indexers/NewznabTest.java
+++ b/core/src/test/java/org/nzbhydra/indexers/NewznabTest.java
@@ -9,8 +9,9 @@
 import org.mockito.Captor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.mockito.stubbing.Answer;
 import org.nzbhydra.NzbHydraException;
 import org.nzbhydra.config.BaseConfig;
@@ -75,6 +76,7 @@
 import static org.mockito.Mockito.*;
 
 @SuppressWarnings("ALL")
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class NewznabTest {
 
     private BaseConfig baseConfig;
@@ -134,7 +136,7 @@ public class NewznabTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
 //        testee = new Newznab(configProviderMock,indexerRepositoryMock,searchResultRepositoryMock, indexerApiAccessRepositoryMock, null,null,indexerWebAccessMock,resultAcceptorMock, categoryProviderMock, infoProviderMock, null,queryGeneratorMock, customQueryAndTitleMappingHandler,unmarshallerMock,baseConfigHandler,null);
         testee = spy(testee);
         when(infoProviderMock.canConvert(MediaIdType.IMDB, MediaIdType.TMDB)).thenReturn(true);
@@ -206,11 +208,11 @@ void shouldReturnCorrectSearchResults() throws Exception {
     @Test
     void shouldAccountForRejectedResults() throws Exception {
         List<NewznabXmlItem> items = Arrays.asList(
-            RssItemBuilder.builder("title1").build(),
-            RssItemBuilder.builder("title2").build(),
-            RssItemBuilder.builder("title3").build(),
-            RssItemBuilder.builder("title4").build(),
-            RssItemBuilder.builder("title5").build()
+                RssItemBuilder.builder("title1").build(),
+                RssItemBuilder.builder("title2").build(),
+                RssItemBuilder.builder("title3").build(),
+                RssItemBuilder.builder("title4").build(),
+                RssItemBuilder.builder("title5").build()
         );
         NewznabXmlRoot root = RssBuilder.builder().items(items).newznabResponse(100, 105).build();
         when(indexerWebAccessMock.get(any(), eq(testee.config), any())).thenReturn(root);
diff --git a/core/src/test/java/org/nzbhydra/indexers/NzbIndexBetaTest.java b/core/src/test/java/org/nzbhydra/indexers/NzbIndexBetaTest.java
index 8692f3278..c6bd716c9 100644
--- a/core/src/test/java/org/nzbhydra/indexers/NzbIndexBetaTest.java
+++ b/core/src/test/java/org/nzbhydra/indexers/NzbIndexBetaTest.java
@@ -4,7 +4,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.downloading.DownloadType;
 import org.nzbhydra.config.indexer.IndexerConfig;
 import org.nzbhydra.mapping.newznab.builder.RssBuilder;
@@ -23,7 +24,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class NzbIndexBetaTest {
 
     @Mock
@@ -34,7 +35,7 @@ public class NzbIndexBetaTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
         testee.config = new IndexerConfig();
     }
 
diff --git a/core/src/test/java/org/nzbhydra/indexers/NzbIndexTest.java b/core/src/test/java/org/nzbhydra/indexers/NzbIndexTest.java
index dc28c39d7..1a76a96c1 100644
--- a/core/src/test/java/org/nzbhydra/indexers/NzbIndexTest.java
+++ b/core/src/test/java/org/nzbhydra/indexers/NzbIndexTest.java
@@ -4,7 +4,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.downloading.DownloadType;
 import org.nzbhydra.config.indexer.IndexerConfig;
 import org.nzbhydra.mapping.newznab.builder.RssBuilder;
@@ -23,7 +24,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class NzbIndexTest {
 
     @Mock
@@ -34,7 +35,7 @@ public class NzbIndexTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
         testee.config = new IndexerConfig();
     }
 
diff --git a/core/src/test/java/org/nzbhydra/indexers/NzbKingTest.java b/core/src/test/java/org/nzbhydra/indexers/NzbKingTest.java
index ae7bef831..8773e4453 100644
--- a/core/src/test/java/org/nzbhydra/indexers/NzbKingTest.java
+++ b/core/src/test/java/org/nzbhydra/indexers/NzbKingTest.java
@@ -9,7 +9,8 @@
 import org.mockito.Captor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.mockito.stubbing.Answer;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
@@ -35,8 +36,8 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
-
 @SuppressWarnings("ConstantConditions")
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class NzbKingTest {
 
     // kksLWrBiAXSBciUljS4ISqMxyqzC
@@ -58,7 +59,7 @@ public class NzbKingTest {
     @BeforeEach
     public void setUp() throws Exception {
         NzbKing.clock = Clock.fixed(Instant.ofEpochSecond(1707391628L), ZoneId.of("UTC"));
-        MockitoAnnotations.initMocks(this);
+
         when(configProviderMock.getBaseConfig()).thenReturn(baseConfig);
         testee.config = new IndexerConfig();
         testee.config.setName("NZBKing");
diff --git a/core/src/test/java/org/nzbhydra/indexers/capscheck/NewznabCheckerTest.java b/core/src/test/java/org/nzbhydra/indexers/capscheck/NewznabCheckerTest.java
index ab928b237..cc2b0fd9d 100644
--- a/core/src/test/java/org/nzbhydra/indexers/capscheck/NewznabCheckerTest.java
+++ b/core/src/test/java/org/nzbhydra/indexers/capscheck/NewznabCheckerTest.java
@@ -22,7 +22,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
 import org.nzbhydra.config.SearchingConfig;
@@ -59,6 +60,7 @@
 
 @SuppressWarnings("ALL")
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class NewznabCheckerTest {
 
 
@@ -84,7 +86,7 @@ public class NewznabCheckerTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
         indexerConfig = new IndexerConfig();
         indexerConfig.setHost("http://127.0.0.1:1234");
         indexerConfig.setApiKey("apikey");
@@ -105,15 +107,15 @@ void shouldCheckCaps() throws Exception {
         NewznabXmlRoot thronesResult = builder.getTestResult(1, 100, "Thrones", 0, 100);
         thronesResult.getRssChannel().setGenerator("nzedb");
         when(indexerWebAccess.get(new URI("http://127.0.0.1:1234/api?apikey=apikey&t=tvsearch&tvdbid=121361"), indexerConfig))
-            .thenReturn(thronesResult);
+                .thenReturn(thronesResult);
         when(indexerWebAccess.get(new URI("http://127.0.0.1:1234/api?apikey=apikey&t=tvsearch&rid=24493"), indexerConfig))
-            .thenReturn(builder.getTestResult(1, 100, "Thrones", 0, 100));
+                .thenReturn(builder.getTestResult(1, 100, "Thrones", 0, 100));
         when(indexerWebAccess.get(new URI("http://127.0.0.1:1234/api?apikey=apikey&t=tvsearch&tvmazeid=82"), indexerConfig))
-            .thenReturn(builder.getTestResult(1, 100, "Thrones", 0, 100));
+                .thenReturn(builder.getTestResult(1, 100, "Thrones", 0, 100));
         when(indexerWebAccess.get(new URI("http://127.0.0.1:1234/api?apikey=apikey&t=tvsearch&imdbid=0944947"), indexerConfig))
-            .thenReturn(builder.getTestResult(1, 100, "Thrones", 0, 100));
+                .thenReturn(builder.getTestResult(1, 100, "Thrones", 0, 100));
         when(indexerWebAccess.get(new URI("http://127.0.0.1:1234/api?apikey=apikey&t=tvsearch&traktid=1390"), indexerConfig))
-            .thenReturn(builder.getTestResult(1, 100, "GOT", 0, 100));
+                .thenReturn(builder.getTestResult(1, 100, "GOT", 0, 100));
         when(indexerWebAccess.get(new URI("http://127.0.0.1:1234/api?apikey=apikey&t=movie&tmdbid=24428"), indexerConfig))
                 .thenReturn(builder.getTestResult(1, 100, "Avengers", 0, 100));
         when(indexerWebAccess.get(new URI("http://127.0.0.1:1234/api?apikey=apikey&t=movie&imdbid=0848228"), indexerConfig))
@@ -178,19 +180,19 @@ void shouldIdentifyCategoryMapping() throws Exception {
     void shouldCheckCapsWithoutSupport() throws Exception {
         NewznabResponseBuilder builder = new NewznabResponseBuilder();
         when(indexerWebAccess.get(new URI("http://127.0.0.1:1234/api?apikey=apikey&t=tvsearch&tvdbid=121361"), indexerConfig))
-            .thenReturn(builder.getTestResult(1, 100, "somethingElse", 0, 100));
+                .thenReturn(builder.getTestResult(1, 100, "somethingElse", 0, 100));
         when(indexerWebAccess.get(new URI("http://127.0.0.1:1234/api?apikey=apikey&t=tvsearch&rid=24493"), indexerConfig))
-            .thenReturn(builder.getTestResult(1, 100, "somethingElse", 0, 100));
+                .thenReturn(builder.getTestResult(1, 100, "somethingElse", 0, 100));
         when(indexerWebAccess.get(new URI("http://127.0.0.1:1234/api?apikey=apikey&t=tvsearch&tvmazeid=82"), indexerConfig))
-            .thenReturn(builder.getTestResult(1, 100, "somethingElse", 0, 100));
+                .thenReturn(builder.getTestResult(1, 100, "somethingElse", 0, 100));
         when(indexerWebAccess.get(new URI("http://127.0.0.1:1234/api?apikey=apikey&t=tvsearch&traktid=1390"), indexerConfig))
-            .thenReturn(builder.getTestResult(1, 100, "somethingElse", 0, 100));
+                .thenReturn(builder.getTestResult(1, 100, "somethingElse", 0, 100));
         when(indexerWebAccess.get(new URI("http://127.0.0.1:1234/api?apikey=apikey&t=movie&tmdbid=24428"), indexerConfig))
                 .thenReturn(builder.getTestResult(1, 100, "somethingElse", 0, 100));
         when(indexerWebAccess.get(new URI("http://127.0.0.1:1234/api?apikey=apikey&t=movie&imdbid=0848228"), indexerConfig))
-            .thenReturn(builder.getTestResult(1, 100, "somethingElse", 0, 100));
+                .thenReturn(builder.getTestResult(1, 100, "somethingElse", 0, 100));
         when(indexerWebAccess.get(new URI("http://127.0.0.1:1234/api?apikey=apikey&t=tvsearch&imdbid=0944947"), indexerConfig))
-            .thenReturn(builder.getTestResult(1, 100, "Thrones", 0, 100));
+                .thenReturn(builder.getTestResult(1, 100, "Thrones", 0, 100));
 
         CheckCapsResponse checkCapsRespone = testee.checkCaps(indexerConfig);
         assertThat(checkCapsRespone.getIndexerConfig().getSupportedSearchIds()).hasSize(1);
@@ -201,20 +203,20 @@ void shouldCheckCapsWithoutSupport() throws Exception {
     void shouldSaySoIfNotAllWereChecked() throws Exception {
         NewznabResponseBuilder builder = new NewznabResponseBuilder();
         when(indexerWebAccess.get(new URI("http://127.0.0.1:1234/api?apikey=apikey&t=tvsearch&tvdbid=121361"), indexerConfig))
-            .thenReturn(builder.getTestResult(1, 100, "Thrones", 0, 100));
+                .thenReturn(builder.getTestResult(1, 100, "Thrones", 0, 100));
         when(indexerWebAccess.get(new URI("http://127.0.0.1:1234/api?apikey=apikey&t=tvsearch&rid=24493"), indexerConfig))
-            .thenReturn(builder.getTestResult(1, 100, "Thrones", 0, 100));
+                .thenReturn(builder.getTestResult(1, 100, "Thrones", 0, 100));
         when(indexerWebAccess.get(new URI("http://127.0.0.1:1234/api?apikey=apikey&t=tvsearch&tvmazeid=82"), indexerConfig))
-            .thenReturn(builder.getTestResult(1, 100, "Thrones", 0, 100));
+                .thenReturn(builder.getTestResult(1, 100, "Thrones", 0, 100));
         when(indexerWebAccess.get(new URI("http://127.0.0.1:1234/api?apikey=apikey&t=tvsearch&traktid=1390"), indexerConfig))
-            .thenReturn(builder.getTestResult(1, 100, "Thrones", 0, 100));
+                .thenReturn(builder.getTestResult(1, 100, "Thrones", 0, 100));
         when(indexerWebAccess.get(new URI("http://127.0.0.1:1234/api?apikey=apikey&t=tvsearch&imdbid=0944947"), indexerConfig))
-            .thenReturn(builder.getTestResult(1, 100, "Thrones", 0, 100));
+                .thenReturn(builder.getTestResult(1, 100, "Thrones", 0, 100));
         when(indexerWebAccess.get(new URI("http://127.0.0.1:1234/api?apikey=apikey&t=movie&tmdbid=24428"), indexerConfig))
-            .thenReturn(builder.getTestResult(1, 100, "Avengers", 0, 100));
+                .thenReturn(builder.getTestResult(1, 100, "Avengers", 0, 100));
 
         when(indexerWebAccess.get(new URI("http://127.0.0.1:1234/api?apikey=apikey&t=movie&imdbid=0848228"), indexerConfig))
-            .thenThrow(new IndexerAccessException("some error"));
+                .thenThrow(new IndexerAccessException("some error"));
 
         CheckCapsResponse checkCapsRespone = testee.checkCaps(indexerConfig);
         assertThat(checkCapsRespone.getIndexerConfig().getSupportedSearchIds()).hasSize(6);
diff --git a/core/src/test/java/org/nzbhydra/indexers/torznab/TorznabTest.java b/core/src/test/java/org/nzbhydra/indexers/torznab/TorznabTest.java
index 42116d1da..0c10fbc43 100644
--- a/core/src/test/java/org/nzbhydra/indexers/torznab/TorznabTest.java
+++ b/core/src/test/java/org/nzbhydra/indexers/torznab/TorznabTest.java
@@ -24,8 +24,9 @@
 import org.mockito.Captor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.mockito.stubbing.Answer;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
@@ -68,6 +69,7 @@
 import static org.mockito.Mockito.when;
 
 @SuppressWarnings("ALL")
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class TorznabTest {
 
     private BaseConfig baseConfig;
@@ -108,7 +110,7 @@ public class TorznabTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
         testee = spy(testee);
         final IndexerConfig config = new IndexerConfig();
         testee.initialize(config, indexerEntityMock);
diff --git a/core/src/test/java/org/nzbhydra/logging/LogAnonymizerTest.java b/core/src/test/java/org/nzbhydra/logging/LogAnonymizerTest.java
index 6308820d1..b313ba193 100644
--- a/core/src/test/java/org/nzbhydra/logging/LogAnonymizerTest.java
+++ b/core/src/test/java/org/nzbhydra/logging/LogAnonymizerTest.java
@@ -5,7 +5,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
 import org.nzbhydra.config.NotificationConfigEntry;
@@ -18,6 +19,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class LogAnonymizerTest {
 
     @Mock
@@ -30,7 +32,7 @@ public class LogAnonymizerTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
         BaseConfig baseConfig = new BaseConfig();
         when(configProviderMock.getBaseConfig()).thenReturn(baseConfig);
         UserAuthConfig user = new UserAuthConfig();
diff --git a/core/src/test/java/org/nzbhydra/mediainfo/InfoProviderTest.java b/core/src/test/java/org/nzbhydra/mediainfo/InfoProviderTest.java
index 4528e01de..fb58d8b4c 100644
--- a/core/src/test/java/org/nzbhydra/mediainfo/InfoProviderTest.java
+++ b/core/src/test/java/org/nzbhydra/mediainfo/InfoProviderTest.java
@@ -5,8 +5,9 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.mockito.internal.util.collections.Sets;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.mediainfo.MediaIdType;
 
 import java.util.Arrays;
@@ -18,6 +19,7 @@
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.*;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class InfoProviderTest {
 
     @Mock
@@ -34,7 +36,7 @@ public class InfoProviderTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
 
         when(tvMazeHandlerMock.getInfos(anyString(), any(MediaIdType.class))).thenReturn(new TvMazeSearchResult("tvmazeId", "tvrageId", "tvdbId", "imdbid", "title", 0, "posterUrl"));
         when(tvMazeHandlerMock.search(anyString())).thenReturn(Collections.singletonList(new TvMazeSearchResult("tvmazeId", "tvrageId", "tvdbId", "Imdbid", "title", 0, "posterUrl")));
diff --git a/core/src/test/java/org/nzbhydra/news/NewsProviderTest.java b/core/src/test/java/org/nzbhydra/news/NewsProviderTest.java
index 0bda07a75..22ece3e8a 100644
--- a/core/src/test/java/org/nzbhydra/news/NewsProviderTest.java
+++ b/core/src/test/java/org/nzbhydra/news/NewsProviderTest.java
@@ -6,7 +6,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.mapping.SemanticVersion;
 import org.nzbhydra.news.NewsProvider.NewsEntry;
 import org.nzbhydra.update.UpdateManager;
@@ -22,6 +23,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class NewsProviderTest {
 
     @Mock
@@ -36,7 +38,7 @@ public class NewsProviderTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
         when(webAccessMock.callUrl(any(), any(TypeReference.class))).thenReturn(getNewsJson());
         testee.lastCheckedForNews = Instant.ofEpochMilli(0);
     }
diff --git a/core/src/test/java/org/nzbhydra/problemdetection/OutOfMemoryDetectorTest.java b/core/src/test/java/org/nzbhydra/problemdetection/OutOfMemoryDetectorTest.java
index ee335dc87..0ce2c1700 100644
--- a/core/src/test/java/org/nzbhydra/problemdetection/OutOfMemoryDetectorTest.java
+++ b/core/src/test/java/org/nzbhydra/problemdetection/OutOfMemoryDetectorTest.java
@@ -22,7 +22,8 @@
 import org.mockito.Captor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.genericstorage.GenericStorage;
 import org.nzbhydra.logging.LogContentProvider;
 
@@ -33,6 +34,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.*;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class OutOfMemoryDetectorTest {
 
     @Mock
@@ -51,7 +53,7 @@ public class OutOfMemoryDetectorTest {
     @Disabled //Fails on Pipeline
     @Test
     void executeCheck() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
 
         final Path tempFile = Files.createTempFile("nzbhydra", ".log");
         try {
diff --git a/core/src/test/java/org/nzbhydra/searching/DuplicateDetectorTest.java b/core/src/test/java/org/nzbhydra/searching/DuplicateDetectorTest.java
index 49f33527e..2af830490 100644
--- a/core/src/test/java/org/nzbhydra/searching/DuplicateDetectorTest.java
+++ b/core/src/test/java/org/nzbhydra/searching/DuplicateDetectorTest.java
@@ -5,7 +5,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
 import org.nzbhydra.config.SearchingConfig;
@@ -26,6 +27,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.when;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class DuplicateDetectorTest {
     @InjectMocks
     private DuplicateDetector testee = new DuplicateDetector();
@@ -35,7 +37,7 @@ public class DuplicateDetectorTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
         BaseConfig baseConfig = new BaseConfig();
         baseConfig.setSearching(new SearchingConfig());
         baseConfig.getSearching().setDuplicateSizeThresholdInPercent(1F);
diff --git a/core/src/test/java/org/nzbhydra/searching/IndexerForSearchSelectorTest.java b/core/src/test/java/org/nzbhydra/searching/IndexerForSearchSelectorTest.java
index 444e07bb8..c886c41e9 100644
--- a/core/src/test/java/org/nzbhydra/searching/IndexerForSearchSelectorTest.java
+++ b/core/src/test/java/org/nzbhydra/searching/IndexerForSearchSelectorTest.java
@@ -6,8 +6,9 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.mockito.internal.util.collections.Sets;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
 import org.nzbhydra.config.SearchSource;
@@ -50,6 +51,7 @@
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.*;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class IndexerForSearchSelectorTest {
 
     @Mock
@@ -92,7 +94,7 @@ public class IndexerForSearchSelectorTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
         count = new HashMap<>();
         when(searchModuleProviderMock.getIndexers()).thenReturn(Arrays.asList(indexer));
         when(configProvider.getBaseConfig()).thenReturn(baseConfig);
diff --git a/core/src/test/java/org/nzbhydra/searching/SearchResultAcceptorTest.java b/core/src/test/java/org/nzbhydra/searching/SearchResultAcceptorTest.java
index ca82b5777..c3c19391d 100644
--- a/core/src/test/java/org/nzbhydra/searching/SearchResultAcceptorTest.java
+++ b/core/src/test/java/org/nzbhydra/searching/SearchResultAcceptorTest.java
@@ -5,7 +5,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
 import org.nzbhydra.config.SearchSource;
@@ -31,6 +32,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class SearchResultAcceptorTest {
 
     @Mock
@@ -52,7 +54,7 @@ public class SearchResultAcceptorTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
         when(configProvider.getBaseConfig()).thenReturn(baseConfig);
         when(baseConfig.getSearching()).thenReturn(searchingConfig);
         when(searchingConfig.isIgnorePassworded()).thenReturn(false);
diff --git a/core/src/test/java/org/nzbhydra/searching/SearcherUnitTest.java b/core/src/test/java/org/nzbhydra/searching/SearcherUnitTest.java
index 70391b151..d97eeb1b4 100644
--- a/core/src/test/java/org/nzbhydra/searching/SearcherUnitTest.java
+++ b/core/src/test/java/org/nzbhydra/searching/SearcherUnitTest.java
@@ -11,8 +11,9 @@
 import org.mockito.Captor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.mockito.stubbing.Answer;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
@@ -50,8 +51,7 @@
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.*;
 
-//@ExtendWith(SpringExtension.class)
-//@ContextConfiguration(classes = {Searcher.class, DuplicateDetector.class})
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class SearcherUnitTest {
 
     @InjectMocks
@@ -100,7 +100,7 @@ public class SearcherUnitTest {
 
     @BeforeEach
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+
         searchResultEntityMock.setIndexer(indexerEntity);
         searcher.duplicateDetector = duplicateDetector;
 
diff --git a/core/src/test/java/org/nzbhydra/update/UpdateManagerTest.java b/core/src/test/java/org/nzbhydra/update/UpdateManagerTest.java
index 6a9de5247..0dfb1d553 100644
--- a/core/src/test/java/org/nzbhydra/update/UpdateManagerTest.java
+++ b/core/src/test/java/org/nzbhydra/update/UpdateManagerTest.java
@@ -8,7 +8,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigProvider;
 import org.nzbhydra.config.MainConfig;
@@ -29,8 +30,8 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
-
 @SuppressWarnings("unchecked")
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class UpdateManagerTest {
 
     @Mock
@@ -49,7 +50,7 @@ public class UpdateManagerTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
         objectMapper = new ObjectMapper(new YAMLFactory());
         objectMapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
 
diff --git a/core/src/test/java/org/nzbhydra/web/UrlCalculatorTest.java b/core/src/test/java/org/nzbhydra/web/UrlCalculatorTest.java
index 402109edb..373daed4b 100644
--- a/core/src/test/java/org/nzbhydra/web/UrlCalculatorTest.java
+++ b/core/src/test/java/org/nzbhydra/web/UrlCalculatorTest.java
@@ -22,7 +22,6 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.web.util.UriComponentsBuilder;
 
@@ -43,7 +42,7 @@ public class UrlCalculatorTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
     }
 
     @Test
diff --git a/core/src/test/java/org/nzbhydra/webaccess/HydraOkHttp3ClientHttpRequestFactoryTest.java b/core/src/test/java/org/nzbhydra/webaccess/HydraOkHttp3ClientHttpRequestFactoryTest.java
index 711802fc3..a70c8787c 100644
--- a/core/src/test/java/org/nzbhydra/webaccess/HydraOkHttp3ClientHttpRequestFactoryTest.java
+++ b/core/src/test/java/org/nzbhydra/webaccess/HydraOkHttp3ClientHttpRequestFactoryTest.java
@@ -5,7 +5,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.nzbhydra.config.BaseConfig;
 import org.nzbhydra.config.ConfigChangedEvent;
 import org.nzbhydra.config.ConfigProvider;
@@ -20,6 +21,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.*;
 
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class HydraOkHttp3ClientHttpRequestFactoryTest {
 
     @InjectMocks
@@ -33,10 +35,10 @@ public class HydraOkHttp3ClientHttpRequestFactoryTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+
         when(configProviderMock.getBaseConfig()).thenReturn(baseConfig);
         baseConfig.getMain().setProxyIgnoreLocal(true);
-        baseConfig.getMain().setProxyIgnoreDomains(Arrays.asList("mydomain.com", "github.com", "*.otherdomain.net"));
+        baseConfig.getMain().setProxyIgnoreDomains(Arrays.asList("mydomain.com", "github.com", "*.google.com"));
         testee.handleConfigChangedEvent(new ConfigChangedEvent(this, baseConfig, baseConfig));
 
         testee = spy(testee);
@@ -57,10 +59,10 @@ void shouldRecognizeLocalIps() {
     void shouldRecognizeIgnoredDomains() {
         assertThat(testee.isUriToBeIgnoredByProxy("mydomain.com")).isEqualTo(true);
         assertThat(testee.isUriToBeIgnoredByProxy("github.com")).isEqualTo(true);
-        assertThat(testee.isUriToBeIgnoredByProxy("subdomain.otherdomain.net")).isEqualTo(true);
-        assertThat(testee.isUriToBeIgnoredByProxy("subdomain.otherDOmain.NET")).isEqualTo(true);
+        assertThat(testee.isUriToBeIgnoredByProxy("mail.google.com")).isEqualTo(true);
+        assertThat(testee.isUriToBeIgnoredByProxy("mail.google.COM")).isEqualTo(true);
 
-        assertThat(testee.isUriToBeIgnoredByProxy("subdomain.otherdomain.ORG")).isEqualTo(false);
+        assertThat(testee.isUriToBeIgnoredByProxy("mail.yahoo.com")).isEqualTo(false);
         assertThat(testee.isUriToBeIgnoredByProxy("somedomain.com")).isEqualTo(false);
     }