diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index 1a086c49c..0297c79f4 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -402,7 +402,9 @@
             <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
             <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
         </module>
-        <module name="CyclomaticComplexity"/> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity -->
+        <module name="CyclomaticComplexity"> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity -->
+            <property name="switchBlockAsSingleDecisionPoint" value="true"/>
+        </module>
         <module name="DesignForExtension"> <!-- Java Coding Guidelines: Design for extension -->
             <property name="ignoredAnnotations" value="ParameterizedTest, Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/>
         </module>
diff --git a/build.gradle b/build.gradle
index d2a031f11..249b7dd4f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ buildscript {
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.11.0'
         classpath 'com.palantir.gradle.revapi:gradle-revapi:1.7.0'
         classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.26.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:4.153.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:4.178.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.15.0'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0'
         classpath 'com.palantir.metricschema:gradle-metric-schema:0.16.0'
diff --git a/dialogue-core/src/test/java/com/palantir/dialogue/core/BalancedNodeSelectionStrategyChannelTest.java b/dialogue-core/src/test/java/com/palantir/dialogue/core/BalancedNodeSelectionStrategyChannelTest.java
index 6103b2647..d7fbe09b8 100644
--- a/dialogue-core/src/test/java/com/palantir/dialogue/core/BalancedNodeSelectionStrategyChannelTest.java
+++ b/dialogue-core/src/test/java/com/palantir/dialogue/core/BalancedNodeSelectionStrategyChannelTest.java
@@ -48,6 +48,7 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+@SuppressWarnings("DirectInvocationOnMock")
 @ExtendWith(MockitoExtension.class)
 class BalancedNodeSelectionStrategyChannelTest {
     private Random random = new Random(12388544234L);
diff --git a/dialogue-core/src/test/java/com/palantir/dialogue/core/DialogueChannelTest.java b/dialogue-core/src/test/java/com/palantir/dialogue/core/DialogueChannelTest.java
index bd7a7e124..6c15be99e 100644
--- a/dialogue-core/src/test/java/com/palantir/dialogue/core/DialogueChannelTest.java
+++ b/dialogue-core/src/test/java/com/palantir/dialogue/core/DialogueChannelTest.java
@@ -73,6 +73,7 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.stubbing.Answer;
 
+@SuppressWarnings("DirectInvocationOnMock")
 @ExtendWith(MockitoExtension.class)
 public final class DialogueChannelTest {
 
diff --git a/dialogue-serde/src/test/java/com/palantir/conjure/java/dialogue/serde/DefaultClientsTest.java b/dialogue-serde/src/test/java/com/palantir/conjure/java/dialogue/serde/DefaultClientsTest.java
index b41eb03cc..a8ac9ab0d 100644
--- a/dialogue-serde/src/test/java/com/palantir/conjure/java/dialogue/serde/DefaultClientsTest.java
+++ b/dialogue-serde/src/test/java/com/palantir/conjure/java/dialogue/serde/DefaultClientsTest.java
@@ -243,6 +243,7 @@ private ListenableFuture<String> call(CallType callType, Request request) {
         return call(callType, request, stringDeserializer);
     }
 
+    @SuppressWarnings("DirectInvocationOnMock")
     private <T> ListenableFuture<T> call(CallType callType, Request request, Deserializer<T> deserializer) {
         switch (callType) {
             case Async: