diff --git a/src/test/java/com/hubspot/jinjava/BaseJinjavaTest.java b/src/test/java/com/hubspot/jinjava/BaseJinjavaTest.java
index 790f0ec98..2579b2d5d 100644
--- a/src/test/java/com/hubspot/jinjava/BaseJinjavaTest.java
+++ b/src/test/java/com/hubspot/jinjava/BaseJinjavaTest.java
@@ -10,8 +10,8 @@ public abstract class BaseJinjavaTest {
   public void baseSetup() {
     jinjava =
       new Jinjava(
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withLegacyOverrides(
             LegacyOverrides
               .newBuilder()
@@ -22,4 +22,8 @@ public void baseSetup() {
           .build()
       );
   }
+
+  public static JinjavaConfig.Builder newConfigBuilder() {
+    return JinjavaConfig.builder();
+  }
 }
diff --git a/src/test/java/com/hubspot/jinjava/EagerTest.java b/src/test/java/com/hubspot/jinjava/EagerTest.java
index 51bc5ae6f..e408d2cc2 100644
--- a/src/test/java/com/hubspot/jinjava/EagerTest.java
+++ b/src/test/java/com/hubspot/jinjava/EagerTest.java
@@ -72,8 +72,8 @@ public Optional<LocationResolver> getLocationResolver() {
         }
       }
     );
-    JinjavaConfig config = JinjavaConfig
-      .newBuilder()
+    JinjavaConfig config = BaseJinjavaTest
+      .newConfigBuilder()
       .withRandomNumberGeneratorStrategy(RandomNumberGeneratorStrategy.DEFERRED)
       .withExecutionMode(executionMode)
       .withNestedInterpretationEnabled(true)
