diff --git a/javatests/google/registry/flows/domain/DomainInfoFlowTest.java b/javatests/google/registry/flows/domain/DomainInfoFlowTest.java
index 85d1e72c8..bbc4ea291 100644
--- a/javatests/google/registry/flows/domain/DomainInfoFlowTest.java
+++ b/javatests/google/registry/flows/domain/DomainInfoFlowTest.java
@@ -25,6 +25,7 @@ import static google.registry.testing.DatastoreHelper.persistActiveHost;
 import static google.registry.testing.DatastoreHelper.persistResource;
 import static google.registry.testing.EppExceptionSubject.assertAboutEppExceptions;
 import static google.registry.testing.JUnitBackports.assertThrows;
+import static google.registry.testing.TestDataHelper.updateSubstitutions;
 
 import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableMap;
@@ -62,6 +63,18 @@ import org.junit.Test;
 /** Unit tests for {@link DomainInfoFlow}. */
 public class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, DomainBase> {
 
+  /**
+   * The domain_info_fee.xml default substitutions common to most tests.
+   *
+   * <p>It doesn't set a default value to the COMMAND and PERIOD keys, because they are different in
+   * every test.
+   */
+  private static final ImmutableMap<String, String> SUBSTITUTION_BASE =
+      ImmutableMap.of(
+          "NAME", "example.tld",
+          "CURRENCY", "USD",
+          "UNIT", "y");
+
   private ContactResource registrant;
   private ContactResource contact;
   private HostResource host1;
@@ -130,9 +143,12 @@ public class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, Dom
     persistTestEntities("example.tld", inactive);
   }
 
-  private void doSuccessfulTest(String expectedXmlFilename, boolean inactive) throws Exception {
+  private void doSuccessfulTest(
+      String expectedXmlFilename, boolean inactive, ImmutableMap<String, String> substitutions)
+      throws Exception {
     assertTransactionalFlow(false);
-    String expected = loadFile(expectedXmlFilename, ImmutableMap.of("ROID", "2FF-TLD"));
+    String expected =
+        loadFile(expectedXmlFilename, updateSubstitutions(substitutions, "ROID", "2FF-TLD"));
     if (inactive) {
       expected = expected.replaceAll("\"ok\"", "\"inactive\"");
     }
@@ -141,6 +157,10 @@ public class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, Dom
     assertNoBillingEvents();
   }
 
+  private void doSuccessfulTest(String expectedXmlFilename, boolean inactive) throws Exception {
+    doSuccessfulTest(expectedXmlFilename, inactive, ImmutableMap.of());
+  }
+
   private void doSuccessfulTest(String expectedXmlFilename) throws Exception {
     persistTestEntities(false);
     doSuccessfulTest(expectedXmlFilename, false);
@@ -557,31 +577,72 @@ public class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, Dom
    */
   @Test
   public void testFeeExtension_createCommand() throws Exception {
-    setEppInput("domain_info_fee_create.xml", ImmutableMap.of("CURRENCY", "USD"));
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(
+            SUBSTITUTION_BASE,
+            "COMMAND", "create",
+            "PERIOD", "2"));
     persistTestEntities(false);
-    doSuccessfulTest("domain_info_fee_create_response.xml", false);
+    doSuccessfulTest(
+        "domain_info_fee_response.xml",
+        false,
+        ImmutableMap.of(
+            "COMMAND", "create",
+            "DESCRIPTION", "create",
+            "PERIOD", "2",
+            "FEE", "26.00"));
   }
 
   /** Test renew command. */
   @Test
   public void testFeeExtension_renewCommand() throws Exception {
-    setEppInput("domain_info_fee_renew.xml");
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(
+            SUBSTITUTION_BASE,
+            "COMMAND", "renew",
+            "PERIOD", "2"));
     persistTestEntities(false);
-    doSuccessfulTest("domain_info_fee_renew_response.xml", false);
+    doSuccessfulTest(
+        "domain_info_fee_response.xml",
+        false,
+        ImmutableMap.of(
+            "COMMAND", "renew",
+            "DESCRIPTION", "renew",
+            "PERIOD", "2",
+            "FEE", "22.00"));
   }
 
   /** Test transfer command. */
   @Test
   public void testFeeExtension_transferCommand() throws Exception {
-    setEppInput("domain_info_fee_transfer.xml");
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(
+            SUBSTITUTION_BASE,
+            "COMMAND", "transfer",
+            "PERIOD", "1"));
     persistTestEntities(false);
