diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/DnsChallengeTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/Dns01ChallengeTest.java
similarity index 98%
rename from acme4j-client/src/test/java/org/shredzone/acme4j/challenge/DnsChallengeTest.java
rename to acme4j-client/src/test/java/org/shredzone/acme4j/challenge/Dns01ChallengeTest.java
index 2e10c90a..8a7fced0 100644
--- a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/DnsChallengeTest.java
+++ b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/Dns01ChallengeTest.java
@@ -29,7 +29,7 @@ import org.shredzone.acme4j.toolbox.TestUtils;
 /**
  * Unit tests for {@link Dns01Challenge}.
  */
-public class DnsChallengeTest {
+public class Dns01ChallengeTest {
 
     private final Login login = TestUtils.login();
 
diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/HttpChallengeTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/Http01ChallengeTest.java
similarity index 98%
rename from acme4j-client/src/test/java/org/shredzone/acme4j/challenge/HttpChallengeTest.java
rename to acme4j-client/src/test/java/org/shredzone/acme4j/challenge/Http01ChallengeTest.java
index d0ae211d..bc02b849 100644
--- a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/HttpChallengeTest.java
+++ b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/Http01ChallengeTest.java
@@ -28,7 +28,7 @@ import org.shredzone.acme4j.toolbox.TestUtils;
 /**
  * Unit tests for {@link Http01Challenge}.
  */
-public class HttpChallengeTest {
+public class Http01ChallengeTest {
     private static final String TOKEN =
             "rSoI9JpyvFi-ltdnBW0W1DjKstzG7cHixjzcOjwzAEQ";
     private static final String KEY_AUTHORIZATION =