diff --git a/.gitignore b/.gitignore
index 6c5edef..ef917af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,6 @@ gpg-sign.json
 mvn-sync.json
 .mvn/wrapper/maven-wrapper.jar
 release.properties
+.checkstyle
+.factorypath
+.fbExcludeFilterFile
diff --git a/src/test/java/au/com/acegi/xmlformat/FormatUtilTest.java b/src/test/java/au/com/acegi/xmlformat/FormatUtilTest.java
index 7885e0e..e42b0e5 100644
--- a/src/test/java/au/com/acegi/xmlformat/FormatUtilTest.java
+++ b/src/test/java/au/com/acegi/xmlformat/FormatUtilTest.java
@@ -27,7 +27,7 @@
 import static au.com.acegi.xmlformat.TestUtil.stringToFile;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
diff --git a/src/test/java/au/com/acegi/xmlformat/IOTest.java b/src/test/java/au/com/acegi/xmlformat/IOTest.java
index 90dbcce..a0b618e 100644
--- a/src/test/java/au/com/acegi/xmlformat/IOTest.java
+++ b/src/test/java/au/com/acegi/xmlformat/IOTest.java
@@ -23,7 +23,7 @@
 import static au.com.acegi.xmlformat.IOUtil.hash;
 import static au.com.acegi.xmlformat.TestUtil.getResource;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/test/java/au/com/acegi/xmlformat/TestUtil.java b/src/test/java/au/com/acegi/xmlformat/TestUtil.java
index d268925..15a1971 100644
--- a/src/test/java/au/com/acegi/xmlformat/TestUtil.java
+++ b/src/test/java/au/com/acegi/xmlformat/TestUtil.java
@@ -23,7 +23,7 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/test/java/au/com/acegi/xmlformat/XmlCheckPluginTest.java b/src/test/java/au/com/acegi/xmlformat/XmlCheckPluginTest.java
index 9265643..74c9a4d 100644
--- a/src/test/java/au/com/acegi/xmlformat/XmlCheckPluginTest.java
+++ b/src/test/java/au/com/acegi/xmlformat/XmlCheckPluginTest.java
@@ -23,7 +23,7 @@
 import static au.com.acegi.xmlformat.TestUtil.fileToString;
 import static au.com.acegi.xmlformat.TestUtil.stringToFile;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.atLeastOnce;
diff --git a/src/test/java/au/com/acegi/xmlformat/XmlFormatPluginTest.java b/src/test/java/au/com/acegi/xmlformat/XmlFormatPluginTest.java
index e3165ac..6ab613f 100644
--- a/src/test/java/au/com/acegi/xmlformat/XmlFormatPluginTest.java
+++ b/src/test/java/au/com/acegi/xmlformat/XmlFormatPluginTest.java
@@ -24,7 +24,7 @@
 import static au.com.acegi.xmlformat.TestUtil.stringToFile;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;