diff --git a/java/google/registry/tools/server/VerifyOteAction.java b/java/google/registry/tools/server/VerifyOteAction.java
index 5f3eaac0f..b49db2487 100644
--- a/java/google/registry/tools/server/VerifyOteAction.java
+++ b/java/google/registry/tools/server/VerifyOteAction.java
@@ -146,14 +146,15 @@ public class VerifyOteAction implements Runnable, JsonAction {
     CONTACT_UPDATES(0, equalTo(Type.CONTACT_UPDATE)),
     DOMAIN_APPLICATION_CREATES(0, equalTo(Type.DOMAIN_APPLICATION_CREATE)),
     DOMAIN_APPLICATION_CREATES_LANDRUSH(
-        1, equalTo(Type.DOMAIN_APPLICATION_CREATE), IS_SUNRISE.negate()),
-    DOMAIN_APPLICATION_CREATES_SUNRISE(1, equalTo(Type.DOMAIN_APPLICATION_CREATE), IS_SUNRISE),
-    DOMAIN_APPLICATION_DELETES(2, equalTo(Type.DOMAIN_APPLICATION_DELETE)),
-    DOMAIN_APPLICATION_UPDATES(2, equalTo(Type.DOMAIN_APPLICATION_UPDATE)),
+        0, equalTo(Type.DOMAIN_APPLICATION_CREATE), IS_SUNRISE.negate()),
+    DOMAIN_APPLICATION_CREATES_SUNRISE(0, equalTo(Type.DOMAIN_APPLICATION_CREATE), IS_SUNRISE),
+    DOMAIN_APPLICATION_DELETES(0, equalTo(Type.DOMAIN_APPLICATION_DELETE)),
+    DOMAIN_APPLICATION_UPDATES(0, equalTo(Type.DOMAIN_APPLICATION_UPDATE)),
     DOMAIN_AUTORENEWS(0, equalTo(Type.DOMAIN_AUTORENEW)),
     DOMAIN_CREATES(0, equalTo(Type.DOMAIN_CREATE)),
     DOMAIN_CREATES_ASCII(1, equalTo(Type.DOMAIN_CREATE), IS_IDN.negate()),
     DOMAIN_CREATES_IDN(1, equalTo(Type.DOMAIN_CREATE), IS_IDN),