-    doSuccessfulTest("domain_info_fee_transfer_response.xml", false);
+    doSuccessfulTest(
+        "domain_info_fee_response.xml",
+        false,
+        ImmutableMap.of(
+            "COMMAND", "transfer",
+            "DESCRIPTION", "renew",
+            "PERIOD", "1",
+            "FEE", "11.00"));
   }
 
   /** Test restore command. */
   @Test
   public void testFeeExtension_restoreCommand() throws Exception {
-    setEppInput("domain_info_fee_restore.xml");
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(
+            SUBSTITUTION_BASE,
+            "COMMAND", "restore",
+            "PERIOD", "1"));
     persistTestEntities(false);
     doSuccessfulTest("domain_info_fee_restore_response.xml", false);
   }
@@ -590,34 +651,67 @@ public class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, Dom
   @Test
   public void testFeeExtension_createCommandPremium() throws Exception {
     createTld("example");
-    setEppInput("domain_info_fee_create_premium.xml");
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(
+            SUBSTITUTION_BASE,
+            "NAME", "rich.example",
+            "COMMAND", "create",
+            "PERIOD", "1"));
     persistTestEntities("rich.example", false);
-    doSuccessfulTest("domain_info_fee_create_premium_response.xml", false);
+    doSuccessfulTest(
+        "domain_info_fee_premium_response.xml",
+        false,
+        ImmutableMap.of("COMMAND", "create", "DESCRIPTION", "create"));
   }
 
   /** Test renew command on a premium label. */
   @Test
   public void testFeeExtension_renewCommandPremium() throws Exception {
     createTld("example");
-    setEppInput("domain_info_fee_renew_premium.xml");
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(
+            SUBSTITUTION_BASE,
+            "NAME", "rich.example",
+            "COMMAND", "renew",
+            "PERIOD", "1"));
     persistTestEntities("rich.example", false);
-    doSuccessfulTest("domain_info_fee_renew_premium_response.xml", false);
+    doSuccessfulTest(
+        "domain_info_fee_premium_response.xml",
+        false,
+        ImmutableMap.of("COMMAND", "renew", "DESCRIPTION", "renew"));
   }
 
   /** Test transfer command on a premium label. */
   @Test
   public void testFeeExtension_transferCommandPremium() throws Exception {
     createTld("example");
-    setEppInput("domain_info_fee_transfer_premium.xml");
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(
+            SUBSTITUTION_BASE,
+            "NAME", "rich.example",
+            "COMMAND", "transfer",
+            "PERIOD", "1"));
     persistTestEntities("rich.example", false);
-    doSuccessfulTest("domain_info_fee_transfer_premium_response.xml", false);
+    doSuccessfulTest(
+        "domain_info_fee_premium_response.xml",
+        false,
+        ImmutableMap.of("COMMAND", "transfer", "DESCRIPTION", "renew"));
   }
 
   /** Test restore command on a premium label. */
   @Test
   public void testFeeExtension_restoreCommandPremium() throws Exception {
     createTld("example");
-    setEppInput("domain_info_fee_restore_premium.xml");
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(
+            SUBSTITUTION_BASE,
+            "NAME", "rich.example",
+            "COMMAND", "restore",
+            "PERIOD", "1"));
     persistTestEntities("rich.example", false);
     doSuccessfulTest("domain_info_fee_restore_premium_response.xml", false);
   }
