diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index 792229cfc..268ebe3fc 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -422,6 +422,7 @@
             <property name="allowEmptyMethods" value="true"/>
             <property name="allowEmptyTypes" value="true"/>
             <property name="allowEmptyLoops" value="true"/>
+            <property name="allowEmptyLambdas" value="true"/>
             <property name="ignoreEnhancedForColon" value="false"/>
             <message key="ws.notFollowed" value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
             <message key="ws.notPreceded" value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
@@ -435,7 +436,7 @@
         </module>
         <module name="CyclomaticComplexity"/> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity -->
         <module name="DesignForExtension"> <!-- Java Coding Guidelines: Design for extension -->
-            <property name="ignoredAnnotations" value="Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/>
+            <property name="ignoredAnnotations" value="ParameterizedTest, Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/>
         </module>
         <module name="JavadocMethod"> <!-- Java Style Guide: Where Javadoc is used -->
             <property name="scope" value="public"/>
diff --git a/build.gradle b/build.gradle
index cffa927bf..e31011c29 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ buildscript {
         classpath 'com.netflix.nebula:gradle-info-plugin:5.0.3'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:13.4.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
-        classpath 'com.palantir.baseline:gradle-baseline-java:0.65.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:2.2.0'
         classpath 'com.palantir.gradle.conjure:gradle-conjure:4.13.1'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.1.0'
diff --git a/conjure-python-core/src/test/java/com/palantir/conjure/python/ConjureSubfolderRunner.java b/conjure-python-core/src/test/java/com/palantir/conjure/python/ConjureSubfolderRunner.java
index 0f5eb7a03..d5c39d9be 100644
--- a/conjure-python-core/src/test/java/com/palantir/conjure/python/ConjureSubfolderRunner.java
+++ b/conjure-python-core/src/test/java/com/palantir/conjure/python/ConjureSubfolderRunner.java
@@ -16,6 +16,7 @@
 
 package com.palantir.conjure.python;
 
+import com.palantir.logsafe.exceptions.SafeRuntimeException;
 import java.io.File;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -111,7 +112,7 @@ private Object createTestClassInstance()
 
     private ParentFolder getParentFolder(ParentFolder annotation) {
         if (annotation == null) {
-            throw new RuntimeException("The class must be annotated with @ParentFolder");
+            throw new SafeRuntimeException("The class must be annotated with @ParentFolder");
         }
 
         return annotation;
@@ -119,7 +120,7 @@ private ParentFolder getParentFolder(ParentFolder annotation) {
 
     private FrameworkMethod validateMethod(List<FrameworkMethod> annotated) {
         if (annotated.size() != 1) {
-            throw new RuntimeException("There must be exactly one @ConjureSubfolderRunner.Test method");
+            throw new SafeRuntimeException("There must be exactly one @ConjureSubfolderRunner.Test method");
         }
 
         FrameworkMethod method = annotated.get(0);