diff --git a/pyxform/tests_v1/test_dynamic_default.py b/pyxform/tests_v1/test_dynamic_default.py
index 619b6d2e8..48f56bb11 100644
--- a/pyxform/tests_v1/test_dynamic_default.py
+++ b/pyxform/tests_v1/test_dynamic_default.py
@@ -326,3 +326,18 @@ def test_default_date_not_considered_dynamic(self):
             """,
             xml__contains=["<foo>2020-01-01</foo>"],
         )
+
+    def test_dynamic_default_on_calculate(self):
+        self.assertPyxformXform(
+            name="dynamic",
+            md="""
+            | survey |            |          |       |             |                      |
+            |        | type       | name     | label | calculation | default              |
+            |        | calculate  | r        |       |             | random() + 0.5       |
+            |        | calculate  | one      |       |             | if(${r} < 1,'A','B') |
+            """,
+            xml__contains=[
+                """<setvalue event="odk-instance-first-load" ref="/dynamic/r" value="random() + 0.5"/>""",
+                """<setvalue event="odk-instance-first-load" ref="/dynamic/one" value="if( /dynamic/r  &lt; 1,'A','B')"/>""",
+            ],
+        )