@@ -625,7 +719,13 @@ public class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, Dom
   /** Test setting the currency explicitly to a wrong value. */
   @Test
   public void testFeeExtension_wrongCurrency() {
-    setEppInput("domain_info_fee_create.xml", ImmutableMap.of("CURRENCY", "EUR"));
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(
+            SUBSTITUTION_BASE,
+            "COMMAND", "create",
+            "CURRENCY", "EUR",
+            "PERIOD", "1"));
     persistTestEntities(false);
     EppException thrown = assertThrows(CurrencyUnitMismatchException.class, this::runFlow);
     assertAboutEppExceptions().that(thrown).marshalsToXml();
@@ -633,7 +733,13 @@ public class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, Dom
 
   @Test
   public void testFeeExtension_unknownCurrency() {
-    setEppInput("domain_info_fee_create.xml", ImmutableMap.of("CURRENCY", "BAD"));
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(
+            SUBSTITUTION_BASE,
+            "COMMAND", "create",
+            "CURRENCY", "BAD",
+            "PERIOD", "1"));
     EppException thrown = assertThrows(UnknownCurrencyEppException.class, this::runFlow);
     assertAboutEppExceptions().that(thrown).marshalsToXml();
   }
@@ -641,7 +747,13 @@ public class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, Dom
   /** Test requesting a period that isn't in years. */
   @Test
   public void testFeeExtension_periodNotInYears() {
-    setEppInput("domain_info_fee_bad_period.xml");
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(
+            SUBSTITUTION_BASE,
+            "COMMAND", "create",
+            "PERIOD", "2",
+            "UNIT", "m"));
     persistTestEntities(false);
     EppException thrown = assertThrows(BadPeriodUnitException.class, this::runFlow);
     assertAboutEppExceptions().that(thrown).marshalsToXml();
@@ -668,7 +780,12 @@ public class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, Dom
   /** Test a restore for more than one year. */
   @Test
   public void testFeeExtension_multiyearRestore() {
-    setEppInput("domain_info_fee_multiyear_restore.xml");
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(
+            SUBSTITUTION_BASE,
+            "COMMAND", "restore",
+            "PERIOD", "2"));
     persistTestEntities(false);
     EppException thrown = assertThrows(RestoresAreAlwaysForOneYearException.class, this::runFlow);
     assertAboutEppExceptions().that(thrown).marshalsToXml();
@@ -677,7 +794,12 @@ public class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, Dom
   /** Test a transfer for more than one year. */
   @Test
   public void testFeeExtension_multiyearTransfer() {
-    setEppInput("domain_info_fee_multiyear_transfer.xml");
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(
+            SUBSTITUTION_BASE,
+            "COMMAND", "transfer",
+            "PERIOD", "2"));
     persistTestEntities(false);
     EppException thrown = assertThrows(TransfersAreAlwaysForOneYearException.class, this::runFlow);
     assertAboutEppExceptions().that(thrown).marshalsToXml();
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_fee_create.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee.xml
similarity index 71%
rename from javatests/google/registry/flows/domain/testdata/domain_info_fee_create.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_fee.xml
index 4887691aa..f743e7711 100644
--- a/javatests/google/registry/flows/domain/testdata/domain_info_fee_create.xml
+++ b/javatests/google/registry/flows/domain/testdata/domain_info_fee.xml
@@ -3,14 +3,14 @@
     <info>
       <domain:info
        xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name hosts="all">example.tld</domain:name>
+        <domain:name hosts="all">%NAME%</domain:name>
       </domain:info>
     </info>
     <extension>
       <fee:info xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
         <fee:currency>%CURRENCY%</fee:currency>
