diff --git a/.build-jdk8 b/.build-jdk8
deleted file mode 100644
index e69de29bb..000000000
diff --git a/pom.xml b/pom.xml
index e87fc7a5d..39bdf436a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,47 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>com.hubspot</groupId>
     <artifactId>basepom</artifactId>
-    <version>18.3</version>
+    <version>25.4</version>
   </parent>
 
   <groupId>com.hubspot.jinjava</groupId>
   <artifactId>jinjava</artifactId>
   <version>2.5.1-SNAPSHOT</version>
   <description>Jinja templating engine implemented in Java</description>
-  <url>https://github.com/HubSpot/jinjava</url>
-
-  <scm>
-    <connection>scm:git:git@github.com:HubSpot/jinjava.git</connection>
-    <developerConnection>scm:git:git@github.com:HubSpot/jinjava.git</developerConnection>
-    <url>git@github.com:HubSpot/jinjava.git</url>
-    <tag>HEAD</tag>
-  </scm>
-
-  <developers>
-    <developer>
-      <id>jaredstehler</id>
-      <name>Jared Stehler</name>
-    </developer>
-    <developer>
-      <id>boulter</id>
-      <name>Jeff Boulter</name>
-    </developer>
-  </developers>
 
   <properties>
-    <project.build.targetJdk>1.8</project.build.targetJdk>
-
     <dep.javassist.version>3.24.1-GA</dep.javassist.version>
-    <dep.mockito.version>2.23.4</dep.mockito.version>
-    <dep.objenesis.version>2.6</dep.objenesis.version>
 
-    <dep.plugin.findbugs.version>3.0.5</dep.plugin.findbugs.version>
     <dep.plugin.jacoco.version>0.8.3</dep.plugin.jacoco.version>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.jsoup</groupId>
+        <artifactId>jsoup</artifactId>
+        <version>1.10.3</version>
+      </dependency>
+      <dependency>
+        <groupId>de.odysseus.juel</groupId>
+        <artifactId>juel-api</artifactId>
+        <version>2.2.7</version>
+      </dependency>
+      <dependency>
+        <groupId>de.odysseus.juel</groupId>
+        <artifactId>juel-impl</artifactId>
+        <version>2.2.7</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.re2j</groupId>
+        <artifactId>re2j</artifactId>
+        <version>1.2</version>
+      </dependency>
+      <dependency>
+        <groupId>ch.obermuhlner</groupId>
+        <artifactId>big-math</artifactId>
+        <version>2.0.0</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -119,36 +126,6 @@
     </dependency>
   </dependencies>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.jsoup</groupId>
-        <artifactId>jsoup</artifactId>
-        <version>1.10.3</version>
-      </dependency>
-      <dependency>
-        <groupId>de.odysseus.juel</groupId>
-        <artifactId>juel-api</artifactId>
-        <version>2.2.7</version>
-      </dependency>
-      <dependency>
-        <groupId>de.odysseus.juel</groupId>
-        <artifactId>juel-impl</artifactId>
-        <version>2.2.7</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.re2j</groupId>
-        <artifactId>re2j</artifactId>
-        <version>1.2</version>
-      </dependency>
-      <dependency>
-        <groupId>ch.obermuhlner</groupId>
-        <artifactId>big-math</artifactId>
-        <version>2.0.0</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <build>
     <plugins>
       <plugin>
@@ -162,10 +139,10 @@
           </execution>
           <execution>
             <id>report</id>
-            <phase>test</phase>
             <goals>
               <goal>report</goal>
             </goals>
+            <phase>test</phase>
           </execution>
         </executions>
       </plugin>
@@ -176,10 +153,10 @@
         <configuration combine.self="override" />
         <executions>
           <execution>
-            <phase>package</phase>
             <goals>
               <goal>shade</goal>
             </goals>
+            <phase>package</phase>
             <configuration>
               <createDependencyReducedPom>true</createDependencyReducedPom>
               <shadedArtifactAttached>false</shadedArtifactAttached>
@@ -203,29 +180,26 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.basepom.maven</groupId>
-        <artifactId>duplicate-finder-maven-plugin</artifactId>
-        <configuration>
-          <exceptions>
-            <exception>
-              <conflictingDependencies>
-                <dependency>
-                  <groupId>net.bytebuddy</groupId>
-                  <artifactId>byte-buddy</artifactId>
-                  <version>1.9.3</version>
-                </dependency>
-                <dependency>
-                  <groupId>net.bytebuddy</groupId>
-                  <artifactId>byte-buddy-agent</artifactId>
-                  <version>1.9.3</version>
-                </dependency>
-              </conflictingDependencies>
-            </exception>
-          </exceptions>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
-</project>
 
+  <url>https://github.com/HubSpot/jinjava</url>
+
+  <developers>
+    <developer>
+      <id>jaredstehler</id>
+      <name>Jared Stehler</name>
+    </developer>
+    <developer>
+      <id>boulter</id>
+      <name>Jeff Boulter</name>
+    </developer>
+  </developers>
+
+  <scm>
+    <connection>scm:git:git@github.com:HubSpot/jinjava.git</connection>
+    <developerConnection>scm:git:git@github.com:HubSpot/jinjava.git</developerConnection>
+    <url>git@github.com:HubSpot/jinjava.git</url>
+    <tag>HEAD</tag>
+  </scm>
+</project>
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 9908bfe5a..6ad664d2a 100644
--- a/src/test/java/com/hubspot/jinjava/objects/date/StrftimeFormatterTest.java
+++ b/src/test/java/com/hubspot/jinjava/objects/date/StrftimeFormatterTest.java
@@ -94,6 +94,6 @@ public void itConvertsNominativeFormats() {
     ZonedDateTime zonedDateTime = ZonedDateTime.parse("2019-06-06T14:22:00.000+00:00");
 
     assertThat(StrftimeFormatter.formatter("%OB").withLocale(Locale.forLanguageTag("ru")).format(zonedDateTime))
-        .isEqualTo("Июнь");
+        .isIn("Июнь", "июнь");
   }
 }