diff --git a/atlasdb-commons/src/test/java/com/palantir/util/OptionalResolverTest.java b/atlasdb-commons/src/test/java/com/palantir/util/OptionalResolverTest.java
index 923873ba709..8764c792f02 100644
--- a/atlasdb-commons/src/test/java/com/palantir/util/OptionalResolverTest.java
+++ b/atlasdb-commons/src/test/java/com/palantir/util/OptionalResolverTest.java
@@ -54,7 +54,8 @@ public void resolvesToValueIfOneOptionalPresent() {
 
     @Test
     public void resolvesToValueIfOneOptionalPresentAndOneIsNull() {
-        assertThat(OptionalResolver.resolve(PRESENT_OPTIONAL_1, null)).isEqualTo(STRING_1);
+        assertThat(OptionalResolver.resolve(PRESENT_OPTIONAL_1, Optional.empty()))
+                .isEqualTo(STRING_1);
     }
 
     @Test
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbFactoryTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbFactoryTest.java
index e0c9fc6982d..7d10624d061 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbFactoryTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/memory/InMemoryAsyncAtlasDbFactoryTest.java
@@ -78,6 +78,12 @@ public void asyncInitTimestampServiceWithAsyncKvsAsynchronous() {
 
     private KeyValueService createRawKeyValueService(boolean initializeAsync) {
         return factory.createRawKeyValueService(
-                null, null, Refreshable.only(Optional.empty()), null, Optional.empty(), null, initializeAsync);
+                null,
+                null,
+                Refreshable.only(Optional.empty()),
+                Optional.empty(),
+                Optional.empty(),
+                null,
+                initializeAsync);
     }
 }
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactoryTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactoryTest.java
index 94936cc5b52..5d75e4628ec 100644
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactoryTest.java
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactoryTest.java
@@ -59,6 +59,12 @@ public void asyncInitTimestampServiceSynchronous() {
 
     private KeyValueService createRawKeyValueService(boolean initializeAsync) {
         return factory.createRawKeyValueService(
-                null, null, Refreshable.only(Optional.empty()), null, Optional.empty(), null, initializeAsync);
+                null,
+                null,
+                Refreshable.only(Optional.empty()),
+                Optional.empty(),
+                Optional.empty(),
+                null,
+                initializeAsync);
     }
 }
diff --git a/build.gradle b/build.gradle
index 42864cac6c1..df25ac910f4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -130,7 +130,6 @@ allprojects {
                 'MockitoInternalUsage',
                 'ModifyCollectionInEnhancedForLoop',
                 'NarrowingCompoundAssignment',
-                'NullOptional',
                 'OperatorPrecedence',
                 'OverrideThrowableToString',
                 'PreconditionsConstantMessage',