-        <fee:command>create</fee:command>
-        <fee:period unit="y">2</fee:period>
+        <fee:command>%COMMAND%</fee:command>
+        <fee:period unit="%UNIT%">%PERIOD%</fee:period>
       </fee:info>
     </extension>
     <clTRID>ABC-12345</clTRID>
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_fee_bad_period.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_bad_period.xml
deleted file mode 100644
index dcff208dc..000000000
--- a/javatests/google/registry/flows/domain/testdata/domain_info_fee_bad_period.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <info>
-      <domain:info
-       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name hosts="all">example.tld</domain:name>
-      </domain:info>
-    </info>
-    <extension>
-      <fee:info xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
-        <fee:currency>USD</fee:currency>
-        <fee:command>create</fee:command>
-        <fee:period unit="m">2</fee:period>
-      </fee:info>
-    </extension>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_fee_create_premium.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_create_premium.xml
deleted file mode 100644
index 9c6adb682..000000000
--- a/javatests/google/registry/flows/domain/testdata/domain_info_fee_create_premium.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <info>
-      <domain:info
-       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name hosts="all">rich.example</domain:name>
-      </domain:info>
-    </info>
-    <extension>
-      <fee:info xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
-        <fee:currency>USD</fee:currency>
-        <fee:command>create</fee:command>
-        <fee:period unit="y">1</fee:period>
-      </fee:info>
-    </extension>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_fee_create_premium_response.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_create_premium_response.xml
deleted file mode 100644
index 2f46c23f8..000000000
--- a/javatests/google/registry/flows/domain/testdata/domain_info_fee_create_premium_response.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <response>
-    <result code="1000">
-      <msg>Command completed successfully</msg>
-    </result>
-    <resData>
-      <domain:infData
-       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>rich.example</domain:name>
-        <domain:roid>%ROID%</domain:roid>
-        <domain:status s="ok"/>
-        <domain:registrant>jd1234</domain:registrant>
-        <domain:contact type="admin">sh8013</domain:contact>
-        <domain:contact type="tech">sh8013</domain:contact>
-        <domain:ns>
-          <domain:hostObj>ns1.example.tld</domain:hostObj>
-          <domain:hostObj>ns1.example.net</domain:hostObj>
-        </domain:ns>
-        <domain:host>ns1.example.tld</domain:host>
-        <domain:host>ns2.example.tld</domain:host>
-        <domain:clID>NewRegistrar</domain:clID>
-        <domain:crID>TheRegistrar</domain:crID>
-        <domain:crDate>1999-04-03T22:00:00.0Z</domain:crDate>
-        <domain:upID>NewRegistrar</domain:upID>
-        <domain:upDate>1999-12-03T09:00:00.0Z</domain:upDate>
-        <domain:exDate>2005-04-03T22:00:00.0Z</domain:exDate>
-        <domain:trDate>2000-04-08T09:00:00.0Z</domain:trDate>
-        <domain:authInfo>
-          <domain:pw>2fooBAR</domain:pw>
-        </domain:authInfo>
-      </domain:infData>
-    </resData>
-    <extension>
-      <fee:infData xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
-        <fee:currency>USD</fee:currency>
-        <fee:command>create</fee:command>
-        <fee:period unit="y">1</fee:period>
-        <fee:fee description="create">100.00</fee:fee>
-        <fee:class>premium</fee:class>
-      </fee:infData>
-    </extension>
-    <trID>
-      <clTRID>ABC-12345</clTRID>
-      <svTRID>server-trid</svTRID>
-    </trID>
-  </response>
-</epp>
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_fee_multiyear_restore.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_multiyear_restore.xml
deleted file mode 100644
index ce13a78d6..000000000
--- a/javatests/google/registry/flows/domain/testdata/domain_info_fee_multiyear_restore.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <info>
-      <domain:info
-       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name hosts="all">example.tld</domain:name>
-      </domain:info>
-    </info>
-    <extension>
-      <fee:info xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
-        <fee:currency>USD</fee:currency>
-        <fee:command>restore</fee:command>
-        <fee:period unit="y">2</fee:period>
-      </fee:info>
-    </extension>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_fee_multiyear_transfer.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_multiyear_transfer.xml
deleted file mode 100644
index fc7538fd1..000000000
--- a/javatests/google/registry/flows/domain/testdata/domain_info_fee_multiyear_transfer.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <info>
-      <domain:info
-       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name hosts="all">example.tld</domain:name>
-      </domain:info>
-    </info>
-    <extension>
-      <fee:info xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
-        <fee:currency>USD</fee:currency>
-        <fee:command>transfer</fee:command>
-        <fee:period unit="y">2</fee:period>
-      </fee:info>
-    </extension>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_fee_transfer_premium_response.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_premium_response.xml
similarity index 93%
rename from javatests/google/registry/flows/domain/testdata/domain_info_fee_transfer_premium_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_fee_premium_response.xml
index 30da5352b..5ed534d36 100644
--- a/javatests/google/registry/flows/domain/testdata/domain_info_fee_transfer_premium_response.xml
+++ b/javatests/google/registry/flows/domain/testdata/domain_info_fee_premium_response.xml
@@ -33,9 +33,9 @@
     <extension>
       <fee:infData xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
         <fee:currency>USD</fee:currency>
