diff --git a/javatests/google/registry/flows/dotapp/testdata/application_create_no_flags.xml b/javatests/google/registry/flows/dotapp/testdata/application_create_no_flags.xml
deleted file mode 100644
index 6e444dcb5..000000000
--- a/javatests/google/registry/flows/dotapp/testdata/application_create_no_flags.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <create>
-      <domain:create xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example.tld</domain:name>
-        <domain:period unit="y">1</domain:period>
-        <domain:ns>
-          <domain:hostObj>ns1.example.net</domain:hostObj>
-          <domain:hostObj>ns2.example.net</domain:hostObj>
-        </domain:ns>
-        <domain:registrant>jd1234</domain:registrant>
-        <domain:contact type="admin">sh8013</domain:contact>
-        <domain:contact type="tech">sh8013</domain:contact>
-        <domain:authInfo>
-          <domain:pw>2fooBAR</domain:pw>
-        </domain:authInfo>
-      </domain:create>
-    </create>
-    <extension>
-      <launch:create
-       xmlns:launch="urn:ietf:params:xml:ns:launch-1.0">
-        <launch:phase name="landrush">sunrise</launch:phase>
-     </launch:create>
-    </extension>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
diff --git a/javatests/google/registry/flows/dotapp/testdata/application_create_one_flag.xml b/javatests/google/registry/flows/dotapp/testdata/application_create_one_flag.xml
deleted file mode 100644
index 721e5cfe6..000000000
--- a/javatests/google/registry/flows/dotapp/testdata/application_create_one_flag.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <create>
-      <domain:create xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example.tld</domain:name>
-        <domain:period unit="y">1</domain:period>
-        <domain:ns>
-          <domain:hostObj>ns1.example.net</domain:hostObj>
-          <domain:hostObj>ns2.example.net</domain:hostObj>
-        </domain:ns>
-        <domain:registrant>jd1234</domain:registrant>
-        <domain:contact type="admin">sh8013</domain:contact>
-        <domain:contact type="tech">sh8013</domain:contact>
-        <domain:authInfo>
-          <domain:pw>2fooBAR</domain:pw>
-        </domain:authInfo>
-      </domain:create>
-    </create>
-    <extension>
-      <flags:create xmlns:flags="urn:google:params:xml:ns:flags-0.1">
-        <flags:flag>%FLAG%</flags:flag>
-      </flags:create>
-      <launch:create
-       xmlns:launch="urn:ietf:params:xml:ns:launch-1.0">
-        <launch:phase name="landrush">sunrise</launch:phase>
-      </launch:create>
-    </extension>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
diff --git a/javatests/google/registry/flows/dotapp/testdata/application_create_two_flags.xml b/javatests/google/registry/flows/dotapp/testdata/application_create_two_flags.xml
deleted file mode 100644
index 15f36388e..000000000
--- a/javatests/google/registry/flows/dotapp/testdata/application_create_two_flags.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <create>
-      <domain:create xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example.tld</domain:name>
-        <domain:period unit="y">1</domain:period>
-        <domain:ns>
-          <domain:hostObj>ns1.example.net</domain:hostObj>
-          <domain:hostObj>ns2.example.net</domain:hostObj>
-        </domain:ns>
-        <domain:registrant>jd1234</domain:registrant>
-        <domain:contact type="admin">sh8013</domain:contact>
-        <domain:contact type="tech">sh8013</domain:contact>
-        <domain:authInfo>
-          <domain:pw>2fooBAR</domain:pw>
-        </domain:authInfo>
-      </domain:create>
-    </create>
-    <extension>
-      <flags:create xmlns:flags="urn:google:params:xml:ns:flags-0.1">
-        <flags:flag>%FLAG1%</flags:flag>
-        <flags:flag>%FLAG2%</flags:flag>
-      </flags:create>
-      <launch:create
-       xmlns:launch="urn:ietf:params:xml:ns:launch-1.0">
-        <launch:phase name="landrush">sunrise</launch:phase>
-      </launch:create>
-    </extension>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
diff --git a/javatests/google/registry/flows/dotapp/testdata/domain_create_no_flags.xml b/javatests/google/registry/flows/dotapp/testdata/domain_create_no_flags.xml
deleted file mode 100644
index 34901f3cb..000000000
--- a/javatests/google/registry/flows/dotapp/testdata/domain_create_no_flags.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <create>
-      <domain:create xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example.tld</domain:name>
-        <domain:period unit="y">1</domain:period>
-        <domain:ns>
-          <domain:hostObj>ns1.example.net</domain:hostObj>
-          <domain:hostObj>ns2.example.net</domain:hostObj>
-        </domain:ns>
-        <domain:registrant>jd1234</domain:registrant>
-        <domain:contact type="admin">sh8013</domain:contact>
-        <domain:contact type="tech">sh8013</domain:contact>
-        <domain:authInfo>
-          <domain:pw>2fooBAR</domain:pw>
-        </domain:authInfo>
-      </domain:create>
-    </create>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
diff --git a/javatests/google/registry/flows/dotapp/testdata/domain_create_one_flag.xml b/javatests/google/registry/flows/dotapp/testdata/domain_create_one_flag.xml
deleted file mode 100644
index 4ca90ca72..000000000
--- a/javatests/google/registry/flows/dotapp/testdata/domain_create_one_flag.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <create>
-      <domain:create xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example.tld</domain:name>
-        <domain:period unit="y">1</domain:period>
-        <domain:ns>
-          <domain:hostObj>ns1.example.net</domain:hostObj>
-          <domain:hostObj>ns2.example.net</domain:hostObj>
-        </domain:ns>
-        <domain:registrant>jd1234</domain:registrant>
-        <domain:contact type="admin">sh8013</domain:contact>
-        <domain:contact type="tech">sh8013</domain:contact>
-        <domain:authInfo>
-          <domain:pw>2fooBAR</domain:pw>
-        </domain:authInfo>
-      </domain:create>
-    </create>
-    <extension>
-      <flags:create xmlns:flags="urn:google:params:xml:ns:flags-0.1">
-        <flags:flag>%FLAG%</flags:flag>
-      </flags:create>
-    </extension>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
diff --git a/javatests/google/registry/flows/dotapp/testdata/domain_create_two_flags.xml b/javatests/google/registry/flows/dotapp/testdata/domain_create_two_flags.xml
deleted file mode 100644
index 3ef52cef0..000000000
--- a/javatests/google/registry/flows/dotapp/testdata/domain_create_two_flags.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <create>
-      <domain:create xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example.tld</domain:name>
-        <domain:period unit="y">1</domain:period>
-        <domain:ns>
-          <domain:hostObj>ns1.example.net</domain:hostObj>
-          <domain:hostObj>ns2.example.net</domain:hostObj>
-        </domain:ns>
-        <domain:registrant>jd1234</domain:registrant>
-        <domain:contact type="admin">sh8013</domain:contact>
-        <domain:contact type="tech">sh8013</domain:contact>
-        <domain:authInfo>
-          <domain:pw>2fooBAR</domain:pw>
-        </domain:authInfo>
-      </domain:create>
-    </create>
-    <extension>
-      <flags:create xmlns:flags="urn:google:params:xml:ns:flags-0.1">
-        <flags:flag>%FLAG1%</flags:flag>
-        <flags:flag>%FLAG2%</flags:flag>
-      </flags:create>
-    </extension>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
diff --git a/javatests/google/registry/flows/dotapp/testdata/domain_delete.xml b/javatests/google/registry/flows/dotapp/testdata/domain_delete.xml
deleted file mode 100644
index 6061c0a70..000000000
--- a/javatests/google/registry/flows/dotapp/testdata/domain_delete.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <delete>
-      <domain:delete
-       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example.app</domain:name>
-      </domain:delete>
-    </delete>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
diff --git a/javatests/google/registry/flows/dotapp/testdata/domain_renew.xml b/javatests/google/registry/flows/dotapp/testdata/domain_renew.xml
deleted file mode 100644
index fcde98449..000000000
--- a/javatests/google/registry/flows/dotapp/testdata/domain_renew.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <renew>
-      <domain:renew
-       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example.tld</domain:name>
-        <domain:curExpDate>2000-04-03</domain:curExpDate>
-        <domain:period unit="y">5</domain:period>
-      </domain:renew>
-    </renew>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
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
deleted file mode 100644
index b4d56ca79..000000000
--- a/javatests/google/registry/flows/dotapp/testdata/domain_update_add_one_flag.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<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
deleted file mode 100644
index 7dbebfd78..000000000
--- a/javatests/google/registry/flows/dotapp/testdata/domain_update_add_one_flag_remove_one_flag.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<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_two_flags.xml b/javatests/google/registry/flows/dotapp/testdata/domain_update_add_two_flags.xml
deleted file mode 100644
index 2b3194514..000000000
--- a/javatests/google/registry/flows/dotapp/testdata/domain_update_add_two_flags.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<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
deleted file mode 100644
index a84c11e2d..000000000
--- a/javatests/google/registry/flows/dotapp/testdata/domain_update_remove_one_flag.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<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_restore_request.xml b/javatests/google/registry/flows/dotapp/testdata/domain_update_restore_request.xml
deleted file mode 100644
index 124bc0b89..000000000
--- a/javatests/google/registry/flows/dotapp/testdata/domain_update_restore_request.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<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:chg/>
-      </domain:update>
-    </update>
-    <extension>
-      <rgp:update xmlns:rgp="urn:ietf:params:xml:ns:rgp-1.0">
-        <rgp:restore op="request"/>
-      </rgp:update>
-    </extension>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>