SeleniumHQ
diff --git a/‎java/client/src/org/openqa/selenium/json/JsonOutput.java‎
Lines changed: 10 additions & 0 deletions b/‎java/client/src/org/openqa/selenium/json/JsonOutput.java‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎java/client/test/org/openqa/selenium/json/JsonOutputTest.java‎
Lines changed: 25 additions & 0 deletions b/‎java/client/test/org/openqa/selenium/json/JsonOutputTest.java‎
Lines changed: 25 additions & 0 deletions
@@ -102,6 +102,7 @@ public class JsonOutput implements Closeable {
   private String indent = "";
   private String lineSeparator = "\n";
   private String indentBy = "  ";
+  private boolean writeClassName = true;
 
   JsonOutput(Appendable appendable) {
     this.appendable = Require.nonNull("Underlying appendable", appendable);
@@ -209,6 +210,11 @@ public JsonOutput setPrettyPrint(boolean enablePrettyPrinting) {
     return this;
   }
 
+  public JsonOutput writeClassName(boolean writeClassName) {
+    this.writeClassName = writeClassName;
+    return this;
+  }
+
   public JsonOutput beginObject() {
     stack.getFirst().write("{" + lineSeparator);
     indent += indentBy;
@@ -374,6 +380,10 @@ private void mapObject(Object toConvert, int maxDepth) {
         continue;
       }
 
+      if (!writeClassName && "class".equals(pd.getName())) {
+        continue;
+      }
+
       Object value = pd.getReadMethod().apply(toConvert);
       if (!Optional.empty().equals(value)) {
         name(pd.getName());
 
@@ -671,6 +671,31 @@ public Optional<String> getNoValue() {
     assertThat(obj.has("noValue")).describedAs(json).isFalse();
   }
 
+  @Test
+  public void onRequsetShouldNotWriteClassNamesIntoJson() {
+    class WithClassName {
+      public String getCheese() {
+        return "gouda";
+      }
+    }
+
+    String json = convert(new WithClassName());
+
+    JsonObject obj = JsonParser.parseString(json).getAsJsonObject();
+    assertThat(obj.has("class")).isTrue();
+    assertThat(obj.get("cheese").getAsString()).isEqualTo("gouda");
+
+    StringBuilder str = new StringBuilder();
+    try (JsonOutput out = new Json().newOutput(str).writeClassName(false)) {
+      out.write(new WithClassName());
+    }
+
+    json = str.toString();
+    obj = JsonParser.parseString(json).getAsJsonObject();
+    assertThat(obj.has("class")).isFalse();
+    assertThat(obj.get("cheese").getAsString()).isEqualTo("gouda");
+  }
+
   private String convert(Object toConvert) {
     try (Writer writer = new StringWriter();
          JsonOutput jsonOutput = new Json().newOutput(writer)) {