-        <fee:command>transfer</fee:command>
+        <fee:command>%COMMAND%</fee:command>
         <fee:period unit="y">1</fee:period>
-        <fee:fee description="renew">100.00</fee:fee>
+        <fee:fee description="%DESCRIPTION%">100.00</fee:fee>
         <fee:class>premium</fee:class>
       </fee:infData>
     </extension>
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_fee_renew.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_renew.xml
deleted file mode 100644
index 5dcdca427..000000000
--- a/javatests/google/registry/flows/domain/testdata/domain_info_fee_renew.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <info>
-      <domain:info
-       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name hosts="all">example.tld</domain:name>
-      </domain:info>
-    </info>
-    <extension>
-      <fee:info xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
-        <fee:currency>USD</fee:currency>
-        <fee:command>renew</fee:command>
-        <fee:period unit="y">2</fee:period>
-      </fee:info>
-    </extension>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_fee_renew_premium.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_renew_premium.xml
deleted file mode 100644
index 10fb44f6f..000000000
--- a/javatests/google/registry/flows/domain/testdata/domain_info_fee_renew_premium.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <info>
-      <domain:info
-       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name hosts="all">rich.example</domain:name>
-      </domain:info>
-    </info>
-    <extension>
-      <fee:info xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
-        <fee:currency>USD</fee:currency>
-        <fee:command>renew</fee:command>
-        <fee:period unit="y">1</fee:period>
-      </fee:info>
-    </extension>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_fee_renew_premium_response.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_renew_premium_response.xml
deleted file mode 100644
index 09d4e9924..000000000
--- a/javatests/google/registry/flows/domain/testdata/domain_info_fee_renew_premium_response.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <response>
-    <result code="1000">
-      <msg>Command completed successfully</msg>
-    </result>
-    <resData>
-      <domain:infData
-       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>rich.example</domain:name>
-        <domain:roid>%ROID%</domain:roid>
-        <domain:status s="ok"/>
-        <domain:registrant>jd1234</domain:registrant>
-        <domain:contact type="admin">sh8013</domain:contact>
-        <domain:contact type="tech">sh8013</domain:contact>
-        <domain:ns>
-          <domain:hostObj>ns1.example.tld</domain:hostObj>
-          <domain:hostObj>ns1.example.net</domain:hostObj>
-        </domain:ns>
-        <domain:host>ns1.example.tld</domain:host>
-        <domain:host>ns2.example.tld</domain:host>
-        <domain:clID>NewRegistrar</domain:clID>
-        <domain:crID>TheRegistrar</domain:crID>
-        <domain:crDate>1999-04-03T22:00:00.0Z</domain:crDate>
-        <domain:upID>NewRegistrar</domain:upID>
-        <domain:upDate>1999-12-03T09:00:00.0Z</domain:upDate>
-        <domain:exDate>2005-04-03T22:00:00.0Z</domain:exDate>
-        <domain:trDate>2000-04-08T09:00:00.0Z</domain:trDate>
-        <domain:authInfo>
-          <domain:pw>2fooBAR</domain:pw>
-        </domain:authInfo>
-      </domain:infData>
-    </resData>
-    <extension>
-      <fee:infData xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
-        <fee:currency>USD</fee:currency>
-        <fee:command>renew</fee:command>
-        <fee:period unit="y">1</fee:period>
-        <fee:fee description="renew">100.00</fee:fee>
-        <fee:class>premium</fee:class>
-      </fee:infData>
-    </extension>
-    <trID>
-      <clTRID>ABC-12345</clTRID>
-      <svTRID>server-trid</svTRID>
-    </trID>
-  </response>
-</epp>
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_fee_renew_response.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_renew_response.xml
deleted file mode 100644
index a2c9e9fd1..000000000
--- a/javatests/google/registry/flows/domain/testdata/domain_info_fee_renew_response.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <response>
-    <result code="1000">
-      <msg>Command completed successfully</msg>
-    </result>
-    <resData>
-      <domain:infData
-       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example.tld</domain:name>
-        <domain:roid>%ROID%</domain:roid>
-        <domain:status s="ok"/>
-        <domain:registrant>jd1234</domain:registrant>
-        <domain:contact type="admin">sh8013</domain:contact>
-        <domain:contact type="tech">sh8013</domain:contact>
-        <domain:ns>
-          <domain:hostObj>ns1.example.tld</domain:hostObj>
-          <domain:hostObj>ns1.example.net</domain:hostObj>
-        </domain:ns>
-        <domain:host>ns1.example.tld</domain:host>
-        <domain:host>ns2.example.tld</domain:host>
-        <domain:clID>NewRegistrar</domain:clID>
-        <domain:crID>TheRegistrar</domain:crID>
-        <domain:crDate>1999-04-03T22:00:00.0Z</domain:crDate>
-        <domain:upID>NewRegistrar</domain:upID>
-        <domain:upDate>1999-12-03T09:00:00.0Z</domain:upDate>
-        <domain:exDate>2005-04-03T22:00:00.0Z</domain:exDate>
-        <domain:trDate>2000-04-08T09:00:00.0Z</domain:trDate>
-        <domain:authInfo>
-          <domain:pw>2fooBAR</domain:pw>
-        </domain:authInfo>
-      </domain:infData>
-    </resData>
-    <extension>
-      <fee:infData xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
-        <fee:currency>USD</fee:currency>
-        <fee:command>renew</fee:command>
-        <fee:period unit="y">2</fee:period>
-        <fee:fee description="renew">22.00</fee:fee>
-      </fee:infData>
-    </extension>
-    <trID>
-      <clTRID>ABC-12345</clTRID>
-      <svTRID>server-trid</svTRID>
-    </trID>
-  </response>
-</epp>
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_fee_create_response.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_response.xml
similarity index 91%
rename from javatests/google/registry/flows/domain/testdata/domain_info_fee_create_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_fee_response.xml
index 2d3117af4..f6091f2da 100644
--- a/javatests/google/registry/flows/domain/testdata/domain_info_fee_create_response.xml
+++ b/javatests/google/registry/flows/domain/testdata/domain_info_fee_response.xml
@@ -33,9 +33,9 @@
     <extension>
       <fee:infData xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
         <fee:currency>USD</fee:currency>
