diff --git a/test/src/test/java/hudson/cli/HelpCommandTest.java b/test/src/test/java/hudson/cli/HelpCommandTest.java
index 566ea169e40a439eb9971a673e769dac2573afbe..26c2da6ccdbdb4f581b89f8dcc06fbb852c0cf18 100644
--- a/test/src/test/java/hudson/cli/HelpCommandTest.java
+++ b/test/src/test/java/hudson/cli/HelpCommandTest.java
@@ -101,7 +101,7 @@ public class HelpCommandTest {
 
     private void assertContainsUsageOfMethodCommand(String text) {
         assertThat(text, containsString("offline-node NAME [-m VAL]"));
-        assertThat(text, containsStrings("NAME", "Slave name, or empty string for master"));
+        assertThat(text, containsStrings("NAME", "Agent name, or empty string for master"));
         assertThat(text, containsStrings("-m VAL", "Record the note about why you are disconnecting this node"));
     }
 
diff --git a/test/src/test/java/hudson/model/ExecutorTest.java b/test/src/test/java/hudson/model/ExecutorTest.java
index 25da5ebaea74d0b5ae908837e047f8035bc3298c..5d5b034fcc102e34f2184054c99091658f007ff7 100644
--- a/test/src/test/java/hudson/model/ExecutorTest.java
+++ b/test/src/test/java/hudson/model/ExecutorTest.java
@@ -140,7 +140,7 @@ public class ExecutorTest {
         assertEquals(b.getResult(), Result.FAILURE);
         assertThat(log, containsString("Finished: FAILURE"));
         assertThat(log, containsString("Build step 'BlockingBuilder' marked build as failure"));
-        assertThat(log, containsString("Slave went offline during the build"));
+        assertThat(log, containsString("Agent went offline during the build"));
         assertThat(log, containsString("Disconnected by Johnny : Taking offline to break your buil"));
     }