diff --git a/pom.xml b/pom.xml
index cc2eb1a..1447a44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M7</version>
+                <version>3.2.2</version>
             </plugin>
         </plugins>
     </build>
diff --git a/src/test/java/software/coley/collections/Bidi.java b/src/test/java/software/coley/collections/BidiTest.java
similarity index 99%
rename from src/test/java/software/coley/collections/Bidi.java
rename to src/test/java/software/coley/collections/BidiTest.java
index ec20c2d..66c48d6 100644
--- a/src/test/java/software/coley/collections/Bidi.java
+++ b/src/test/java/software/coley/collections/BidiTest.java
@@ -14,7 +14,7 @@
  * Tests for {@link BiMap}
  */
 @SuppressWarnings("all")
-public class Bidi {
+public class BidiTest {
 	@Nested
 	class Hash {
 		@Test
diff --git a/src/test/java/software/coley/collections/Trees.java b/src/test/java/software/coley/collections/TreeTest.java
similarity index 99%
rename from src/test/java/software/coley/collections/Trees.java
rename to src/test/java/software/coley/collections/TreeTest.java
index 8b32a4a..261f791 100644
--- a/src/test/java/software/coley/collections/Trees.java
+++ b/src/test/java/software/coley/collections/TreeTest.java
@@ -11,7 +11,7 @@
 /**
  * Tests for {@link Tree}
  */
-public class Trees {
+public class TreeTest {
 	@Test
 	public void test_equality() {
 		Tree<String, String> tree1 = new TreeImpl<>("root");