diff --git a/javatests/google/registry/flows/dotapp/testdata/domain_update_add_one_flag.xml b/javatests/google/registry/flows/dotapp/testdata/domain_update_add_one_flag.xml
new file mode 100644
index 000000000..b4d56ca79
--- /dev/null
+++ b/javatests/google/registry/flows/dotapp/testdata/domain_update_add_one_flag.xml
@@ -0,0 +1,18 @@
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
+  <command>
+    <update>
+      <domain:update
+       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
+        <domain:name>example.tld</domain:name>
+      </domain:update>
+    </update>
+    <extension>
+      <flags:update xmlns:flags="urn:google:params:xml:ns:flags-0.1">
+        <flags:add>
+          <flags:flag>%FLAG%</flags:flag>
+        </flags:add>
+      </flags:update>
+      </extension>
+    <clTRID>ABC-12345</clTRID>
+  </command>
+</epp>
diff --git a/javatests/google/registry/flows/dotapp/testdata/domain_update_add_one_flag_remove_one_flag.xml b/javatests/google/registry/flows/dotapp/testdata/domain_update_add_one_flag_remove_one_flag.xml
new file mode 100644
index 000000000..7dbebfd78
--- /dev/null
+++ b/javatests/google/registry/flows/dotapp/testdata/domain_update_add_one_flag_remove_one_flag.xml
@@ -0,0 +1,21 @@
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
+  <command>
+    <update>
+      <domain:update
+       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
+        <domain:name>example.tld</domain:name>
+      </domain:update>
+    </update>
+    <extension>
+      <flags:update xmlns:flags="urn:google:params:xml:ns:flags-0.1">
+        <flags:add>
+          <flags:flag>%ADDFLAG%</flags:flag>
+        </flags:add>
+        <flags:rem>
+          <flags:flag>%REMOVEFLAG%</flags:flag>
+        </flags:rem>
+      </flags:update>
+      </extension>
+    <clTRID>ABC-12345</clTRID>
+  </command>
+</epp>
diff --git a/javatests/google/registry/flows/dotapp/testdata/domain_update_add_one_flag_with_fee.xml b/javatests/google/registry/flows/dotapp/testdata/domain_update_add_one_flag_with_fee.xml
new file mode 100644
index 000000000..db5040060
--- /dev/null
+++ b/javatests/google/registry/flows/dotapp/testdata/domain_update_add_one_flag_with_fee.xml
@@ -0,0 +1,22 @@
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
+  <command>
+    <update>
+      <domain:update
+       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
+        <domain:name>example.tld</domain:name>
+      </domain:update>
+    </update>
+    <extension>
+      <flags:update xmlns:flags="urn:google:params:xml:ns:flags-0.1">
+        <flags:add>
+          <flags:flag>%FLAG%</flags:flag>
+        </flags:add>
+      </flags:update>
+      <fee:update xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
+        <fee:currency>USD</fee:currency>
+        <fee:fee>%FEE%</fee:fee>
+      </fee:update>
+      </extension>
+    <clTRID>ABC-12345</clTRID>
+  </command>
+</epp>
diff --git a/javatests/google/registry/flows/dotapp/testdata/domain_update_add_two_flags.xml b/javatests/google/registry/flows/dotapp/testdata/domain_update_add_two_flags.xml
new file mode 100644
index 000000000..2b3194514
--- /dev/null
+++ b/javatests/google/registry/flows/dotapp/testdata/domain_update_add_two_flags.xml
@@ -0,0 +1,19 @@
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
+  <command>
+    <update>
+      <domain:update
+       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
+        <domain:name>example.tld</domain:name>
+      </domain:update>
+    </update>
+    <extension>
+      <flags:update xmlns:flags="urn:google:params:xml:ns:flags-0.1">
+        <flags:add>
+          <flags:flag>%FLAG1%</flags:flag>
+          <flags:flag>%FLAG2%</flags:flag>
+        </flags:add>
+      </flags:update>
+      </extension>
+    <clTRID>ABC-12345</clTRID>
+  </command>
+</epp>
diff --git a/javatests/google/registry/flows/dotapp/testdata/domain_update_remove_one_flag.xml b/javatests/google/registry/flows/dotapp/testdata/domain_update_remove_one_flag.xml
new file mode 100644
index 000000000..a84c11e2d
--- /dev/null
+++ b/javatests/google/registry/flows/dotapp/testdata/domain_update_remove_one_flag.xml
@@ -0,0 +1,18 @@
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
+  <command>
+    <update>
+      <domain:update
+       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
+        <domain:name>example.tld</domain:name>
+      </domain:update>
+    </update>
+    <extension>
+      <flags:update xmlns:flags="urn:google:params:xml:ns:flags-0.1">
+        <flags:rem>
+          <flags:flag>%FLAG%</flags:flag>
+        </flags:rem>
+      </flags:update>
+      </extension>
+    <clTRID>ABC-12345</clTRID>
+  </command>
+</epp>
diff --git a/javatests/google/registry/flows/dotapp/testdata/domain_update_remove_one_flag_with_fee.xml b/javatests/google/registry/flows/dotapp/testdata/domain_update_remove_one_flag_with_fee.xml
new file mode 100644
index 000000000..bf9e83356
--- /dev/null
+++ b/javatests/google/registry/flows/dotapp/testdata/domain_update_remove_one_flag_with_fee.xml
@@ -0,0 +1,22 @@
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
+  <command>
+    <update>
+      <domain:update
+       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
+        <domain:name>example.tld</domain:name>
+      </domain:update>
+    </update>
+    <extension>
+      <flags:update xmlns:flags="urn:google:params:xml:ns:flags-0.1">
+        <flags:rem>
+          <flags:flag>%FLAG%</flags:flag>
+        </flags:rem>
+      </flags:update>
+      <fee:update xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
+        <fee:currency>USD</fee:currency>
+        <fee:fee>%FEE%</fee:fee>
+      </fee:update>
+      </extension>
+    <clTRID>ABC-12345</clTRID>
+  </command>
+</epp>