diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java
index af0aee0fe0df..bdb7499bbe8c 100644
--- a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java
+++ b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java
@@ -208,6 +208,8 @@ private Object convertValue(Object data) {
       return convertMap((Map<String, Object>) data);
     } else if (data instanceof List) {
       return convertArray((List<Object>) data);
+    } else if ("NaN".equals(data)) {
+      return Double.NaN;
     } else if ("Delete".equals(data)) {
       return FieldValue.delete();
     } else if ("ServerTimestamp".equals(data)) {
diff --git a/google-cloud-firestore/src/test/resources/test-suite.binproto b/google-cloud-firestore/src/test/resources/test-suite.binproto
index 06bcd2989c30..a189342735ff 100644
Binary files a/google-cloud-firestore/src/test/resources/test-suite.binproto and b/google-cloud-firestore/src/test/resources/test-suite.binproto differ