diff --git a/client-sniffer/src/test/java/org/elasticsearch/client/sniff/HostsSnifferBuilderTests.java b/client-sniffer/src/test/java/org/elasticsearch/client/sniff/HostsSnifferBuilderTests.java
index 38baccf931e..ff9c150d954 100644
--- a/client-sniffer/src/test/java/org/elasticsearch/client/sniff/HostsSnifferBuilderTests.java
+++ b/client-sniffer/src/test/java/org/elasticsearch/client/sniff/HostsSnifferBuilderTests.java
@@ -53,7 +53,7 @@ public class HostsSnifferBuilderTests extends LuceneTestCase {
                 HostsSniffer.builder(client).setSniffRequestTimeoutMillis(RandomInts.randomIntBetween(random(), Integer.MIN_VALUE, 0));
                 fail("should have failed");
             } catch(IllegalArgumentException e) {
-                assertEquals(e.getMessage(), "sniffRequestTimeout must be greater than 0");
+                assertEquals(e.getMessage(), "sniffRequestTimeoutMillis must be greater than 0");
             }
 
             HostsSniffer.Builder builder = HostsSniffer.builder(client);
diff --git a/client-sniffer/src/test/java/org/elasticsearch/client/sniff/SnifferBuilderTests.java b/client-sniffer/src/test/java/org/elasticsearch/client/sniff/SnifferBuilderTests.java
index 3fb152906b4..23d74e9f4f5 100644
--- a/client-sniffer/src/test/java/org/elasticsearch/client/sniff/SnifferBuilderTests.java
+++ b/client-sniffer/src/test/java/org/elasticsearch/client/sniff/SnifferBuilderTests.java
@@ -58,14 +58,14 @@ public class SnifferBuilderTests extends LuceneTestCase {
                 Sniffer.builder(client, hostsSniffer).setSniffIntervalMillis(RandomInts.randomIntBetween(random(), Integer.MIN_VALUE, 0));
                 fail("should have failed");
             } catch(IllegalArgumentException e) {
-                assertEquals("sniffInterval must be greater than 0", e.getMessage());
+                assertEquals("sniffIntervalMillis must be greater than 0", e.getMessage());
             }
 
             try {
                 Sniffer.builder(client, hostsSniffer).setSniffAfterFailureDelayMillis(RandomInts.randomIntBetween(random(), Integer.MIN_VALUE, 0));
                 fail("should have failed");
             } catch(IllegalArgumentException e) {
-                assertEquals("sniffAfterFailureDelay must be greater than 0", e.getMessage());
+                assertEquals("sniffAfterFailureDelayMillis must be greater than 0", e.getMessage());
             }
 
             try (Sniffer sniffer = Sniffer.builder(client, hostsSniffer).build()) {
diff --git a/client/src/test/java/org/elasticsearch/client/RestClientBuilderTests.java b/client/src/test/java/org/elasticsearch/client/RestClientBuilderTests.java
index 0269e6ada60..88b1406d925 100644
--- a/client/src/test/java/org/elasticsearch/client/RestClientBuilderTests.java
+++ b/client/src/test/java/org/elasticsearch/client/RestClientBuilderTests.java
@@ -57,7 +57,7 @@ public class RestClientBuilderTests extends LuceneTestCase {
                     .setMaxRetryTimeoutMillis(RandomInts.randomIntBetween(random(), Integer.MIN_VALUE, 0));
             fail("should have failed");
         } catch(IllegalArgumentException e) {
-            assertEquals("maxRetryTimeout must be greater than 0", e.getMessage());
+            assertEquals("maxRetryTimeoutMillis must be greater than 0", e.getMessage());
         }
 
         try {