diff --git a/core/src/main/java/com/google/googlejavaformat/java/Main.java b/core/src/main/java/com/google/googlejavaformat/java/Main.java
index bfe1ff51f..23c87b799 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/Main.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/Main.java
@@ -277,7 +277,7 @@ static CommandLineOptions processArgs(String... args) throws UsageException {
           "--assume-filename is only supported when formatting standard input");
     }
     if (parameters.dryRun() && parameters.inPlace()) {
-      throw new UsageException("cannot use --dry-run and --in-place at the same time");
+      throw new UsageException("cannot use --dry-run and --replace at the same time");
     }
     return parameters;
   }
diff --git a/core/src/test/java/com/google/googlejavaformat/java/CommandLineFlagsTest.java b/core/src/test/java/com/google/googlejavaformat/java/CommandLineFlagsTest.java
index 928ce0078..f8777a33a 100644
--- a/core/src/test/java/com/google/googlejavaformat/java/CommandLineFlagsTest.java
+++ b/core/src/test/java/com/google/googlejavaformat/java/CommandLineFlagsTest.java
@@ -150,13 +150,22 @@ public void inPlaceStdin() {
 
   @Test
   public void inPlaceDryRun() {
+    try {
+      Main.processArgs("--replace", "--dry-run", "A.java");
+      fail();
+    } catch (UsageException e) {
+      assertThat(e)
+          .hasMessageThat()
+          .contains("cannot use --dry-run and --replace at the same time");
+    }
+
     try {
       Main.processArgs("-i", "-n", "A.java");
       fail();
     } catch (UsageException e) {
       assertThat(e)
           .hasMessageThat()
-          .contains("cannot use --dry-run and --in-place at the same time");
+          .contains("cannot use --dry-run and --replace at the same time");
     }
   }