@@ -777,8 +777,8 @@ public void itHandlesAutoEscape() {
 
   @Test
   public void itWrapsCertainOutputInRaw() {
-    JinjavaConfig config = JinjavaConfig
-      .newBuilder()
+    JinjavaConfig config = BaseJinjavaTest
+      .newConfigBuilder()
       .withRandomNumberGeneratorStrategy(RandomNumberGeneratorStrategy.DEFERRED)
       .withExecutionMode(EagerExecutionMode.instance())
       .withNestedInterpretationEnabled(false)
@@ -865,13 +865,16 @@ public void itHandlesUnknownFunctionErrors() {
     JinjavaInterpreter eagerInterpreter = new JinjavaInterpreter(
       jinjava,
       jinjava.getGlobalContextCopy(),
-      JinjavaConfig.newBuilder().withExecutionMode(EagerExecutionMode.instance()).build()
+      BaseJinjavaTest
+        .newConfigBuilder()
+        .withExecutionMode(EagerExecutionMode.instance())
+        .build()
     );
     JinjavaInterpreter defaultInterpreter = new JinjavaInterpreter(
       jinjava,
       jinjava.getGlobalContextCopy(),
-      JinjavaConfig
-        .newBuilder()
+      BaseJinjavaTest
+        .newConfigBuilder()
         .withExecutionMode(DefaultExecutionMode.instance())
         .build()
     );
diff --git a/src/test/java/com/hubspot/jinjava/ExpectedTemplateInterpreter.java b/src/test/java/com/hubspot/jinjava/ExpectedTemplateInterpreter.java
index e12907b74..981a6c301 100644
--- a/src/test/java/com/hubspot/jinjava/ExpectedTemplateInterpreter.java
+++ b/src/test/java/com/hubspot/jinjava/ExpectedTemplateInterpreter.java
@@ -76,8 +76,8 @@ public String assertExpectedNonEagerOutput(String name) {
       JinjavaInterpreter preserveInterpreter = new JinjavaInterpreter(
         jinjava,
         jinjava.getGlobalContextCopy(),
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withExecutionMode(DefaultExecutionMode.instance())
           .withNestedInterpretationEnabled(true)
           .withLegacyOverrides(
@@ -107,8 +107,8 @@ public String assertExpectedNonEagerOutput(String name) {
         JinjavaInterpreter preserveInterpreter = new JinjavaInterpreter(
           jinjava,
           jinjava.getGlobalContextCopy(),
-          JinjavaConfig
-            .newBuilder()
+          BaseJinjavaTest
+            .newConfigBuilder()
             .withExecutionMode(DefaultExecutionMode.instance())
             .withNestedInterpretationEnabled(true)
             .withLegacyOverrides(
diff --git a/src/test/java/com/hubspot/jinjava/FullSnippetsTest.java b/src/test/java/com/hubspot/jinjava/FullSnippetsTest.java
index 06fca73db..6dead8a02 100644
--- a/src/test/java/com/hubspot/jinjava/FullSnippetsTest.java
+++ b/src/test/java/com/hubspot/jinjava/FullSnippetsTest.java
@@ -50,8 +50,8 @@ public Optional<LocationResolver> getLocationResolver() {
         }
       }
     );
-    JinjavaConfig config = JinjavaConfig
-      .newBuilder()
+    JinjavaConfig config = BaseJinjavaTest
+      .newConfigBuilder()
       .withNestedInterpretationEnabled(true)
       .withLegacyOverrides(
         LegacyOverrides.newBuilder().withUsePyishObjectMapper(true).build()
diff --git a/src/test/java/com/hubspot/jinjava/el/ExpressionResolverTest.java b/src/test/java/com/hubspot/jinjava/el/ExpressionResolverTest.java
index fb270721c..a690adbd1 100644
--- a/src/test/java/com/hubspot/jinjava/el/ExpressionResolverTest.java
+++ b/src/test/java/com/hubspot/jinjava/el/ExpressionResolverTest.java
@@ -7,6 +7,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.interpret.Context;
@@ -24,7 +25,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.Set;
 import java.util.function.Supplier;
 import org.junit.Before;
@@ -394,8 +394,8 @@ public void itBlocksDisabledFunctions() {
     String rendered = jinjava.render(template, context);
     assertEquals("hi 1 2 ", rendered);
 
-    final JinjavaConfig config = JinjavaConfig
-      .newBuilder()
+    final JinjavaConfig config = BaseJinjavaTest
+      .newConfigBuilder()
       .withDisabled(disabled)
       .build();
 
@@ -429,7 +429,7 @@ public void itBlocksDisabledExpTests() {
   @Test
   public void itStoresResolvedFunctions() {
     context.put("datetime", 12345);
-    final JinjavaConfig config = JinjavaConfig.newBuilder().build();
+    final JinjavaConfig config = BaseJinjavaTest.newConfigBuilder().build();
     String template =
       "{% for i in range(1, 5) %}{{i}} {% endfor %}\n{{ unixtimestamp(datetime) }}";
     final RenderResult renderResult = jinjava.renderForResult(template, context, config);
diff --git a/src/test/java/com/hubspot/jinjava/el/ExtendedSyntaxBuilderTest.java b/src/test/java/com/hubspot/jinjava/el/ExtendedSyntaxBuilderTest.java
index ace3497b3..009fab1bd 100644
--- a/src/test/java/com/hubspot/jinjava/el/ExtendedSyntaxBuilderTest.java
+++ b/src/test/java/com/hubspot/jinjava/el/ExtendedSyntaxBuilderTest.java
@@ -5,8 +5,8 @@
 
 import com.google.common.collect.Lists;
 import com.google.common.io.Resources;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.LegacyOverrides;
 import com.hubspot.jinjava.interpret.Context;
 import com.hubspot.jinjava.interpret.IndexOutOfRangeException;
@@ -33,7 +33,9 @@ public class ExtendedSyntaxBuilderTest {
   @Before
   public void setup() {
     interpreter =
-      new Jinjava(JinjavaConfig.newBuilder().withMaxOutputSize(MAX_STRING_LENGTH).build())
+      new Jinjava(
+        BaseJinjavaTest.newConfigBuilder().withMaxOutputSize(MAX_STRING_LENGTH).build()
+      )
         .newInterpreter();
     JinjavaInterpreter.pushCurrent(interpreter);
 
@@ -191,8 +193,8 @@ public void literalTuple() {
   public void mapLiteral() {
     interpreter =
       new Jinjava(
-        JinjavaConfig
-          .builder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withMaxOutputSize(MAX_STRING_LENGTH)
           .withLegacyOverrides(LegacyOverrides.THREE_POINT_0.withEvaluateMapKeys(false))
           .build()
diff --git a/src/test/java/com/hubspot/jinjava/el/ext/AdditionOperatorTest.java b/src/test/java/com/hubspot/jinjava/el/ext/AdditionOperatorTest.java
index 97ae7f0b1..7a8ce5dc1 100644
--- a/src/test/java/com/hubspot/jinjava/el/ext/AdditionOperatorTest.java
+++ b/src/test/java/com/hubspot/jinjava/el/ext/AdditionOperatorTest.java
@@ -3,8 +3,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.interpret.OutputTooBigException;
 import java.util.Collection;
@@ -22,7 +22,9 @@ public class AdditionOperatorTest {
   @Before
   public void setup() {
     interpreter =
-      new Jinjava(JinjavaConfig.newBuilder().withMaxOutputSize(MAX_STRING_LENGTH).build())
+      new Jinjava(
+        BaseJinjavaTest.newConfigBuilder().withMaxOutputSize(MAX_STRING_LENGTH).build()
+      )
         .newInterpreter();
     JinjavaInterpreter.pushCurrent(interpreter);
   }
diff --git a/src/test/java/com/hubspot/jinjava/el/ext/AstFilterChainParityTest.java b/src/test/java/com/hubspot/jinjava/el/ext/AstFilterChainParityTest.java
index e95e9ab74..e9ee8bb76 100644
--- a/src/test/java/com/hubspot/jinjava/el/ext/AstFilterChainParityTest.java
+++ b/src/test/java/com/hubspot/jinjava/el/ext/AstFilterChainParityTest.java
@@ -4,10 +4,9 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.LegacyOverrides;
-import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.interpret.RenderResult;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -33,8 +32,8 @@ public void setup() {
 
     jinjavaOptimized =
       new Jinjava(
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withEnableFilterChainOptimization(true)
           .withLegacyOverrides(legacyOverrides)
           .build()
@@ -42,8 +41,8 @@ public void setup() {
 
     jinjavaUnoptimized =
       new Jinjava(
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withEnableFilterChainOptimization(false)
           .withLegacyOverrides(legacyOverrides)
           .build()
diff --git a/src/test/java/com/hubspot/jinjava/el/ext/AstFilterChainPerformanceTest.java b/src/test/java/com/hubspot/jinjava/el/ext/AstFilterChainPerformanceTest.java
index b5cc4b8b7..7373b359a 100644
--- a/src/test/java/com/hubspot/jinjava/el/ext/AstFilterChainPerformanceTest.java
+++ b/src/test/java/com/hubspot/jinjava/el/ext/AstFilterChainPerformanceTest.java
@@ -2,8 +2,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.Before;
@@ -26,12 +26,15 @@ public class AstFilterChainPerformanceTest {
   public void setup() {
     jinjavaOptimized =
       new Jinjava(
-        JinjavaConfig.newBuilder().withEnableFilterChainOptimization(true).build()
+        BaseJinjavaTest.newConfigBuilder().withEnableFilterChainOptimization(true).build()
       );
 
     jinjavaUnoptimized =
       new Jinjava(
-        JinjavaConfig.newBuilder().withEnableFilterChainOptimization(false).build()
+        BaseJinjavaTest
+          .newConfigBuilder()
+          .withEnableFilterChainOptimization(false)
+          .build()
       );
 
     context = new HashMap<>();
diff --git a/src/test/java/com/hubspot/jinjava/el/ext/AstFilterChainTest.java b/src/test/java/com/hubspot/jinjava/el/ext/AstFilterChainTest.java
index 6c514bfd7..c71050414 100644
--- a/src/test/java/com/hubspot/jinjava/el/ext/AstFilterChainTest.java
+++ b/src/test/java/com/hubspot/jinjava/el/ext/AstFilterChainTest.java
@@ -4,8 +4,8 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.interpret.Context;
 import com.hubspot.jinjava.interpret.RenderResult;
 import com.hubspot.jinjava.interpret.TemplateError.ErrorItem;
@@ -27,7 +27,7 @@ public class AstFilterChainTest {
   public void setup() {
     jinjava =
       new Jinjava(
-        JinjavaConfig.newBuilder().withEnableFilterChainOptimization(true).build()
+        BaseJinjavaTest.newConfigBuilder().withEnableFilterChainOptimization(true).build()
       );
 
     context = new HashMap<>();
@@ -101,7 +101,7 @@ public void itHandlesUnknownFilterInChain() {
   public void itMatchesNonChainedBehaviorForUnknownFilter() {
     String template = "{{ name | unknown_filter | lower | md5 }}";
     Jinjava jinjavaUnoptimized = new Jinjava(
-      JinjavaConfig.newBuilder().withEnableFilterChainOptimization(false).build()
+      BaseJinjavaTest.newConfigBuilder().withEnableFilterChainOptimization(false).build()
     );
     RenderResult optimizedResult = jinjava.renderForResult(template, context);
     RenderResult unoptimizedResult = jinjavaUnoptimized.renderForResult(
@@ -120,8 +120,8 @@ public void itSkipsDisabledFilterAndContinuesChain() {
       ImmutableSet.of("lower")
     );
     Jinjava jinjavaWithDisabled = new Jinjava(
-      JinjavaConfig
-        .newBuilder()
+      BaseJinjavaTest
+        .newConfigBuilder()
         .withEnableFilterChainOptimization(true)
         .withDisabled(disabled)
         .build()
@@ -147,15 +147,15 @@ public void itMatchesNonChainedBehaviorForDisabledFilter() {
     String template = "{{ name|trim|lower|capitalize }}";
 
     Jinjava optimized = new Jinjava(
-      JinjavaConfig
-        .newBuilder()
+      BaseJinjavaTest
+        .newConfigBuilder()
         .withEnableFilterChainOptimization(true)
         .withDisabled(disabled)
         .build()
     );
     Jinjava unoptimized = new Jinjava(
-      JinjavaConfig
-        .newBuilder()
+      BaseJinjavaTest
+        .newConfigBuilder()
         .withEnableFilterChainOptimization(false)
         .withDisabled(disabled)
         .build()
diff --git a/src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstBinaryTest.java b/src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstBinaryTest.java
index cc5350667..f11f372cd 100644
--- a/src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstBinaryTest.java
+++ b/src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstBinaryTest.java
@@ -4,6 +4,7 @@
 import static org.junit.Assert.fail;
 
 import com.hubspot.jinjava.BaseInterpretingTest;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.LegacyOverrides;
 import com.hubspot.jinjava.el.ext.DeferredParsingException;
@@ -22,8 +23,8 @@ public class EagerAstBinaryTest extends BaseInterpretingTest {
 
   @Before
   public void setup() {
-    JinjavaConfig config = JinjavaConfig
-      .newBuilder()
+    JinjavaConfig config = BaseJinjavaTest
+      .newConfigBuilder()
       .withRandomNumberGeneratorStrategy(RandomNumberGeneratorStrategy.DEFERRED)
       .withExecutionMode(EagerExecutionMode.instance())
       .withNestedInterpretationEnabled(true)
diff --git a/src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstChoiceTest.java b/src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstChoiceTest.java
index e87edf167..f594a46e9 100644
--- a/src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstChoiceTest.java
+++ b/src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstChoiceTest.java
@@ -4,6 +4,7 @@
 import static org.junit.Assert.fail;
 
 import com.hubspot.jinjava.BaseInterpretingTest;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.LegacyOverrides;
 import com.hubspot.jinjava.el.ext.DeferredParsingException;
@@ -23,8 +24,8 @@ public class EagerAstChoiceTest extends BaseInterpretingTest {
 
   @Before
   public void setup() {
-    JinjavaConfig config = JinjavaConfig
-      .newBuilder()
+    JinjavaConfig config = BaseJinjavaTest
+      .newConfigBuilder()
       .withRandomNumberGeneratorStrategy(RandomNumberGeneratorStrategy.DEFERRED)
       .withExecutionMode(EagerExecutionMode.instance())
       .withNestedInterpretationEnabled(true)
diff --git a/src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstDotTest.java b/src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstDotTest.java
index faeee2622..f86620f8e 100644
--- a/src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstDotTest.java
+++ b/src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstDotTest.java
@@ -4,6 +4,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.hubspot.jinjava.BaseInterpretingTest;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.LegacyOverrides;
 import com.hubspot.jinjava.interpret.Context;
@@ -19,8 +20,8 @@ public class EagerAstDotTest extends BaseInterpretingTest {
 
   @Before
   public void setup() {
-    JinjavaConfig config = JinjavaConfig
-      .newBuilder()
+    JinjavaConfig config = BaseJinjavaTest
+      .newConfigBuilder()
       .withRandomNumberGeneratorStrategy(RandomNumberGeneratorStrategy.DEFERRED)
       .withExecutionMode(EagerExecutionMode.instance())
       .withNestedInterpretationEnabled(true)
diff --git a/src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstMethodTest.java b/src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstMethodTest.java
index 1b1945383..30ff441b8 100644
--- a/src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstMethodTest.java
+++ b/src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstMethodTest.java
@@ -4,6 +4,7 @@
 import static org.junit.Assert.fail;
 
 import com.hubspot.jinjava.BaseInterpretingTest;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.LegacyOverrides;
 import com.hubspot.jinjava.el.ext.DeferredParsingException;
@@ -27,8 +28,8 @@ public class EagerAstMethodTest extends BaseInterpretingTest {
 
   @Before
   public void setup() {
-    JinjavaConfig config = JinjavaConfig
-      .newBuilder()
+    JinjavaConfig config = BaseJinjavaTest
+      .newConfigBuilder()
       .withRandomNumberGeneratorStrategy(RandomNumberGeneratorStrategy.DEFERRED)
       .withExecutionMode(EagerExecutionMode.instance())
       .withNestedInterpretationEnabled(true)
diff --git a/src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstRangeBracketTest.java b/src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstRangeBracketTest.java
index e501965d1..7ff83ab3b 100644
--- a/src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstRangeBracketTest.java
+++ b/src/test/java/com/hubspot/jinjava/el/ext/eager/EagerAstRangeBracketTest.java
@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.hubspot.jinjava.BaseInterpretingTest;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.LegacyOverrides;
 import com.hubspot.jinjava.interpret.Context;
@@ -17,8 +18,8 @@ public class EagerAstRangeBracketTest extends BaseInterpretingTest {
 
   @Before
   public void setup() {
-    JinjavaConfig config = JinjavaConfig
-      .newBuilder()
+    JinjavaConfig config = BaseJinjavaTest
+      .newConfigBuilder()
       .withRandomNumberGeneratorStrategy(RandomNumberGeneratorStrategy.DEFERRED)
       .withExecutionMode(EagerExecutionMode.instance())
       .withNestedInterpretationEnabled(true)
diff --git a/src/test/java/com/hubspot/jinjava/interpret/DeferredTest.java b/src/test/java/com/hubspot/jinjava/interpret/DeferredTest.java
index b7974b6fa..ceb5c0c1e 100644
--- a/src/test/java/com/hubspot/jinjava/interpret/DeferredTest.java
+++ b/src/test/java/com/hubspot/jinjava/interpret/DeferredTest.java
@@ -6,6 +6,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.Resources;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.random.RandomNumberGeneratorStrategy;
@@ -25,8 +26,8 @@ public class DeferredTest {
 
   @Before
   public void setup() {
-    JinjavaConfig config = JinjavaConfig
-      .newBuilder()
+    JinjavaConfig config = BaseJinjavaTest
+      .newConfigBuilder()
       .withRandomNumberGeneratorStrategy(RandomNumberGeneratorStrategy.DEFERRED)
       .build();
     JinjavaInterpreter parentInterpreter = new JinjavaInterpreter(
diff --git a/src/test/java/com/hubspot/jinjava/interpret/JinjavaInterpreterTest.java b/src/test/java/com/hubspot/jinjava/interpret/JinjavaInterpreterTest.java
index 1ae20aede..c2fca7cdc 100644
--- a/src/test/java/com/hubspot/jinjava/interpret/JinjavaInterpreterTest.java
+++ b/src/test/java/com/hubspot/jinjava/interpret/JinjavaInterpreterTest.java
@@ -5,6 +5,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.LegacyOverrides;
@@ -42,7 +43,10 @@ public class JinjavaInterpreterTest {
   public void setup() {
     jinjava =
       new Jinjava(
-        JinjavaConfig.newBuilder().withTimeZone(ZoneId.of("America/New_York")).build()
+        BaseJinjavaTest
+          .newConfigBuilder()
+          .withTimeZone(ZoneId.of("America/New_York"))
+          .build()
       );
     interpreter = jinjava.newInterpreter();
     symbols = interpreter.getConfig().getTokenScannerSymbols();
@@ -204,8 +208,8 @@ public void parseWithSyntaxError() {
 
   @Test
   public void itLimitsOutputSize() {
-    JinjavaConfig outputSizeLimitedConfig = JinjavaConfig
-      .newBuilder()
+    JinjavaConfig outputSizeLimitedConfig = BaseJinjavaTest
+      .newConfigBuilder()
       .withMaxOutputSize(20)
       .build();
     String output = "123456789012345678901234567890";
@@ -222,8 +226,8 @@ public void itLimitsOutputSize() {
 
   @Test
   public void itLimitsOutputSizeOnTagNode() {
-    JinjavaConfig outputSizeLimitedConfig = JinjavaConfig
-      .newBuilder()
+    JinjavaConfig outputSizeLimitedConfig = BaseJinjavaTest
+      .newConfigBuilder()
       .withMaxOutputSize(10)
       .build();
     String output = "{% for i in range(20) %} {{ i }} {% endfor %}";
@@ -245,8 +249,8 @@ public void itLimitsOutputSizeOnTagNode() {
 
   @Test
   public void itLimitsOutputSizeWhenSumOfNodeSizesExceedsMax() {
-    JinjavaConfig outputSizeLimitedConfig = JinjavaConfig
-      .newBuilder()
+    JinjavaConfig outputSizeLimitedConfig = BaseJinjavaTest
+      .newConfigBuilder()
       .withMaxOutputSize(19)
       .build();
     String input = "1234567890{% block testchild %}1234567890{% endblock %}";
@@ -265,8 +269,8 @@ public void itLimitsOutputSizeWhenSumOfNodeSizesExceedsMax() {
 
   @Test
   public void itCanPreserveRawTags() {
-    JinjavaConfig preserveConfig = JinjavaConfig
-      .newBuilder()
+    JinjavaConfig preserveConfig = BaseJinjavaTest
+      .newConfigBuilder()
       .withExecutionMode(PreserveRawExecutionMode.instance())
       .build();
     String input = "1{% raw %}2{% endraw %}3";
@@ -355,8 +359,8 @@ public void itInterpretsWhitespaceControl() {
   public void itInterpretsEmptyExpressions() {
     jinjava =
       new Jinjava(
-        JinjavaConfig
-          .builder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withTimeZone(ZoneId.of("America/New_York"))
           .withLegacyOverrides(
             LegacyOverrides.THREE_POINT_0.withParseWhitespaceControlStrictly(false)
@@ -520,13 +524,16 @@ public void itPreventsAccidentalExpressions() {
     JinjavaInterpreter normalInterpreter = new JinjavaInterpreter(
       jinjava,
       jinjava.getGlobalContext(),
-      JinjavaConfig.newBuilder().withExecutionMode(EagerExecutionMode.instance()).build()
+      BaseJinjavaTest
+        .newConfigBuilder()
+        .withExecutionMode(EagerExecutionMode.instance())
+        .build()
     );
     JinjavaInterpreter preventingInterpreter = new JinjavaInterpreter(
       jinjava,
       jinjava.getGlobalContext(),
-      JinjavaConfig
-        .newBuilder()
+      BaseJinjavaTest
+        .newConfigBuilder()
         .withFeatureConfig(
           FeatureConfig
             .newBuilder()
@@ -566,13 +573,16 @@ public void itOutputsUndefinedVariableError() {
     JinjavaInterpreter normalInterpreter = new JinjavaInterpreter(
       jinjava,
       jinjava.getGlobalContext(),
-      JinjavaConfig.newBuilder().withExecutionMode(EagerExecutionMode.instance()).build()
+      BaseJinjavaTest
+        .newConfigBuilder()
+        .withExecutionMode(EagerExecutionMode.instance())
+        .build()
     );
     JinjavaInterpreter outputtingErrorInterpreters = new JinjavaInterpreter(
       jinjava,
       jinjava.getGlobalContext(),
-      JinjavaConfig
-        .newBuilder()
+      BaseJinjavaTest
+        .newConfigBuilder()
         .withFeatureConfig(
           FeatureConfig
             .newBuilder()
diff --git a/src/test/java/com/hubspot/jinjava/interpret/LegacyOperatorPrecedenceTest.java b/src/test/java/com/hubspot/jinjava/interpret/LegacyOperatorPrecedenceTest.java
index 576193902..c9849a9a0 100644
--- a/src/test/java/com/hubspot/jinjava/interpret/LegacyOperatorPrecedenceTest.java
+++ b/src/test/java/com/hubspot/jinjava/interpret/LegacyOperatorPrecedenceTest.java
@@ -3,8 +3,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.LegacyOverrides;
 import java.util.HashMap;
 import org.junit.Before;
@@ -19,12 +19,15 @@ public class LegacyOperatorPrecedenceTest {
   public void setUp() throws Exception {
     legacy =
       new Jinjava(
-        JinjavaConfig.newBuilder().withLegacyOverrides(LegacyOverrides.NONE).build()
+        BaseJinjavaTest
+          .newConfigBuilder()
+          .withLegacyOverrides(LegacyOverrides.NONE)
+          .build()
       );
     modern =
       new Jinjava(
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withLegacyOverrides(
             LegacyOverrides.newBuilder().withUseNaturalOperatorPrecedence(true).build()
           )
diff --git a/src/test/java/com/hubspot/jinjava/interpret/LegacyWhitespaceControlParsingTest.java b/src/test/java/com/hubspot/jinjava/interpret/LegacyWhitespaceControlParsingTest.java
index 2033ee939..09289d4b5 100644
--- a/src/test/java/com/hubspot/jinjava/interpret/LegacyWhitespaceControlParsingTest.java
+++ b/src/test/java/com/hubspot/jinjava/interpret/LegacyWhitespaceControlParsingTest.java
@@ -3,8 +3,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.LegacyOverrides;
 import java.util.HashMap;
 import org.junit.Before;
@@ -19,12 +19,15 @@ public class LegacyWhitespaceControlParsingTest {
   public void setUp() throws Exception {
     legacy =
       new Jinjava(
-        JinjavaConfig.newBuilder().withLegacyOverrides(LegacyOverrides.NONE).build()
+        BaseJinjavaTest
+          .newConfigBuilder()
+          .withLegacyOverrides(LegacyOverrides.NONE)
+          .build()
       );
     modern =
       new Jinjava(
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withLegacyOverrides(
             LegacyOverrides.newBuilder().withParseWhitespaceControlStrictly(true).build()
           )
diff --git a/src/test/java/com/hubspot/jinjava/interpret/PartiallyDeferredValueTest.java b/src/test/java/com/hubspot/jinjava/interpret/PartiallyDeferredValueTest.java
index dec3f9153..55a86027c 100644
--- a/src/test/java/com/hubspot/jinjava/interpret/PartiallyDeferredValueTest.java
+++ b/src/test/java/com/hubspot/jinjava/interpret/PartiallyDeferredValueTest.java
@@ -4,6 +4,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.hubspot.jinjava.BaseInterpretingTest;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.LegacyOverrides;
 import com.hubspot.jinjava.mode.EagerExecutionMode;
@@ -17,8 +18,8 @@ public class PartiallyDeferredValueTest extends BaseInterpretingTest {
 
   @Before
   public void setup() {
-    JinjavaConfig config = JinjavaConfig
-      .newBuilder()
+    JinjavaConfig config = BaseJinjavaTest
+      .newConfigBuilder()
       .withRandomNumberGeneratorStrategy(RandomNumberGeneratorStrategy.DEFERRED)
       .withExecutionMode(EagerExecutionMode.instance())
       .withNestedInterpretationEnabled(true)
diff --git a/src/test/java/com/hubspot/jinjava/lib/expression/EagerExpressionStrategyTest.java b/src/test/java/com/hubspot/jinjava/lib/expression/EagerExpressionStrategyTest.java
index ca40c32ab..01fb8b56a 100644
--- a/src/test/java/com/hubspot/jinjava/lib/expression/EagerExpressionStrategyTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/expression/EagerExpressionStrategyTest.java
@@ -4,8 +4,8 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.LegacyOverrides;
 import com.hubspot.jinjava.interpret.Context;
 import com.hubspot.jinjava.interpret.Context.Library;
@@ -34,7 +34,7 @@ public boolean isPreserveRawTags() {
 
   @Before
   public void eagerSetup() throws Exception {
-    jinjava = new Jinjava(JinjavaConfig.newBuilder().build());
+    jinjava = new Jinjava(BaseJinjavaTest.newConfigBuilder().build());
     jinjava
       .getGlobalContext()
       .registerFunction(
@@ -48,8 +48,8 @@ public void eagerSetup() throws Exception {
       new JinjavaInterpreter(
         jinjava,
         new Context(),
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withExecutionMode(new EagerExecutionModeNoRaw())
           .build()
       );
@@ -57,8 +57,8 @@ public void eagerSetup() throws Exception {
       new JinjavaInterpreter(
         jinjava,
         interpreter.getContext(),
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withNestedInterpretationEnabled(true)
           .withLegacyOverrides(
             LegacyOverrides.newBuilder().withUsePyishObjectMapper(true).build()
@@ -76,8 +76,8 @@ public void itPreservesRawTags() {
       new JinjavaInterpreter(
         jinjava,
         new Context(),
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withExecutionMode(EagerExecutionMode.instance())
           .build()
       );
diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/DateTimeFormatFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/DateTimeFormatFilterTest.java
index a4544bf79..5c84262c8 100644
--- a/src/test/java/com/hubspot/jinjava/lib/filter/DateTimeFormatFilterTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/filter/DateTimeFormatFilterTest.java
@@ -5,8 +5,8 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.hubspot.jinjava.BaseInterpretingTest;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.features.DateTimeFeatureActivationStrategy;
 import com.hubspot.jinjava.features.FeatureConfig;
 import com.hubspot.jinjava.interpret.InvalidArgumentException;
@@ -182,8 +182,8 @@ public void itUsesDeprecationDateIfNoDateProvided() {
     ZonedDateTime now = ZonedDateTime.now();
 
     Jinjava jinjava = new Jinjava(
-      JinjavaConfig
-        .newBuilder()
+      BaseJinjavaTest
+        .newConfigBuilder()
         .withFeatureConfig(
           FeatureConfig
             .newBuilder()
diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/DivideFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/DivideFilterTest.java
index 9091d334b..6ba1793b8 100644
--- a/src/test/java/com/hubspot/jinjava/lib/filter/DivideFilterTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/filter/DivideFilterTest.java
@@ -50,8 +50,8 @@ public void itDividesIntegersWithNonIntegerResult() {
   @Test
   public void itRendersWithMorePrecisionWithConfigOption() {
     Jinjava customJinjava = new Jinjava(
-      JinjavaConfig
-        .newBuilder()
+      BaseJinjavaTest
+        .newConfigBuilder()
         .withLegacyOverrides(
           LegacyOverrides.newBuilder().withUsePyishObjectMapper(true).build()
         )
diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/FloatFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/FloatFilterTest.java
index 5d6011e42..7f6e759fd 100644
--- a/src/test/java/com/hubspot/jinjava/lib/filter/FloatFilterTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/filter/FloatFilterTest.java
@@ -18,6 +18,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.hubspot.jinjava.BaseInterpretingTest;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.JinjavaConfig;
 import java.nio.charset.StandardCharsets;
@@ -30,8 +31,8 @@
 public class FloatFilterTest extends BaseInterpretingTest {
 
   private static final Locale FRENCH_LOCALE = new Locale("fr", "FR");
-  private static final JinjavaConfig FRENCH_LOCALE_CONFIG = JinjavaConfig
-    .builder()
+  private static final JinjavaConfig FRENCH_LOCALE_CONFIG = BaseJinjavaTest
+    .newConfigBuilder()
     .withCharset(StandardCharsets.UTF_8)
     .withLocale(FRENCH_LOCALE)
     .withTimeZone(ZoneOffset.UTC)
diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/IntFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/IntFilterTest.java
index 3874e5fb9..b12ad01e2 100644
--- a/src/test/java/com/hubspot/jinjava/lib/filter/IntFilterTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/filter/IntFilterTest.java
@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.hubspot.jinjava.BaseInterpretingTest;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.JinjavaConfig;
 import java.nio.charset.StandardCharsets;
@@ -15,8 +16,8 @@
 public class IntFilterTest extends BaseInterpretingTest {
 
   private static final Locale FRENCH_LOCALE = new Locale("fr", "FR");
-  private static final JinjavaConfig FRENCH_LOCALE_CONFIG = JinjavaConfig
-    .builder()
+  private static final JinjavaConfig FRENCH_LOCALE_CONFIG = BaseJinjavaTest
+    .newConfigBuilder()
     .withCharset(StandardCharsets.UTF_8)
     .withLocale(FRENCH_LOCALE)
     .withTimeZone(ZoneOffset.UTC)
diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/JoinFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/JoinFilterTest.java
index 6b555b925..3ef8f7db0 100644
--- a/src/test/java/com/hubspot/jinjava/lib/filter/JoinFilterTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/filter/JoinFilterTest.java
@@ -36,7 +36,8 @@ public void testJoinAttrs() {
 
   @Test
   public void itTruncatesStringToConfigLimit() {
-    jinjava = new Jinjava(JinjavaConfig.newBuilder().withMaxStringLength(5).build());
+    jinjava =
+      new Jinjava(BaseJinjavaTest.newConfigBuilder().withMaxStringLength(5).build());
 
     RenderResult result = jinjava.renderForResult(
       "{{ [1, 2, 3, 4, 5]|join('|') }}",
diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/PrettyPrintFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/PrettyPrintFilterTest.java
index 628c4dddc..36b56eede 100644
--- a/src/test/java/com/hubspot/jinjava/lib/filter/PrettyPrintFilterTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/filter/PrettyPrintFilterTest.java
@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.interpret.Context;
@@ -22,7 +23,7 @@ public class PrettyPrintFilterTest {
 
   @Before
   public void setup() {
-    JinjavaConfig config = JinjavaConfig.newBuilder().build();
+    JinjavaConfig config = BaseJinjavaTest.newConfigBuilder().build();
     Jinjava jinjava = new Jinjava(config);
     Context context = jinjava.getGlobalContext();
     i = new JinjavaInterpreter(jinjava, context, config);
diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/RegexReplaceFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/RegexReplaceFilterTest.java
index 2e1032396..202aa4883 100644
--- a/src/test/java/com/hubspot/jinjava/lib/filter/RegexReplaceFilterTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/filter/RegexReplaceFilterTest.java
@@ -4,8 +4,8 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import com.hubspot.jinjava.BaseInterpretingTest;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.interpret.InvalidArgumentException;
 import com.hubspot.jinjava.interpret.InvalidInputException;
 import com.hubspot.jinjava.objects.SafeString;
@@ -69,7 +69,7 @@ public void itLimitsLongInput() {
     assertThatThrownBy(() ->
         filter.filter(
           sb.toString(),
-          new Jinjava(JinjavaConfig.newBuilder().withMaxStringLength(10).build())
+          new Jinjava(BaseJinjavaTest.newConfigBuilder().withMaxStringLength(10).build())
             .newInterpreter(),
           "O",
           "0"
diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/ReplaceFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/ReplaceFilterTest.java
index 4ada03886..3c0e93de4 100644
--- a/src/test/java/com/hubspot/jinjava/lib/filter/ReplaceFilterTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/filter/ReplaceFilterTest.java
@@ -4,8 +4,8 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import com.hubspot.jinjava.BaseInterpretingTest;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.interpret.InterpretException;
 import com.hubspot.jinjava.interpret.InvalidInputException;
 import com.hubspot.jinjava.objects.SafeString;
@@ -67,7 +67,7 @@ public void itLimitsLongInput() {
     assertThatThrownBy(() ->
         filter.filter(
           sb.toString(),
-          new Jinjava(JinjavaConfig.newBuilder().withMaxStringLength(10).build())
+          new Jinjava(BaseJinjavaTest.newConfigBuilder().withMaxStringLength(10).build())
             .newInterpreter(),
           "O",
           "0"
diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/StripTagsFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/StripTagsFilterTest.java
index b684ddf67..52084ce2b 100644
--- a/src/test/java/com/hubspot/jinjava/lib/filter/StripTagsFilterTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/filter/StripTagsFilterTest.java
@@ -5,6 +5,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.interpret.Context;
@@ -31,7 +32,7 @@ public class StripTagsFilterTest {
 
   @Before
   public void setup() {
-    JinjavaConfig config = JinjavaConfig.newBuilder().build();
+    JinjavaConfig config = BaseJinjavaTest.newConfigBuilder().build();
     Jinjava jinjava = new Jinjava(config);
     this.interpreter = new JinjavaInterpreter(jinjava.newInterpreter());
     JinjavaInterpreter.pushCurrent(interpreter);
diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/ToJsonFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/ToJsonFilterTest.java
index 06a9eb00f..5dd406f73 100644
--- a/src/test/java/com/hubspot/jinjava/lib/filter/ToJsonFilterTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/filter/ToJsonFilterTest.java
@@ -3,8 +3,8 @@
 import static org.assertj.core.api.Java6Assertions.assertThat;
 
 import com.hubspot.jinjava.BaseInterpretingTest;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.interpret.OutputTooBigException;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -44,7 +44,7 @@ public void itLimitsLength() {
       temp = nested;
     }
     interpreter =
-      new Jinjava(JinjavaConfig.newBuilder().withMaxOutputSize(500).build())
+      new Jinjava(BaseJinjavaTest.newConfigBuilder().withMaxOutputSize(500).build())
         .newInterpreter();
     assertThat(filter.filter(original, interpreter)).asString().contains("[[]]]]");
     for (int i = 0; i < 400; i++) {
diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/UnixTimestampFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/UnixTimestampFilterTest.java
index 06fa10165..7d4af1373 100644
--- a/src/test/java/com/hubspot/jinjava/lib/filter/UnixTimestampFilterTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/filter/UnixTimestampFilterTest.java
@@ -5,8 +5,8 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.hubspot.jinjava.BaseInterpretingTest;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.features.DateTimeFeatureActivationStrategy;
 import com.hubspot.jinjava.features.FeatureConfig;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
@@ -40,8 +40,8 @@ public void itRendersFromDate() {
   @Test
   public void itDefaultsToCurrentDate() {
     Jinjava jinjava = new Jinjava(
-      JinjavaConfig
-        .newBuilder()
+      BaseJinjavaTest
+        .newConfigBuilder()
         .withDateTimeProvider(() -> d.toEpochSecond() * 1000)
         .withFeatureConfig(
           FeatureConfig
@@ -65,8 +65,8 @@ public void itDefaultsToCurrentDate() {
   @Test
   public void itDefaultsToDeprecationDate() {
     Jinjava jinjava = new Jinjava(
-      JinjavaConfig
-        .newBuilder()
+      BaseJinjavaTest
+        .newConfigBuilder()
         .withDateTimeProvider(() -> d.toEpochSecond() * 1000)
         .withFeatureConfig(
           FeatureConfig
diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/time/FormatDateFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/time/FormatDateFilterTest.java
index da9915f41..f94b58484 100644
--- a/src/test/java/com/hubspot/jinjava/lib/filter/time/FormatDateFilterTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/filter/time/FormatDateFilterTest.java
@@ -4,8 +4,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.common.collect.ImmutableMap;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.features.DateTimeFeatureActivationStrategy;
 import com.hubspot.jinjava.features.FeatureConfig;
 import com.hubspot.jinjava.interpret.RenderResult;
@@ -252,7 +252,10 @@ public void itWarnsOnMissingFilterArg() {
   public void itDefaultsToCurrentDateOnMissingFilterArg() {
     jinjava =
       new Jinjava(
-        JinjavaConfig.newBuilder().withDateTimeProvider(() -> 1233333414223L).build()
+        BaseJinjavaTest
+          .newConfigBuilder()
+          .withDateTimeProvider(() -> 1233333414223L)
+          .build()
       );
 
     assertThat(
@@ -268,8 +271,8 @@ public void itDefaultsToCurrentDateOnMissingFilterArg() {
   public void itDefaultsToDeprecationDateOnMissingFilterArg() {
     jinjava =
       new Jinjava(
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withDateTimeProvider(() -> 1233333414223L)
           .withFeatureConfig(
             FeatureConfig
diff --git a/src/test/java/com/hubspot/jinjava/lib/fn/RangeFunctionTest.java b/src/test/java/com/hubspot/jinjava/lib/fn/RangeFunctionTest.java
index 0ca785267..207d04c3f 100644
--- a/src/test/java/com/hubspot/jinjava/lib/fn/RangeFunctionTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/fn/RangeFunctionTest.java
@@ -4,6 +4,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.interpret.InvalidArgumentException;
@@ -20,7 +21,7 @@ public class RangeFunctionTest {
 
   @Before
   public void beforeEach() {
-    config = JinjavaConfig.newBuilder().build();
+    config = BaseJinjavaTest.newConfigBuilder().build();
     Jinjava jinjava = new Jinjava(config);
     pushCurrent(new JinjavaInterpreter(jinjava.newInterpreter()));
   }
@@ -89,8 +90,8 @@ public void itTruncatesRangeToDefaultRangeLimit() {
   public void itTruncatesRangeToCustomRangeLimit() {
     JinjavaInterpreter.popCurrent();
     int customRangeLimit = 10;
-    JinjavaConfig customConfig = JinjavaConfig
-      .newBuilder()
+    JinjavaConfig customConfig = BaseJinjavaTest
+      .newConfigBuilder()
       .withRangeLimit(customRangeLimit)
       .build();
     pushCurrent(new JinjavaInterpreter(new Jinjava(customConfig).newInterpreter()));
diff --git a/src/test/java/com/hubspot/jinjava/lib/fn/TodayFunctionTest.java b/src/test/java/com/hubspot/jinjava/lib/fn/TodayFunctionTest.java
index 1179a3a34..3a380e471 100644
--- a/src/test/java/com/hubspot/jinjava/lib/fn/TodayFunctionTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/fn/TodayFunctionTest.java
@@ -3,8 +3,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.hubspot.jinjava.BaseInterpretingTest;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.interpret.AutoCloseableSupplier.AutoCloseableImpl;
 import com.hubspot.jinjava.interpret.Context;
 import com.hubspot.jinjava.interpret.InvalidArgumentException;
@@ -37,8 +37,8 @@ public void itUsesFixedDateTimeProvider() {
           new JinjavaInterpreter(
             new Jinjava(),
             new Context(),
-            JinjavaConfig
-              .newBuilder()
+            BaseJinjavaTest
+              .newConfigBuilder()
               .withDateTimeProvider(new FixedDateTimeProvider(ts))
               .build()
           )
@@ -74,8 +74,8 @@ public void itDefersWhenExecutingEagerly() {
           new JinjavaInterpreter(
             new Jinjava(),
             new Context(),
-            JinjavaConfig
-              .newBuilder()
+            BaseJinjavaTest
+              .newConfigBuilder()
               .withExecutionMode(EagerExecutionMode.instance())
               .build()
           )
diff --git a/src/test/java/com/hubspot/jinjava/lib/fn/UnixTimestampFunctionTest.java b/src/test/java/com/hubspot/jinjava/lib/fn/UnixTimestampFunctionTest.java
index 393c8fda3..380c72a50 100644
--- a/src/test/java/com/hubspot/jinjava/lib/fn/UnixTimestampFunctionTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/fn/UnixTimestampFunctionTest.java
@@ -2,8 +2,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.interpret.Context;
 import com.hubspot.jinjava.interpret.DeferredValueException;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
@@ -31,7 +31,7 @@ public void itGetsUnixTimestamps() {
     JinjavaInterpreter jinjavaInterpreter = new JinjavaInterpreter(
       new Jinjava(),
       new Context(),
-      JinjavaConfig.newBuilder().build()
+      BaseJinjavaTest.newConfigBuilder().build()
     );
     JinjavaInterpreter.pushCurrent(jinjavaInterpreter);
     assertThat(Functions.unixtimestamp())
@@ -52,8 +52,8 @@ public void itUsesFixedDateTimeProvider() {
       new JinjavaInterpreter(
         new Jinjava(),
         new Context(),
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withDateTimeProvider(new FixedDateTimeProvider(ts))
           .build()
       )
@@ -67,8 +67,8 @@ public void itDefersWhenExecutingEagerly() {
       new JinjavaInterpreter(
         new Jinjava(),
         new Context(),
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withExecutionMode(EagerExecutionMode.instance())
           .build()
       )
diff --git a/src/test/java/com/hubspot/jinjava/lib/fn/eager/EagerMacroFunctionTest.java b/src/test/java/com/hubspot/jinjava/lib/fn/eager/EagerMacroFunctionTest.java
index 142f81298..75d53e6d2 100644
--- a/src/test/java/com/hubspot/jinjava/lib/fn/eager/EagerMacroFunctionTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/fn/eager/EagerMacroFunctionTest.java
@@ -4,7 +4,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import com.hubspot.jinjava.BaseInterpretingTest;
-import com.hubspot.jinjava.JinjavaConfig;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.LegacyOverrides;
 import com.hubspot.jinjava.interpret.Context;
 import com.hubspot.jinjava.interpret.Context.TemporaryValueClosable;
@@ -26,8 +26,8 @@ public void eagerSetup() {
       new JinjavaInterpreter(
         jinjava,
         context,
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withExecutionMode(EagerExecutionMode.instance())
           .withLegacyOverrides(
             LegacyOverrides.newBuilder().withUsePyishObjectMapper(true).build()
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/CallTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/CallTagTest.java
index 4a4dbd3ab..b3b152d02 100644
--- a/src/test/java/com/hubspot/jinjava/lib/tag/CallTagTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/tag/CallTagTest.java
@@ -4,8 +4,8 @@
 
 import com.google.common.io.Resources;
 import com.hubspot.jinjava.BaseInterpretingTest;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -27,8 +27,8 @@ public void testSimpleFn() {
   public void itDoesNotDoubleCountCallTagTowardsDepth() throws IOException {
     interpreter =
       new Jinjava(
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withEnableRecursiveMacroCalls(true)
           .withMaxMacroRecursionDepth(6) // There are 3 call tags, but a total of 6 "macro" calls happening in this file as each call to `caller()` counts too
           .build()
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/ForTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/ForTagTest.java
index 905e0da3d..5333b5f7c 100644
--- a/src/test/java/com/hubspot/jinjava/lib/tag/ForTagTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/tag/ForTagTest.java
@@ -10,7 +10,7 @@
 import com.google.common.collect.Maps;
 import com.google.common.io.Resources;
 import com.hubspot.jinjava.BaseInterpretingTest;
-import com.hubspot.jinjava.JinjavaConfig;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.LegacyOverrides;
 import com.hubspot.jinjava.interpret.InterpretException;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
@@ -214,8 +214,8 @@ public void testForLoopWithDates() {
       new JinjavaInterpreter(
         jinjava,
         context,
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withLegacyOverrides(
             LegacyOverrides.newBuilder().withUsePyishObjectMapper(false).build()
           )
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/MacroTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/MacroTagTest.java
index d351ac29c..de95f36d4 100644
--- a/src/test/java/com/hubspot/jinjava/lib/tag/MacroTagTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/tag/MacroTagTest.java
@@ -7,8 +7,8 @@
 import com.google.common.collect.Lists;
 import com.google.common.io.Resources;
 import com.hubspot.jinjava.BaseInterpretingTest;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.interpret.DeferredValue;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.interpret.TemplateError.ErrorReason;
@@ -209,7 +209,9 @@ public void itAllowsMacrosCallingMacrosUsingCall() throws IOException {
   public void itAllowsMacroRecursionWhenEnabledInConfiguration() throws IOException {
     // I need a different configuration here therefore
     interpreter =
-      new Jinjava(JinjavaConfig.newBuilder().withEnableRecursiveMacroCalls(true).build())
+      new Jinjava(
+        BaseJinjavaTest.newConfigBuilder().withEnableRecursiveMacroCalls(true).build()
+      )
         .newInterpreter();
     JinjavaInterpreter.pushCurrent(interpreter);
 
@@ -228,8 +230,8 @@ public void itAllowsMacroRecursionWhenEnabledInConfiguration() throws IOExceptio
   public void itAllowsMacroRecursionWithMaxDepth() throws IOException {
     interpreter =
       new Jinjava(
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withEnableRecursiveMacroCalls(true)
           .withMaxMacroRecursionDepth(10)
           .build()
@@ -251,8 +253,8 @@ public void itAllowsMacroRecursionWithMaxDepth() throws IOException {
   public void itAllowsMacroRecursionWithMaxDepthInValidationMode() throws IOException {
     interpreter =
       new Jinjava(
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withEnableRecursiveMacroCalls(true)
           .withMaxMacroRecursionDepth(10)
           .withValidationMode(true)
@@ -275,8 +277,8 @@ public void itAllowsMacroRecursionWithMaxDepthInValidationMode() throws IOExcept
   public void itEnforcesMacroRecursionWithMaxDepth() throws IOException {
     interpreter =
       new Jinjava(
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withEnableRecursiveMacroCalls(true)
           .withMaxMacroRecursionDepth(2)
           .build()
@@ -295,7 +297,7 @@ public void itEnforcesMacroRecursionWithMaxDepth() throws IOException {
   public void itPreventsRecursionForMacroWithVar() {
     interpreter =
       new Jinjava(
-        JinjavaConfig.newBuilder().withNestedInterpretationEnabled(true).build()
+        BaseJinjavaTest.newConfigBuilder().withNestedInterpretationEnabled(true).build()
       )
         .newInterpreter();
     try (var a = JinjavaInterpreter.closeablePushCurrent(interpreter).get()) {
@@ -349,8 +351,8 @@ public void itReconstructsMacroDefinitionFromMacroFunctionWithNoTrim() {
   public void itCorrectlyScopesNestedMacroTags() {
     interpreter =
       new Jinjava(
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withEnableRecursiveMacroCalls(true)
           .withMaxMacroRecursionDepth(2)
           .build()
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/RawTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/RawTagTest.java
index ea51cc878..542d20e73 100644
--- a/src/test/java/com/hubspot/jinjava/lib/tag/RawTagTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/tag/RawTagTest.java
@@ -4,7 +4,7 @@
 
 import com.google.common.io.Resources;
 import com.hubspot.jinjava.BaseInterpretingTest;
-import com.hubspot.jinjava.JinjavaConfig;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.interpret.Context.TemporaryValueClosable;
 import com.hubspot.jinjava.interpret.DeferredValue;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
@@ -100,8 +100,8 @@ public void itPreservesRawTags() {
     JinjavaInterpreter preserveInterpreter = new JinjavaInterpreter(
       jinjava,
       jinjava.getGlobalContextCopy(),
-      JinjavaConfig
-        .newBuilder()
+      BaseJinjavaTest
+        .newConfigBuilder()
         .withExecutionMode(PreserveRawExecutionMode.instance())
         .build()
     );
@@ -125,8 +125,8 @@ public void itOverridesRawTagPreservation() {
     JinjavaInterpreter preserveInterpreter = new JinjavaInterpreter(
       jinjava,
       jinjava.getGlobalContextCopy(),
-      JinjavaConfig
-        .newBuilder()
+      BaseJinjavaTest
+        .newConfigBuilder()
         .withExecutionMode(PreserveRawExecutionMode.instance())
         .build()
     );
@@ -150,8 +150,8 @@ public void ifFixesSpacingWithRawTagPreservation() {
     JinjavaInterpreter preserveInterpreter = new JinjavaInterpreter(
       jinjava,
       jinjava.getGlobalContextCopy(),
-      JinjavaConfig
-        .newBuilder()
+      BaseJinjavaTest
+        .newConfigBuilder()
         .withExecutionMode(PreserveRawExecutionMode.instance())
         .build()
     );
@@ -166,8 +166,8 @@ public void itPreservesDeferredWhilePreservingRawTags() {
     JinjavaInterpreter preserveInterpreter = new JinjavaInterpreter(
       jinjava,
       jinjava.getGlobalContextCopy(),
-      JinjavaConfig
-        .newBuilder()
+      BaseJinjavaTest
+        .newConfigBuilder()
         .withExecutionMode(PreserveRawExecutionMode.instance())
         .build()
     );
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/ValidationModeTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/ValidationModeTest.java
index 67b2c7e18..3a5e0aad8 100644
--- a/src/test/java/com/hubspot/jinjava/lib/tag/ValidationModeTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/tag/ValidationModeTest.java
@@ -3,8 +3,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.common.collect.ImmutableList;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.LegacyOverrides;
 import com.hubspot.jinjava.interpret.Context;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
@@ -61,8 +61,8 @@ public void setup() {
       new JinjavaInterpreter(
         jinjava,
         context,
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withLegacyOverrides(LegacyOverrides.NONE)
           .withValidationMode(true)
           .build()
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerCycleTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerCycleTagTest.java
index fc9edc409..0f4f84ad0 100644
--- a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerCycleTagTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerCycleTagTest.java
@@ -2,7 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.hubspot.jinjava.JinjavaConfig;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.LegacyOverrides;
 import com.hubspot.jinjava.interpret.DeferredValue;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
@@ -27,8 +27,8 @@ public void eagerSetup() {
       new JinjavaInterpreter(
         jinjava,
         context,
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withMaxOutputSize(MAX_OUTPUT_SIZE)
           .withExecutionMode(EagerExecutionMode.instance())
           .withLegacyOverrides(
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerDoTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerDoTagTest.java
index d380df199..6ef77d431 100644
--- a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerDoTagTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerDoTagTest.java
@@ -2,8 +2,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.ExpectedNodeInterpreter;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.LegacyOverrides;
 import com.hubspot.jinjava.interpret.DeferredValue;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
@@ -27,8 +27,8 @@ public void eagerSetup() {
       new JinjavaInterpreter(
         jinjava,
         context,
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withMaxOutputSize(MAX_OUTPUT_SIZE)
           .withExecutionMode(EagerExecutionMode.instance())
           .withLegacyOverrides(
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerExtendsTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerExtendsTagTest.java
index b3b2857fc..93d6c4916 100644
--- a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerExtendsTagTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerExtendsTagTest.java
@@ -2,8 +2,8 @@
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
 
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.ExpectedTemplateInterpreter;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.LegacyOverrides;
 import com.hubspot.jinjava.interpret.DeferredValue;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
@@ -31,8 +31,8 @@ void eagerSetup(boolean nestedInterpretation) {
       new JinjavaInterpreter(
         jinjava,
         context,
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withNestedInterpretationEnabled(nestedInterpretation)
           .withExecutionMode(EagerExecutionMode.instance())
           .withLegacyOverrides(
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerForTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerForTagTest.java
index 9cc8de2a5..ed256fda3 100644
--- a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerForTagTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerForTagTest.java
@@ -3,8 +3,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.common.collect.ImmutableList;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.ExpectedNodeInterpreter;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.LegacyOverrides;
 import com.hubspot.jinjava.interpret.DeferredValue;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
@@ -28,8 +28,8 @@ public void eagerSetup() {
       new JinjavaInterpreter(
         jinjava,
         context,
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withMaxOutputSize(MAX_OUTPUT_SIZE)
           .withExecutionMode(EagerExecutionMode.instance())
           .withLegacyOverrides(
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerFromTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerFromTagTest.java
index 54d288f1d..dde89ecd7 100644
--- a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerFromTagTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerFromTagTest.java
@@ -3,7 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.common.io.Resources;
-import com.hubspot.jinjava.JinjavaConfig;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.interpret.DeferredValue;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.lib.tag.FromTag;
@@ -53,8 +53,8 @@ public Optional<LocationResolver> getLocationResolver() {
       new JinjavaInterpreter(
         jinjava,
         context,
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withExecutionMode(EagerExecutionMode.instance())
           .build()
       );
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerIfTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerIfTagTest.java
index 0839a101c..2c415f550 100644
--- a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerIfTagTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerIfTagTest.java
@@ -2,8 +2,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.ExpectedNodeInterpreter;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.interpret.DeferredValue;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.lib.tag.IfTagTest;
@@ -24,8 +24,8 @@ public void eagerSetup() {
       new JinjavaInterpreter(
         jinjava,
         context,
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withExecutionMode(EagerExecutionMode.instance())
           .build()
       );
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerImportTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerImportTagTest.java
index ea20333bf..58de257ed 100644
--- a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerImportTagTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerImportTagTest.java
@@ -4,7 +4,7 @@
 
 import com.google.common.base.Strings;
 import com.google.common.io.Resources;
-import com.hubspot.jinjava.JinjavaConfig;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.LegacyOverrides;
 import com.hubspot.jinjava.interpret.Context;
 import com.hubspot.jinjava.interpret.DeferredValue;
@@ -53,8 +53,8 @@ public void eagerSetup() throws Exception {
       new JinjavaInterpreter(
         jinjava,
         context,
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withExecutionMode(EagerExecutionMode.instance())
           .withLegacyOverrides(
             LegacyOverrides.newBuilder().withUsePyishObjectMapper(true).build()
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerIncludeTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerIncludeTagTest.java
index 8bf760a8e..afd93de07 100644
--- a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerIncludeTagTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerIncludeTagTest.java
@@ -3,8 +3,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.common.io.Resources;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.ExpectedTemplateInterpreter;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.interpret.DeferredValue;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.lib.tag.IncludeTagTest;
@@ -32,8 +32,8 @@ public void eagerSetup() {
       new JinjavaInterpreter(
         jinjava,
         context,
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withExecutionMode(EagerExecutionMode.instance())
           .build()
       );
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerSetTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerSetTagTest.java
index d86055ff2..73f484d4d 100644
--- a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerSetTagTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerSetTagTest.java
@@ -2,8 +2,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.ExpectedNodeInterpreter;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.interpret.DeferredValue;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.interpret.TemplateError.ErrorReason;
@@ -28,8 +28,8 @@ public void eagerSetup() {
       new JinjavaInterpreter(
         jinjava,
         context,
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withMaxOutputSize(MAX_OUTPUT_SIZE)
           .withExecutionMode(EagerExecutionMode.instance())
           .build()
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerTagDecoratorTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerTagDecoratorTest.java
index 9c26ea35b..f6726ae9d 100644
--- a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerTagDecoratorTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerTagDecoratorTest.java
@@ -7,7 +7,7 @@
 import static org.mockito.Mockito.when;
 
 import com.hubspot.jinjava.BaseInterpretingTest;
-import com.hubspot.jinjava.JinjavaConfig;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.interpret.DeferredValue;
 import com.hubspot.jinjava.interpret.DeferredValueException;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
@@ -57,8 +57,8 @@ public void eagerSetup() throws Exception {
       new JinjavaInterpreter(
         jinjava,
         context,
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withMaxOutputSize(MAX_OUTPUT_SIZE)
           .withExecutionMode(EagerExecutionMode.instance())
           .build()
@@ -165,8 +165,8 @@ public void itDefersNodeWhenOutputTooBigIsThrownWithinInnerInterpret() {
       new JinjavaInterpreter(
         jinjava,
         context,
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withExecutionMode(EagerExecutionMode.instance())
           .build()
       );
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerUnlessTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerUnlessTagTest.java
index 1ea138092..598af35fb 100644
--- a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerUnlessTagTest.java
+++ b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerUnlessTagTest.java
@@ -2,8 +2,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.ExpectedNodeInterpreter;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.interpret.DeferredValue;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.lib.tag.UnlessTagTest;
@@ -24,8 +24,8 @@ public void eagerSetup() {
       new JinjavaInterpreter(
         jinjava,
         context,
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withExecutionMode(EagerExecutionMode.instance())
           .build()
       );
diff --git a/src/test/java/com/hubspot/jinjava/objects/collections/PyMapTest.java b/src/test/java/com/hubspot/jinjava/objects/collections/PyMapTest.java
index 0d046ddae..37a170166 100644
--- a/src/test/java/com/hubspot/jinjava/objects/collections/PyMapTest.java
+++ b/src/test/java/com/hubspot/jinjava/objects/collections/PyMapTest.java
@@ -290,8 +290,8 @@ public void itDoesntSetKeysWithVariableNameByDefault() {
   public void itSetsKeysWithVariableName() {
     jinjava =
       new Jinjava(
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withLegacyOverrides(
             LegacyOverrides.newBuilder().withEvaluateMapKeys(true).build()
           )
@@ -363,8 +363,8 @@ public void itDoesntUpdateKeysWithVariableNameByDefault() {
   public void itUpdatesKeysWithVariableName() {
     jinjava =
       new Jinjava(
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withLegacyOverrides(
             LegacyOverrides.newBuilder().withEvaluateMapKeys(true).build()
           )
diff --git a/src/test/java/com/hubspot/jinjava/objects/date/PyishDateTest.java b/src/test/java/com/hubspot/jinjava/objects/date/PyishDateTest.java
index aef7604d6..b732811b2 100644
--- a/src/test/java/com/hubspot/jinjava/objects/date/PyishDateTest.java
+++ b/src/test/java/com/hubspot/jinjava/objects/date/PyishDateTest.java
@@ -2,8 +2,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.interpret.Context;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.objects.serialization.PyishObjectMapper;
@@ -29,8 +29,8 @@ public void itUsesDateTimeProviderWhenNoTimeProvided() {
       new JinjavaInterpreter(
         new Jinjava(),
         new Context(),
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withDateTimeProvider(new FixedDateTimeProvider(ts))
           .build()
       )
diff --git a/src/test/java/com/hubspot/jinjava/objects/date/StrftimeFormatterTest.java b/src/test/java/com/hubspot/jinjava/objects/date/StrftimeFormatterTest.java
index c8ec80429..8cc5d71cd 100644
--- a/src/test/java/com/hubspot/jinjava/objects/date/StrftimeFormatterTest.java
+++ b/src/test/java/com/hubspot/jinjava/objects/date/StrftimeFormatterTest.java
@@ -3,8 +3,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
@@ -157,7 +157,7 @@ public void itAllowsLiteralCharacters() {
   public void itUsesInterpreterLocaleAsDefault() {
     try {
       Jinjava jinjava = new Jinjava(
-        JinjavaConfig.newBuilder().withLocale(Locale.FRENCH).build()
+        BaseJinjavaTest.newConfigBuilder().withLocale(Locale.FRENCH).build()
       );
       JinjavaInterpreter.pushCurrent(jinjava.newInterpreter());
       assertThat(StrftimeFormatter.format(d, "%B %-d, %Y")).isEqualTo("novembre 6, 2013");
diff --git a/src/test/java/com/hubspot/jinjava/objects/serialization/PyishObjectMapperTest.java b/src/test/java/com/hubspot/jinjava/objects/serialization/PyishObjectMapperTest.java
index f3e1aca67..483b8bd8a 100644
--- a/src/test/java/com/hubspot/jinjava/objects/serialization/PyishObjectMapperTest.java
+++ b/src/test/java/com/hubspot/jinjava/objects/serialization/PyishObjectMapperTest.java
@@ -5,8 +5,8 @@
 
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.google.common.collect.ImmutableMap;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.LegacyOverrides;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.interpret.OutputTooBigException;
@@ -49,7 +49,7 @@ public void itSerializesMapEntrySetWithLimit() {
     map.put("bar", ImmutableMap.of("foobar", new ArrayList<>()));
 
     Jinjava jinjava = new Jinjava(
-      JinjavaConfig.newBuilder().withMaxOutputSize(10000).build()
+      BaseJinjavaTest.newConfigBuilder().withMaxOutputSize(10000).build()
     );
     try {
       JinjavaInterpreter.pushCurrent(jinjava.newInterpreter());
@@ -84,7 +84,7 @@ public void itLimitsDepth() {
     list.add(original);
     try {
       Jinjava jinjava = new Jinjava(
-        JinjavaConfig.newBuilder().withMaxOutputSize(10000).build()
+        BaseJinjavaTest.newConfigBuilder().withMaxOutputSize(10000).build()
       );
       JinjavaInterpreter.pushCurrent(jinjava.newInterpreter());
       assertThatThrownBy(() -> PyishObjectMapper.getAsPyishStringOrThrow(original))
@@ -104,7 +104,7 @@ public void itLimitsOutputSize() {
     String input = RandomStringUtils.random(10002);
     try {
       Jinjava jinjava = new Jinjava(
-        JinjavaConfig.newBuilder().withMaxOutputSize(10000).build()
+        BaseJinjavaTest.newConfigBuilder().withMaxOutputSize(10000).build()
       );
       JinjavaInterpreter.pushCurrent(jinjava.newInterpreter());
       assertThatThrownBy(() -> PyishObjectMapper.getAsPyishString(input))
@@ -139,8 +139,8 @@ public void itSerializesToSnakeCaseAccessibleMapWhenInMapEntry() {
   @Test
   public void itDoesNotConvertToSnakeCaseMapWhenResultIsForOutput() {
     Jinjava jinjava = new Jinjava(
-      JinjavaConfig
-        .newBuilder()
+      BaseJinjavaTest
+        .newConfigBuilder()
         .withLegacyOverrides(
           LegacyOverrides.newBuilder().withUsePyishObjectMapper(true).build()
         )
@@ -154,8 +154,8 @@ public void itDoesNotConvertToSnakeCaseMapWhenResultIsForOutput() {
   @Test
   public void itSerializesToSnakeCaseWhenLegacyOverrideIsSet() {
     Jinjava jinjava = new Jinjava(
-      JinjavaConfig
-        .newBuilder()
+      BaseJinjavaTest
+        .newConfigBuilder()
         .withLegacyOverrides(
           LegacyOverrides
             .newBuilder()
diff --git a/src/test/java/com/hubspot/jinjava/tree/ExpressionNodeTest.java b/src/test/java/com/hubspot/jinjava/tree/ExpressionNodeTest.java
index b53d0a7a9..ac5273b82 100644
--- a/src/test/java/com/hubspot/jinjava/tree/ExpressionNodeTest.java
+++ b/src/test/java/com/hubspot/jinjava/tree/ExpressionNodeTest.java
@@ -5,6 +5,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import com.google.common.io.Resources;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.features.BuiltInFeatures;
@@ -25,10 +26,11 @@ public class ExpressionNodeTest {
   public void setup() {
     nestedInterpreter =
       new Jinjava(
-        JinjavaConfig.newBuilder().withNestedInterpretationEnabled(true).build()
+        BaseJinjavaTest.newConfigBuilder().withNestedInterpretationEnabled(true).build()
       )
         .newInterpreter();
-    interpreter = new Jinjava(JinjavaConfig.newBuilder().build()).newInterpreter();
+    interpreter =
+      new Jinjava(BaseJinjavaTest.newConfigBuilder().build()).newInterpreter();
   }
 
   @Test
@@ -69,8 +71,8 @@ public void itRendersWithoutNestedExpressionInterpretationByDefault() throws Exc
 
   @Test
   public void itRendersNestedTags() throws Exception {
-    final JinjavaConfig config = JinjavaConfig
-      .newBuilder()
+    final JinjavaConfig config = BaseJinjavaTest
+      .newConfigBuilder()
       .withNestedInterpretationEnabled(true)
       .build();
     try (var a = JinjavaInterpreter.closeablePushCurrent(nestedInterpreter).get()) {
@@ -174,8 +176,8 @@ public void itRendersStringRange() throws Exception {
 
   @Test
   public void itRenderEchoUndefined() {
-    final JinjavaConfig config = JinjavaConfig
-      .newBuilder()
+    final JinjavaConfig config = BaseJinjavaTest
+      .newConfigBuilder()
       .withFeatureConfig(
         FeatureConfig.newBuilder().add(ECHO_UNDEFINED, FeatureStrategies.ACTIVE).build()
       )
@@ -203,8 +205,8 @@ public void itRenderEchoUndefined() {
 
   @Test
   public void itFailsOnUnknownTokensVariables() throws Exception {
-    final JinjavaConfig config = JinjavaConfig
-      .newBuilder()
+    final JinjavaConfig config = BaseJinjavaTest
+      .newConfigBuilder()
       .withFailOnUnknownTokens(true)
       .build();
     try (
@@ -223,8 +225,8 @@ public void itFailsOnUnknownTokensVariables() throws Exception {
 
   @Test
   public void itFailsOnUnknownTokensOfLoops() throws Exception {
-    final JinjavaConfig config = JinjavaConfig
-      .newBuilder()
+    final JinjavaConfig config = BaseJinjavaTest
+      .newConfigBuilder()
       .withFailOnUnknownTokens(true)
       .build();
     JinjavaInterpreter jinjavaInterpreter = new Jinjava(config).newInterpreter();
@@ -238,8 +240,8 @@ public void itFailsOnUnknownTokensOfLoops() throws Exception {
 
   @Test
   public void itFailsOnUnknownTokensOfIf() throws Exception {
-    final JinjavaConfig config = JinjavaConfig
-      .newBuilder()
+    final JinjavaConfig config = BaseJinjavaTest
+      .newConfigBuilder()
       .withFailOnUnknownTokens(true)
       .build();
     try (
@@ -258,8 +260,8 @@ public void itFailsOnUnknownTokensOfIf() throws Exception {
 
   @Test
   public void itFailsOnUnknownTokensWithFilter() throws Exception {
-    final JinjavaConfig config = JinjavaConfig
-      .newBuilder()
+    final JinjavaConfig config = BaseJinjavaTest
+      .newConfigBuilder()
       .withFailOnUnknownTokens(true)
       .build();
     try (
@@ -305,8 +307,8 @@ public void itEscapesValueWhenContextSet() throws Exception {
 
   @Test
   public void itIgnoresParseErrorsWhenFeatureIsEnabled() {
-    final JinjavaConfig config = JinjavaConfig
-      .newBuilder()
+    final JinjavaConfig config = BaseJinjavaTest
+      .newConfigBuilder()
       .withFeatureConfig(
         FeatureConfig
           .newBuilder()
diff --git a/src/test/java/com/hubspot/jinjava/tree/FailOnUnknownTokensTest.java b/src/test/java/com/hubspot/jinjava/tree/FailOnUnknownTokensTest.java
index 1567435c3..13042155f 100644
--- a/src/test/java/com/hubspot/jinjava/tree/FailOnUnknownTokensTest.java
+++ b/src/test/java/com/hubspot/jinjava/tree/FailOnUnknownTokensTest.java
@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
@@ -18,7 +19,7 @@ public class FailOnUnknownTokensTest {
 
   @Before
   public void setUp() {
-    JinjavaConfig.Builder builder = JinjavaConfig.newBuilder();
+    JinjavaConfig.Builder builder = BaseJinjavaTest.newConfigBuilder();
     builder.withFailOnUnknownTokens(true);
     JinjavaConfig config = builder.build();
     jinjava = new Jinjava(config);
@@ -48,8 +49,8 @@ public void itReplacesTokensWithDefaultValues() {
 
   @Test
   public void itReplacesTokensInContextButThrowsExceptionForOthers() {
-    final JinjavaConfig config = JinjavaConfig
-      .newBuilder()
+    final JinjavaConfig config = BaseJinjavaTest
+      .newConfigBuilder()
       .withFailOnUnknownTokens(true)
       .build();
     JinjavaInterpreter jinjavaInterpreter = new Jinjava(config).newInterpreter();
diff --git a/src/test/java/com/hubspot/jinjava/tree/TreeParserTest.java b/src/test/java/com/hubspot/jinjava/tree/TreeParserTest.java
index 74a3ed821..e5a8374c5 100644
--- a/src/test/java/com/hubspot/jinjava/tree/TreeParserTest.java
+++ b/src/test/java/com/hubspot/jinjava/tree/TreeParserTest.java
@@ -4,8 +4,8 @@
 
 import com.google.common.io.Resources;
 import com.hubspot.jinjava.BaseInterpretingTest;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.LegacyOverrides;
 import com.hubspot.jinjava.interpret.Context.TemporaryValueClosable;
 import com.hubspot.jinjava.interpret.ErrorHandlingStrategy;
@@ -138,7 +138,11 @@ public void itStripsAllOuterWhiteSpaceWithComment() throws Exception {
   public void trimAndLstripBlocks() {
     interpreter =
       new Jinjava(
-        JinjavaConfig.newBuilder().withLstripBlocks(true).withTrimBlocks(true).build()
+        BaseJinjavaTest
+          .newConfigBuilder()
+          .withLstripBlocks(true)
+          .withTrimBlocks(true)
+          .build()
       )
         .newInterpreter();
 
@@ -150,7 +154,11 @@ public void trimAndLstripBlocks() {
   public void trimAndLstripCommentBlocks() {
     interpreter =
       new Jinjava(
-        JinjavaConfig.newBuilder().withLstripBlocks(true).withTrimBlocks(true).build()
+        BaseJinjavaTest
+          .newConfigBuilder()
+          .withLstripBlocks(true)
+          .withTrimBlocks(true)
+          .build()
       )
         .newInterpreter();
 
@@ -246,8 +254,8 @@ public void itTrimsNotes() {
     assertThat(interpreter.render(tree)).isEqualTo("A\n\nB");
     interpreter =
       new Jinjava(
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withLegacyOverrides(
             LegacyOverrides
               .newBuilder()
@@ -268,8 +276,8 @@ public void itAllowsTrailingNote() {
     assertThat(interpreter.render(tree)).isEqualTo("A\n");
     interpreter =
       new Jinjava(
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withLegacyOverrides(
             LegacyOverrides
               .newBuilder()
@@ -290,8 +298,8 @@ public void itAllowsTrailingExpression() {
     assertThat(interpreter.render(tree)).isEqualTo("A\n{{ ");
     interpreter =
       new Jinjava(
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withLegacyOverrides(
             LegacyOverrides
               .newBuilder()
@@ -312,8 +320,8 @@ public void itAllowsTrailingTag() {
     assertThat(interpreter.render(tree)).isEqualTo("A\n{% ");
     interpreter =
       new Jinjava(
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withLegacyOverrides(
             LegacyOverrides
               .newBuilder()
@@ -341,8 +349,8 @@ public void itTrimsExpressions() {
     assertThat(interpreter.render(tree)).isEqualTo("A\nB\nC");
     interpreter =
       new Jinjava(
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withLegacyOverrides(
             LegacyOverrides
               .newBuilder()
@@ -363,8 +371,8 @@ public void itDoesNotMergeAdjacentTextNodesWhenLegacyOverrideIsApplied() {
     assertThat(interpreter.render(tree)).isEqualTo("AB");
     interpreter =
       new Jinjava(
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withLegacyOverrides(
             LegacyOverrides.newBuilder().withAllowAdjacentTextNodes(true).build()
           )
diff --git a/src/test/java/com/hubspot/jinjava/tree/parse/CustomTokenScannerSymbolsTest.java b/src/test/java/com/hubspot/jinjava/tree/parse/CustomTokenScannerSymbolsTest.java
index 037f0368e..7feb78f85 100644
--- a/src/test/java/com/hubspot/jinjava/tree/parse/CustomTokenScannerSymbolsTest.java
+++ b/src/test/java/com/hubspot/jinjava/tree/parse/CustomTokenScannerSymbolsTest.java
@@ -4,6 +4,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.lib.filter.JoinFilterTest.User;
@@ -19,7 +20,10 @@ public class CustomTokenScannerSymbolsTest {
   @Before
   public void setup() {
     config =
-      JinjavaConfig.newBuilder().withTokenScannerSymbols(new CustomTokens()).build();
+      BaseJinjavaTest
+        .newConfigBuilder()
+        .withTokenScannerSymbols(new CustomTokens())
+        .build();
     jinjava = new Jinjava(config);
     jinjava.getGlobalContext().put("numbers", Lists.newArrayList(1L, 2L, 3L, 4L, 5L));
   }
diff --git a/src/test/java/com/hubspot/jinjava/tree/parse/TokenScannerTest.java b/src/test/java/com/hubspot/jinjava/tree/parse/TokenScannerTest.java
index af1988c03..4261b4fc2 100644
--- a/src/test/java/com/hubspot/jinjava/tree/parse/TokenScannerTest.java
+++ b/src/test/java/com/hubspot/jinjava/tree/parse/TokenScannerTest.java
@@ -6,6 +6,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.io.Resources;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.features.BuiltInFeatures;
 import com.hubspot.jinjava.features.FeatureConfig;
@@ -27,7 +28,7 @@ public class TokenScannerTest {
 
   @Before
   public void setup() {
-    config = JinjavaConfig.builder().build();
+    config = BaseJinjavaTest.newConfigBuilder().build();
     symbols = config.getTokenScannerSymbols();
   }
 
@@ -268,8 +269,8 @@ public void testCommentWithWhitespaceChar() {
     List<Token> tokens = tokens("comment-without-whitespace");
     assertThat(tokens.get(0).content.trim()).isEqualTo("$");
 
-    JinjavaConfig config = JinjavaConfig
-      .builder()
+    JinjavaConfig config = BaseJinjavaTest
+      .newConfigBuilder()
       .withFeatureConfig(
         FeatureConfig
           .newBuilder()
@@ -305,7 +306,12 @@ public void testEscapedBackslashWithinAttrValue() {
 
   @Test
   public void testLstripBlocks() {
-    config = JinjavaConfig.builder().withLstripBlocks(true).withTrimBlocks(true).build();
+    config =
+      BaseJinjavaTest
+        .newConfigBuilder()
+        .withLstripBlocks(true)
+        .withTrimBlocks(true)
+        .build();
 
     List<Token> tokens = tokens("tag-with-trim-chars");
     assertThat(tokens).isNotEmpty();
diff --git a/src/test/java/com/hubspot/jinjava/tree/parse/TokenWhitespaceTest.java b/src/test/java/com/hubspot/jinjava/tree/parse/TokenWhitespaceTest.java
index ab7243e74..09c0f643a 100644
--- a/src/test/java/com/hubspot/jinjava/tree/parse/TokenWhitespaceTest.java
+++ b/src/test/java/com/hubspot/jinjava/tree/parse/TokenWhitespaceTest.java
@@ -4,6 +4,7 @@
 
 import com.google.common.collect.Lists;
 import com.google.common.io.Resources;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.JinjavaConfig;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -45,6 +46,6 @@ private List<Token> scanTokens(String srcPath, JinjavaConfig config) {
   }
 
   private JinjavaConfig trimBlocksConfig() {
-    return JinjavaConfig.newBuilder().withTrimBlocks(true).build();
+    return BaseJinjavaTest.newConfigBuilder().withTrimBlocks(true).build();
   }
 }
diff --git a/src/test/java/com/hubspot/jinjava/util/EagerExpressionResolverTest.java b/src/test/java/com/hubspot/jinjava/util/EagerExpressionResolverTest.java
index bc8a211ad..471237f33 100644
--- a/src/test/java/com/hubspot/jinjava/util/EagerExpressionResolverTest.java
+++ b/src/test/java/com/hubspot/jinjava/util/EagerExpressionResolverTest.java
@@ -4,8 +4,8 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.LegacyOverrides;
 import com.hubspot.jinjava.el.ext.AbstractCallableMethod;
 import com.hubspot.jinjava.interpret.Context;
@@ -57,8 +57,8 @@ public void setUp() throws Exception {
 
   private JinjavaInterpreter getInterpreter(boolean evaluateMapKeys) throws Exception {
     Jinjava jinjava = new Jinjava(
-      JinjavaConfig
-        .newBuilder()
+      BaseJinjavaTest
+        .newConfigBuilder()
         .withExecutionMode(EagerExecutionMode.instance())
         .withRandomNumberGeneratorStrategy(RandomNumberGeneratorStrategy.DEFERRED)
         .withLegacyOverrides(
diff --git a/src/test/java/com/hubspot/jinjava/util/EagerReconstructionUtilsTest.java b/src/test/java/com/hubspot/jinjava/util/EagerReconstructionUtilsTest.java
index 2d15063d9..a2e6b0b81 100644
--- a/src/test/java/com/hubspot/jinjava/util/EagerReconstructionUtilsTest.java
+++ b/src/test/java/com/hubspot/jinjava/util/EagerReconstructionUtilsTest.java
@@ -2,11 +2,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.hubspot.jinjava.BaseInterpretingTest;
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.interpret.Context;
 import com.hubspot.jinjava.interpret.DeferredValue;
@@ -49,8 +51,8 @@ public void eagerSetup() throws Exception {
       new JinjavaInterpreter(
         jinjava,
         context,
-        JinjavaConfig
-          .newBuilder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withMaxOutputSize(MAX_OUTPUT_SIZE)
           .withExecutionMode(EagerExecutionMode.instance())
           .build()
@@ -258,8 +260,8 @@ public void itLimitsSetTagConstruction() {
   @Test
   public void itWrapsInRawTag() {
     String toWrap = "{{ foo }}";
-    JinjavaConfig preserveRawConfig = JinjavaConfig
-      .newBuilder()
+    JinjavaConfig preserveRawConfig = BaseJinjavaTest
+      .newConfigBuilder()
       .withExecutionMode(PreserveRawExecutionMode.instance())
       .build();
     assertThat(
@@ -274,8 +276,8 @@ public void itWrapsInRawTag() {
   @Test
   public void itDoesntWrapInRawTagUnnecessarily() {
     String toWrap = "foo";
-    JinjavaConfig preserveRawConfig = JinjavaConfig
-      .newBuilder()
+    JinjavaConfig preserveRawConfig = BaseJinjavaTest
+      .newConfigBuilder()
       .withExecutionMode(PreserveRawExecutionMode.instance())
       .build();
     assertThat(
@@ -289,8 +291,8 @@ public void itDoesntWrapInRawTagUnnecessarily() {
 
   @Test
   public void itDoesntWrapInRawTagForDefaultConfig() {
-    JinjavaConfig defaultConfig = JinjavaConfig
-      .newBuilder()
+    JinjavaConfig defaultConfig = BaseJinjavaTest
+      .newConfigBuilder()
       .withExecutionMode(DefaultExecutionMode.instance())
       .build();
     String toWrap = "{{ foo }}";
diff --git a/src/test/java/com/hubspot/jinjava/util/ObjectIteratorTest.java b/src/test/java/com/hubspot/jinjava/util/ObjectIteratorTest.java
index 0d09183d3..9c8d9f76c 100644
--- a/src/test/java/com/hubspot/jinjava/util/ObjectIteratorTest.java
+++ b/src/test/java/com/hubspot/jinjava/util/ObjectIteratorTest.java
@@ -18,6 +18,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.LegacyOverrides;
@@ -100,8 +101,8 @@ public void testItIteratesOverValues() {
 
   @Test
   public void testItIteratesOverKeys() throws Exception {
-    JinjavaConfig config = JinjavaConfig
-      .newBuilder()
+    JinjavaConfig config = BaseJinjavaTest
+      .newConfigBuilder()
       .withLegacyOverrides(LegacyOverrides.builder().withIterateOverMapKeys(true).build())
       .build();
     JinjavaInterpreter.pushCurrent(
diff --git a/src/test/java/com/hubspot/jinjava/util/RenderLimitUtilsTest.java b/src/test/java/com/hubspot/jinjava/util/RenderLimitUtilsTest.java
index 8c080ada5..1e0bca06d 100644
--- a/src/test/java/com/hubspot/jinjava/util/RenderLimitUtilsTest.java
+++ b/src/test/java/com/hubspot/jinjava/util/RenderLimitUtilsTest.java
@@ -2,6 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.JinjavaConfig;
 import org.junit.Test;
 
@@ -41,6 +42,6 @@ public void itUsesProvidedLimitWhenConfigIsUnlimited() {
   }
 
   private JinjavaConfig configWithOutputSize(long size) {
-    return JinjavaConfig.newBuilder().withMaxOutputSize(size).build();
+    return BaseJinjavaTest.newConfigBuilder().withMaxOutputSize(size).build();
   }
 }