-        <fee:command>create</fee:command>
-        <fee:period unit="y">2</fee:period>
-        <fee:fee description="create">26.00</fee:fee>
+        <fee:command>%COMMAND%</fee:command>
+        <fee:period unit="y">%PERIOD%</fee:period>
+        <fee:fee description="%DESCRIPTION%">%FEE%</fee:fee>
       </fee:infData>
     </extension>
     <trID>
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_fee_restore.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_restore.xml
deleted file mode 100644
index 7e60b3b5b..000000000
--- a/javatests/google/registry/flows/domain/testdata/domain_info_fee_restore.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <info>
-      <domain:info
-       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name hosts="all">example.tld</domain:name>
-      </domain:info>
-    </info>
-    <extension>
-      <fee:info xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
-        <fee:currency>USD</fee:currency>
-        <fee:command>restore</fee:command>
-        <fee:period unit="y">1</fee:period>
-      </fee:info>
-    </extension>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_fee_restore_premium.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_restore_premium.xml
deleted file mode 100644
index 4c724644d..000000000
--- a/javatests/google/registry/flows/domain/testdata/domain_info_fee_restore_premium.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <info>
-      <domain:info
-       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name hosts="all">rich.example</domain:name>
-      </domain:info>
-    </info>
-    <extension>
-      <fee:info xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
-        <fee:currency>USD</fee:currency>
-        <fee:command>restore</fee:command>
-        <fee:period unit="y">1</fee:period>
-      </fee:info>
-    </extension>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_fee_transfer.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_transfer.xml
deleted file mode 100644
index d68f8a3fa..000000000
--- a/javatests/google/registry/flows/domain/testdata/domain_info_fee_transfer.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <info>
-      <domain:info
-       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name hosts="all">example.tld</domain:name>
-      </domain:info>
-    </info>
-    <extension>
-      <fee:info xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
-        <fee:currency>USD</fee:currency>
-        <fee:command>transfer</fee:command>
-        <fee:period unit="y">1</fee:period>
-      </fee:info>
-    </extension>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_fee_transfer_premium.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_transfer_premium.xml
deleted file mode 100644
index 000798d4d..000000000
--- a/javatests/google/registry/flows/domain/testdata/domain_info_fee_transfer_premium.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <info>
-      <domain:info
-       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name hosts="all">rich.example</domain:name>
-      </domain:info>
-    </info>
-    <extension>
-      <fee:info xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
-        <fee:currency>USD</fee:currency>
-        <fee:command>transfer</fee:command>
-        <fee:period unit="y">1</fee:period>
-      </fee:info>
-    </extension>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_fee_transfer_response.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_transfer_response.xml
deleted file mode 100644
index 731c7ce21..000000000
--- a/javatests/google/registry/flows/domain/testdata/domain_info_fee_transfer_response.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <response>
-    <result code="1000">
-      <msg>Command completed successfully</msg>
-    </result>
-    <resData>
-      <domain:infData
-       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example.tld</domain:name>
-        <domain:roid>%ROID%</domain:roid>
-        <domain:status s="ok"/>
-        <domain:registrant>jd1234</domain:registrant>
-        <domain:contact type="admin">sh8013</domain:contact>
-        <domain:contact type="tech">sh8013</domain:contact>
-        <domain:ns>
-          <domain:hostObj>ns1.example.tld</domain:hostObj>
-          <domain:hostObj>ns1.example.net</domain:hostObj>
-        </domain:ns>
-        <domain:host>ns1.example.tld</domain:host>
-        <domain:host>ns2.example.tld</domain:host>
-        <domain:clID>NewRegistrar</domain:clID>
-        <domain:crID>TheRegistrar</domain:crID>
-        <domain:crDate>1999-04-03T22:00:00.0Z</domain:crDate>
-        <domain:upID>NewRegistrar</domain:upID>
-        <domain:upDate>1999-12-03T09:00:00.0Z</domain:upDate>
-        <domain:exDate>2005-04-03T22:00:00.0Z</domain:exDate>
-        <domain:trDate>2000-04-08T09:00:00.0Z</domain:trDate>
-        <domain:authInfo>
-          <domain:pw>2fooBAR</domain:pw>
-        </domain:authInfo>
-      </domain:infData>
-    </resData>
-    <extension>
-      <fee:infData xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
-        <fee:currency>USD</fee:currency>
-        <fee:command>transfer</fee:command>
-        <fee:period unit="y">1</fee:period>
-        <fee:fee description="renew">11.00</fee:fee>
-      </fee:infData>
-    </extension>
-    <trID>
-      <clTRID>ABC-12345</clTRID>
-      <svTRID>server-trid</svTRID>
-    </trID>
-  </response>
-</epp>