+    DOMAIN_CREATES_START_DATE_SUNRISE(1, equalTo(Type.DOMAIN_CREATE), IS_SUNRISE),
     DOMAIN_CREATES_WITH_CLAIMS_NOTICE(1, equalTo(Type.DOMAIN_CREATE), HAS_CLAIMS_NOTICE),
     DOMAIN_CREATES_WITH_FEE(
         1,
diff --git a/javatests/google/registry/tools/server/VerifyOteActionTest.java b/javatests/google/registry/tools/server/VerifyOteActionTest.java
index 5515d857f..d9b513629 100644
--- a/javatests/google/registry/tools/server/VerifyOteActionTest.java
+++ b/javatests/google/registry/tools/server/VerifyOteActionTest.java
@@ -47,39 +47,9 @@ public class VerifyOteActionTest {
     persistResource(
         new HistoryEntry.Builder()
             .setClientId("blobio-1")
-            .setType(Type.DOMAIN_APPLICATION_CREATE)
-            .setXmlBytes(ToolsTestData.loadBytes("domain_create_complete.xml").read())
-            .build());
-    persistResource(
-        new HistoryEntry.Builder()
-            .setClientId("blobio-1")
-            .setType(Type.DOMAIN_APPLICATION_CREATE)
+            .setType(Type.DOMAIN_CREATE)
             .setXmlBytes(ToolsTestData.loadBytes("domain_create_sunrise.xml").read())
             .build());
-    persistResource(
-        new HistoryEntry.Builder()
-            .setClientId("blobio-1")
-            .setType(Type.DOMAIN_APPLICATION_DELETE)
-            .setXmlBytes(ToolsTestData.loadBytes("domain_delete.xml").read())
-            .build());
-    persistResource(
-        new HistoryEntry.Builder()
-            .setClientId("blobio-2")
-            .setType(Type.DOMAIN_APPLICATION_DELETE)
-            .setXmlBytes(ToolsTestData.loadBytes("domain_delete.xml").read())
-            .build());
-    persistResource(
-        new HistoryEntry.Builder()
-            .setClientId("blobio-1")
-            .setType(Type.DOMAIN_APPLICATION_UPDATE)
-            .setXmlBytes(ToolsTestData.loadBytes("domain_update_complete.xml").read())
-            .build());
-    persistResource(
-        new HistoryEntry.Builder()
-            .setClientId("blobio-2")
-            .setType(Type.DOMAIN_APPLICATION_UPDATE)
-            .setXmlBytes(ToolsTestData.loadBytes("domain_update_complete.xml").read())
-            .build());
     persistResource(
         new HistoryEntry.Builder()
             .setClientId("blobio-1")
@@ -181,7 +151,7 @@ public class VerifyOteActionTest {
 
     for (Entry<String, Object> registrar : response.entrySet()) {
       assertThat(registrar.getKey()).matches("blobio");
-      assertThat(registrar.getValue().toString()).containsMatch("Reqs passed: 19/19");
+      assertThat(registrar.getValue().toString()).containsMatch("Reqs passed: 16/16");
       assertThat(registrar.getValue().toString()).containsMatch("Overall: PASS");
     }
   }
@@ -195,12 +165,8 @@ public class VerifyOteActionTest {
     for (Entry<String, Object> registrar : response.entrySet()) {
       assertThat(registrar.getKey()).matches("blobio");
       String expectedOteStatus =
-          "domain application creates landrush: 1\n"
-              + "domain application creates sunrise: 1\n"
-              + "domain application deletes: 2\n"
-              + "domain application updates: 2\n"
-              + ".*"
-              + "domain creates idn: 1\n"
+          "domain creates idn: 1\n"
+              + "domain creates start date sunrise: 1\n"
               + "domain creates with claims notice: 1\n"
               + "domain creates with fee: 1\n"
               + "domain creates with sec dns: 1\n"
@@ -219,7 +185,7 @@ public class VerifyOteActionTest {
               + "host deletes: 1\n"
               + "host updates: 1\n"
               + ".*"
-              + "Requirements passed: 19/19\n"
+              + "Requirements passed: 16/16\n"
               + "Overall OT&E status: PASS\n";
       Pattern expectedOteStatusPattern = Pattern.compile(expectedOteStatus, Pattern.DOTALL);
       assertThat(registrar.getValue().toString()).containsMatch(expectedOteStatusPattern);
@@ -239,12 +205,8 @@ public class VerifyOteActionTest {
       String oteStatus = registrar.getValue().toString();
 
       String expectedOteStatus =
-          "domain application creates landrush: 1\n"
-              + "domain application creates sunrise: 1\n"
-              + "domain application deletes: 2\n"
-              + "domain application updates: 2\n"
-              + ".*"
-              + "domain creates idn: 1\n"
+          "domain creates idn: 1\n"
+              + "domain creates start date sunrise: 1\n"
               + "domain creates with claims notice: 1\n"
               + "domain creates with fee: 1\n"
               + "domain creates with sec dns: 1\n"
@@ -263,7 +225,7 @@ public class VerifyOteActionTest {
               + "host deletes: 0\n"
               + "host updates: 1\n"
               + ".*"
-              + "Requirements passed: 18/19\n"
+              + "Requirements passed: 15/16\n"
               + "Overall OT&E status: FAIL\n";
       Pattern expectedOteStatusPattern = Pattern.compile(expectedOteStatus, Pattern.DOTALL);
       assertThat(oteStatus).containsMatch(expectedOteStatusPattern);
diff --git a/javatests/google/registry/tools/server/testdata/domain_create_sunrise.xml b/javatests/google/registry/tools/server/testdata/domain_create_sunrise.xml
index ddfac90ca..bc6080f69 100644
--- a/javatests/google/registry/tools/server/testdata/domain_create_sunrise.xml
+++ b/javatests/google/registry/tools/server/testdata/domain_create_sunrise.xml
@@ -19,8 +19,7 @@
     </create>
     <extension>
       <launch:create
-          xmlns:launch="urn:ietf:params:xml:ns:launch-1.0"
-          type="application">
+          xmlns:launch="urn:ietf:params:xml:ns:launch-1.0">
         <launch:phase>sunrise</launch:phase>
         <smd:signedMark xmlns:smd="urn:ietf:params:xml:ns:signedMark-1.0" id="signedMark">
           <smd:id>1-2</smd:id>