diff --git a/NEWS.md b/NEWS.md
index c4129aed..9dcce520 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,7 @@
+# s2 (development version)
+
+* Updated more tests to pass on a forthcoming waldo package update (#237).
+
 # s2 1.1.3
 
 * Made a test less strict to pass tests on Alpine Linux (#218, #220).
diff --git a/tests/testthat/test-s2-accessors.R b/tests/testthat/test-s2-accessors.R
index cac91f00..c0979216 100644
--- a/tests/testthat/test-s2-accessors.R
+++ b/tests/testthat/test-s2-accessors.R
@@ -166,7 +166,7 @@ test_that("s2_project() and s2_project_normalized() work", {
       "LINESTRING (0 0, 0 90)",
       c("POINT (0 0)", "POINT (0 22.5)", "POINT (0 67.5)", "POINT (0 90)", "POINT EMPTY", NA)
     ),
-    c(0, 0.25, 0.75, 1, NA_real_, NA_real_)
+    c(0, 0.25, 0.75, 1, NaN, NA_real_)
   )
 
   expect_identical(
diff --git a/tests/testthat/test-s2-lnglat.R b/tests/testthat/test-s2-lnglat.R
index d93b8e27..d22aa135 100644
--- a/tests/testthat/test-s2-lnglat.R
+++ b/tests/testthat/test-s2-lnglat.R
@@ -10,9 +10,10 @@ test_that("s2_lnglat objects can be created from and converted back to R objects
     as_s2_lnglat(s2_point(1, 0, 0)),
     s2_lnglat(0, 0)
   )
+
   expect_identical(
-    as_s2_lnglat(s2_point(NA, NA, NA)),
-    s2_lnglat(NA, NA)
+    as_s2_lnglat(s2_point(NaN, NaN, NaN)),
+    s2_lnglat(NaN, NaN)
   )
 })