diff --git a/sdccc/src/main/java/com/draeger/medical/sdccc/tests/util/MdibHistorian.java b/sdccc/src/main/java/com/draeger/medical/sdccc/tests/util/MdibHistorian.java
index 9d799ce4..c5a8fa18 100644
--- a/sdccc/src/main/java/com/draeger/medical/sdccc/tests/util/MdibHistorian.java
+++ b/sdccc/src/main/java/com/draeger/medical/sdccc/tests/util/MdibHistorian.java
@@ -1,6 +1,6 @@
 /*
  * This Source Code Form is subject to the terms of the MIT License.
- * Copyright (c) 2023 Draegerwerk AG & Co. KGaA.
+ * Copyright (c) 2023, 2024 Draegerwerk AG & Co. KGaA.
  *
  * SPDX-License-Identifier: MIT
  */
@@ -530,7 +530,7 @@ public RemoteMdibAccess applyReportOnStorage(final RemoteMdibAccess storage, fin
         final var reportProcessor = reportProcessorProvider.get();
         reportProcessor.startApplyingReportsOnMdib(storage, null);
 
-        final var cmp = ImpliedValueUtil.getMdibVersion(storage.getMdibVersion())
+        var cmp = ImpliedValueUtil.getMdibVersion(storage.getMdibVersion())
                 .compareTo(ImpliedValueUtil.getReportMdibVersion(report));
         if (cmp > 0) {
             fail("Cannot apply report older than current storage."
@@ -560,6 +560,7 @@ public RemoteMdibAccess applyReportOnStorage(final RemoteMdibAccess storage, fin
             // other reports do not modify the Mdib and hence cannot be passed into
             //   reportProcessor.processReport().
             // simply ignore them.
+            cmp = cmp; // make Checkstyle happy
         }
         return storage;
     }
diff --git a/sdccc/src/test/java/com/draeger/medical/sdccc/tests/util/MdibHistorianTest.java b/sdccc/src/test/java/com/draeger/medical/sdccc/tests/util/MdibHistorianTest.java
index ac271440..1c753944 100644
--- a/sdccc/src/test/java/com/draeger/medical/sdccc/tests/util/MdibHistorianTest.java
+++ b/sdccc/src/test/java/com/draeger/medical/sdccc/tests/util/MdibHistorianTest.java
@@ -1,6 +1,6 @@
 /*
  * This Source Code Form is subject to the terms of the MIT License.
- * Copyright (c) 2023 Draegerwerk AG & Co. KGaA.
+ * Copyright (c) 2023, 2024 Draegerwerk AG & Co. KGaA.
  *
  * SPDX-License-Identifier: MIT
  */
@@ -921,18 +921,18 @@ void testUniqueEpisodicReportBasedHistoryFailInvalidateTestRunWhenSameReportType
     void testApplyReportOnStorageBadCalledWithOperationInvokedReport() throws ReportProcessingException, PreprocessingException {
 
         // given
-        BigInteger numericMdibVersion = BigInteger.ZERO;
-        String sequenceId = "abc";
+        final BigInteger numericMdibVersion = BigInteger.ZERO;
+        final String sequenceId = "abc";
         final MdibVersion mdibVersion = new MdibVersion(sequenceId, numericMdibVersion);
         final var mockObserver = mock(TestRunObserver.class);
         final var historianUnderTest = historianFactory.createMdibHistorian(storage, mockObserver);
         final var report = new OperationInvokedReport();
-        final var reportParts = new ArrayList();
+        final var reportParts = new ArrayList<OperationInvokedReport.ReportPart>();
+        final RemoteMdibAccess mdibAccess = mock(RemoteMdibAccess.class);
         reportParts.add(new OperationInvokedReport.ReportPart());
         report.setReportPart(reportParts);
         report.setMdibVersion(numericMdibVersion);
         report.setSequenceId(sequenceId);
-        RemoteMdibAccess mdibAccess = mock(RemoteMdibAccess.class);
 
         when(mdibAccess.getMdibVersion()).thenReturn(mdibVersion);