diff --git a/javatests/google/registry/rdap/testdata/rdap_domain.json b/javatests/google/registry/rdap/testdata/rdap_domain.json
index b1310deac..6bf8f2050 100644
--- a/javatests/google/registry/rdap/testdata/rdap_domain.json
+++ b/javatests/google/registry/rdap/testdata/rdap_domain.json
@@ -96,7 +96,7 @@
                 ]
               ],
               ["tel", {"type":["voice"]}, "uri", "tel:+1.2223334444"],
-              ["email", {}, "text", "new.registrar@example.com"]
+              ["email", {}, "text", "the.registrar@example.com"]
             ]
           ],
           "publicIds" : [
@@ -183,7 +183,7 @@
                 ]
               ],
               ["tel", {"type":["voice"]}, "uri", "tel:+1.2223334444"],
-              ["email", {}, "text", "new.registrar@example.com"]
+              ["email", {}, "text", "the.registrar@example.com"]
             ]
           ],
           "publicIds" : [
diff --git a/javatests/google/registry/rdap/testdata/rdap_domain_cat2.json b/javatests/google/registry/rdap/testdata/rdap_domain_cat2.json
index 3bfa1e8fe..a27d0c80b 100644
--- a/javatests/google/registry/rdap/testdata/rdap_domain_cat2.json
+++ b/javatests/google/registry/rdap/testdata/rdap_domain_cat2.json
@@ -96,7 +96,7 @@
                 ]
               ],
               ["tel", {"type":["voice"]}, "uri", "tel:+1.2223334444"],
-              ["email", {}, "text", "new.registrar@example.com"]
+              ["email", {}, "text", "the.registrar@example.com"]
             ]
           ],
           "publicIds" : [
@@ -183,7 +183,7 @@
                 ]
               ],
               ["tel", {"type":["voice"]}, "uri", "tel:+1.2223334444"],
-              ["email", {}, "text", "new.registrar@example.com"]
+              ["email", {}, "text", "the.registrar@example.com"]
             ]
           ],
           "publicIds" : [
diff --git a/javatests/google/registry/rdap/testdata/rdap_domain_deleted.json b/javatests/google/registry/rdap/testdata/rdap_domain_deleted.json
index 0eec0690c..beac54c36 100644
--- a/javatests/google/registry/rdap/testdata/rdap_domain_deleted.json
+++ b/javatests/google/registry/rdap/testdata/rdap_domain_deleted.json
@@ -106,7 +106,7 @@
                 ]
               ],
               ["tel", {"type":["voice"]}, "uri", "tel:+1.2223334444"],
-              ["email", {}, "text", "new.registrar@example.com"]
+              ["email", {}, "text", "the.registrar@example.com"]
             ]
           ],
           "publicIds" : [
@@ -192,7 +192,7 @@
                 ]
               ],
               ["tel", {"type":["voice"]}, "uri", "tel:+1.2223334444"],
-              ["email", {}, "text", "new.registrar@example.com"]
+              ["email", {}, "text", "the.registrar@example.com"]
             ]
           ],
           "publicIds" : [
diff --git a/javatests/google/registry/rdap/testdata/rdap_domain_no_contacts.json b/javatests/google/registry/rdap/testdata/rdap_domain_no_contacts.json
index 00c0164a4..207c3a441 100644
--- a/javatests/google/registry/rdap/testdata/rdap_domain_no_contacts.json
+++ b/javatests/google/registry/rdap/testdata/rdap_domain_no_contacts.json
@@ -98,7 +98,7 @@
                 ]
               ],
               ["tel", {"type":["voice"]}, "uri", "tel:+1.2223334444"],
-              ["email", {}, "text", "new.registrar@example.com"]
+              ["email", {}, "text", "the.registrar@example.com"]
             ]
           ],
           "publicIds" : [
@@ -185,7 +185,7 @@
                 ]
               ],
               ["tel", {"type":["voice"]}, "uri", "tel:+1.2223334444"],
-              ["email", {}, "text", "new.registrar@example.com"]
+              ["email", {}, "text", "the.registrar@example.com"]
             ]
           ],
           "publicIds" : [
diff --git a/javatests/google/registry/rdap/testdata/rdap_domain_no_contacts_with_remark.json b/javatests/google/registry/rdap/testdata/rdap_domain_no_contacts_with_remark.json
index 5a8018592..c9bfb5441 100644
--- a/javatests/google/registry/rdap/testdata/rdap_domain_no_contacts_with_remark.json
+++ b/javatests/google/registry/rdap/testdata/rdap_domain_no_contacts_with_remark.json
@@ -98,7 +98,7 @@
                 ]
               ],
               ["tel", {"type":["voice"]}, "uri", "tel:+1.2223334444"],
-              ["email", {}, "text", "new.registrar@example.com"]
+              ["email", {}, "text", "the.registrar@example.com"]
             ]
           ],
           "publicIds" : [
@@ -185,7 +185,7 @@
                 ]
               ],
               ["tel", {"type":["voice"]}, "uri", "tel:+1.2223334444"],
-              ["email", {}, "text", "new.registrar@example.com"]
+              ["email", {}, "text", "the.registrar@example.com"]
             ]
           ],
           "publicIds" : [
diff --git a/javatests/google/registry/rdap/testdata/rdap_domain_unicode.json b/javatests/google/registry/rdap/testdata/rdap_domain_unicode.json
index 9e796f416..d033aff45 100644
--- a/javatests/google/registry/rdap/testdata/rdap_domain_unicode.json
+++ b/javatests/google/registry/rdap/testdata/rdap_domain_unicode.json
@@ -99,7 +99,7 @@
                 ]
               ],
               ["tel", {"type":["voice"]}, "uri", "tel:+1.2223334444"],
-              ["email", {}, "text", "new.registrar@example.com"]
+              ["email", {}, "text", "the.registrar@example.com"]
             ]
           ],
           "publicIds" : [
@@ -188,7 +188,7 @@
                 ]
               ],
               ["tel", {"type":["voice"]}, "uri", "tel:+1.2223334444"],
-              ["email", {}, "text", "new.registrar@example.com"]
+              ["email", {}, "text", "the.registrar@example.com"]
             ]
           ],
           "publicIds" : [
diff --git a/javatests/google/registry/rdap/testdata/rdap_domain_unicode_no_contacts_with_remark.json b/javatests/google/registry/rdap/testdata/rdap_domain_unicode_no_contacts_with_remark.json
index 9cc874db4..f7e809bed 100644
--- a/javatests/google/registry/rdap/testdata/rdap_domain_unicode_no_contacts_with_remark.json
+++ b/javatests/google/registry/rdap/testdata/rdap_domain_unicode_no_contacts_with_remark.json
@@ -100,7 +100,7 @@
                 ]
               ],
               ["tel", {"type":["voice"]}, "uri", "tel:+1.2223334444"],
-              ["email", {}, "text", "new.registrar@example.com"]
+              ["email", {}, "text", "the.registrar@example.com"]
             ]
           ],
           "publicIds" : [
@@ -188,7 +188,7 @@
                 ]
               ],
               ["tel", {"type":["voice"]}, "uri", "tel:+1.2223334444"],
-              ["email", {}, "text", "new.registrar@example.com"]
+              ["email", {}, "text", "the.registrar@example.com"]
             ]
           ],
           "publicIds" : [
diff --git a/javatests/google/registry/rdap/testdata/rdap_host.json b/javatests/google/registry/rdap/testdata/rdap_host.json
index 0e63df24c..d25c0c653 100644
--- a/javatests/google/registry/rdap/testdata/rdap_host.json
+++ b/javatests/google/registry/rdap/testdata/rdap_host.json
@@ -66,7 +66,7 @@
             "11211",
             "United States"]],
           ["tel", {"type" : ["voice"]}, "uri", "tel:+1.2223334444"],
-          ["email", {}, "text", "new.registrar@example.com"]
+          ["email", {}, "text", "the.registrar@example.com"]
         ]
       ],
       "remarks": [
diff --git a/javatests/google/registry/rdap/testdata/rdap_host_external.json b/javatests/google/registry/rdap/testdata/rdap_host_external.json
index 775355ad5..8c68ee867 100644
--- a/javatests/google/registry/rdap/testdata/rdap_host_external.json
+++ b/javatests/google/registry/rdap/testdata/rdap_host_external.json
@@ -61,7 +61,7 @@
             "11211",
             "United States"]],
           ["tel", {"type" : ["voice"]}, "uri", "tel:+1.2223334444"],
-          ["email", {}, "text", "new.registrar@example.com"]
+          ["email", {}, "text", "the.registrar@example.com"]
         ]
       ],
       "remarks": [
diff --git a/javatests/google/registry/rdap/testdata/rdap_host_linked.json b/javatests/google/registry/rdap/testdata/rdap_host_linked.json
index 40ef93d65..19e4d7f29 100644
--- a/javatests/google/registry/rdap/testdata/rdap_host_linked.json
+++ b/javatests/google/registry/rdap/testdata/rdap_host_linked.json
@@ -67,7 +67,7 @@
             "11211",
             "United States"]],
           ["tel", {"type" : ["voice"]}, "uri", "tel:+1.2223334444"],
-          ["email", {}, "text", "new.registrar@example.com"]
+          ["email", {}, "text", "the.registrar@example.com"]
         ]
       ],
       "remarks": [
diff --git a/javatests/google/registry/rdap/testdata/rdap_host_unicode.json b/javatests/google/registry/rdap/testdata/rdap_host_unicode.json
index bc4eb03cf..07f90a5b5 100644
--- a/javatests/google/registry/rdap/testdata/rdap_host_unicode.json
+++ b/javatests/google/registry/rdap/testdata/rdap_host_unicode.json
@@ -67,7 +67,7 @@
             "11211",
             "United States"]],
           ["tel", {"type" : ["voice"]}, "uri", "tel:+1.2223334444"],
-          ["email", {}, "text", "new.registrar@example.com"]
+          ["email", {}, "text", "the.registrar@example.com"]
         ]
       ],
       "remarks": [
diff --git a/javatests/google/registry/rdap/testdata/rdap_multiple_hosts.json b/javatests/google/registry/rdap/testdata/rdap_multiple_hosts.json
index 9d2f81d8d..a7ef85797 100644
--- a/javatests/google/registry/rdap/testdata/rdap_multiple_hosts.json
+++ b/javatests/google/registry/rdap/testdata/rdap_multiple_hosts.json
@@ -65,7 +65,7 @@
                 "11211",
                 "United States"]],
               ["tel", {"type" : ["voice"]}, "uri", "tel:+1.2223334444"],
-              ["email", {}, "text", "new.registrar@example.com"]
+              ["email", {}, "text", "the.registrar@example.com"]
             ]
           ],
           "remarks": [
@@ -145,7 +145,7 @@
                 "11211",
                 "United States"]],
               ["tel", {"type" : ["voice"]}, "uri", "tel:+1.2223334444"],
-              ["email", {}, "text", "new.registrar@example.com"]
+              ["email", {}, "text", "the.registrar@example.com"]
             ]
           ],
           "remarks": [
diff --git a/javatests/google/registry/rdap/testdata/rdap_nontruncated_hosts.json b/javatests/google/registry/rdap/testdata/rdap_nontruncated_hosts.json
index 7cfab19f7..d8ac2b06a 100644
--- a/javatests/google/registry/rdap/testdata/rdap_nontruncated_hosts.json
+++ b/javatests/google/registry/rdap/testdata/rdap_nontruncated_hosts.json
@@ -65,7 +65,7 @@
                 "11211",
                 "United States"]],
               ["tel", {"type" : ["voice"]}, "uri", "tel:+1.2223334444"],
-              ["email", {}, "text", "new.registrar@example.com"]
+              ["email", {}, "text", "the.registrar@example.com"]
             ]
           ],
           "remarks": [
@@ -144,7 +144,7 @@
                 "11211",
                 "United States"]],
               ["tel", {"type" : ["voice"]}, "uri", "tel:+1.2223334444"],
-              ["email", {}, "text", "new.registrar@example.com"]
+              ["email", {}, "text", "the.registrar@example.com"]
             ]
           ],
           "remarks": [
@@ -223,7 +223,7 @@
                 "11211",
                 "United States"]],
               ["tel", {"type" : ["voice"]}, "uri", "tel:+1.2223334444"],
-              ["email", {}, "text", "new.registrar@example.com"]
+              ["email", {}, "text", "the.registrar@example.com"]
             ]
           ],
           "remarks": [
@@ -302,7 +302,7 @@
                 "11211",
                 "United States"]],
               ["tel", {"type" : ["voice"]}, "uri", "tel:+1.2223334444"],
-              ["email", {}, "text", "new.registrar@example.com"]
+              ["email", {}, "text", "the.registrar@example.com"]
             ]
           ],
           "remarks": [
diff --git a/javatests/google/registry/rdap/testdata/rdap_truncated_hosts.json b/javatests/google/registry/rdap/testdata/rdap_truncated_hosts.json
index 47a2d7af5..c180df542 100644
--- a/javatests/google/registry/rdap/testdata/rdap_truncated_hosts.json
+++ b/javatests/google/registry/rdap/testdata/rdap_truncated_hosts.json
@@ -65,7 +65,7 @@
                 "11211",
                 "United States"]],
               ["tel", {"type" : ["voice"]}, "uri", "tel:+1.2223334444"],
-              ["email", {}, "text", "new.registrar@example.com"]
+              ["email", {}, "text", "the.registrar@example.com"]
             ]
           ],
           "remarks": [
@@ -144,7 +144,7 @@
                 "11211",
                 "United States"]],
               ["tel", {"type" : ["voice"]}, "uri", "tel:+1.2223334444"],
-              ["email", {}, "text", "new.registrar@example.com"]
+              ["email", {}, "text", "the.registrar@example.com"]
             ]
           ],
           "remarks": [
@@ -223,7 +223,7 @@
                 "11211",
                 "United States"]],
               ["tel", {"type" : ["voice"]}, "uri", "tel:+1.2223334444"],
-              ["email", {}, "text", "new.registrar@example.com"]
+              ["email", {}, "text", "the.registrar@example.com"]
             ]
           ],
           "remarks": [
@@ -302,7 +302,7 @@
                 "11211",
                 "United States"]],
               ["tel", {"type" : ["voice"]}, "uri", "tel:+1.2223334444"],
-              ["email", {}, "text", "new.registrar@example.com"]
+              ["email", {}, "text", "the.registrar@example.com"]
             ]
           ],
           "remarks": [
diff --git a/javatests/google/registry/rde/RdeMarshallerTest.java b/javatests/google/registry/rde/RdeMarshallerTest.java
index 7dd159a11..c30bf5d92 100644
--- a/javatests/google/registry/rde/RdeMarshallerTest.java
+++ b/javatests/google/registry/rde/RdeMarshallerTest.java
@@ -69,7 +69,7 @@ public class RdeMarshallerTest extends ShardableTestCase {
         + "        </rdeRegistrar:addr>\n"
         + "    </rdeRegistrar:postalInfo>\n"
         + "    <rdeRegistrar:voice>+1.2223334444</rdeRegistrar:voice>\n"
-        + "    <rdeRegistrar:email>new.registrar@example.com</rdeRegistrar:email>\n"
+        + "    <rdeRegistrar:email>the.registrar@example.com</rdeRegistrar:email>\n"
         + "    <rdeRegistrar:url>http://my.fake.url</rdeRegistrar:url>\n"
         + "    <rdeRegistrar:whoisInfo>\n"
         + "        <rdeRegistrar:name>whois.nic.fakewhois.example</rdeRegistrar:name>\n"
diff --git a/javatests/google/registry/rde/testdata/testMapReduce_withDomain_producesExpectedXml.xml b/javatests/google/registry/rde/testdata/testMapReduce_withDomain_producesExpectedXml.xml
index bed30e277..fd9a69de5 100644
--- a/javatests/google/registry/rde/testdata/testMapReduce_withDomain_producesExpectedXml.xml
+++ b/javatests/google/registry/rde/testdata/testMapReduce_withDomain_producesExpectedXml.xml
@@ -94,7 +94,7 @@
         </rdeRegistrar:addr>
     </rdeRegistrar:postalInfo>
     <rdeRegistrar:voice>+1.2223334444</rdeRegistrar:voice>
-    <rdeRegistrar:email>new.registrar@example.com</rdeRegistrar:email>
+    <rdeRegistrar:email>the.registrar@example.com</rdeRegistrar:email>
     <rdeRegistrar:url>http://my.fake.url</rdeRegistrar:url>
     <rdeRegistrar:whoisInfo>
         <rdeRegistrar:name>whois.nic.fakewhois.example</rdeRegistrar:name>
diff --git a/javatests/google/registry/testing/AppEngineRule.java b/javatests/google/registry/testing/AppEngineRule.java
index 77295c5cb..34e50ce91 100644
--- a/javatests/google/registry/testing/AppEngineRule.java
+++ b/javatests/google/registry/testing/AppEngineRule.java
@@ -162,7 +162,6 @@ public final class AppEngineRule extends ExternalResource {
     return new Registrar.Builder()
         .setType(Registrar.Type.REAL)
         .setState(State.ACTIVE)
-        .setEmailAddress("new.registrar@example.com")
         .setIcannReferralEmail("lol@sloth.test")
         .setUrl("http://my.fake.url")
         .setInternationalizedAddress(new RegistrarAddress.Builder()
@@ -189,6 +188,7 @@ public final class AppEngineRule extends ExternalResource {
     return makeRegistrarCommon()
         .setClientId("NewRegistrar")
         .setRegistrarName("New Registrar")
+        .setEmailAddress("new.registrar@example.com")
         .setIanaIdentifier(8L)
         .setPassword("foo-BAR2")
         .setPhoneNumber("+1.3334445555")
@@ -201,6 +201,7 @@ public final class AppEngineRule extends ExternalResource {
     return makeRegistrarCommon()
         .setClientId("TheRegistrar")
         .setRegistrarName("The Registrar")
+        .setEmailAddress("the.registrar@example.com")
         .setIanaIdentifier(1L)
         .setPassword("password2")
         .setPhoneNumber("+1.2223334444")
diff --git a/javatests/google/registry/tools/server/testdata/xn--q9jyb4c_2010-10-17_full_S1_R0.xml b/javatests/google/registry/tools/server/testdata/xn--q9jyb4c_2010-10-17_full_S1_R0.xml
index 85254bede..8752de1af 100644
--- a/javatests/google/registry/tools/server/testdata/xn--q9jyb4c_2010-10-17_full_S1_R0.xml
+++ b/javatests/google/registry/tools/server/testdata/xn--q9jyb4c_2010-10-17_full_S1_R0.xml
@@ -106,7 +106,7 @@
         </rdeRegistrar:addr>
     </rdeRegistrar:postalInfo>
     <rdeRegistrar:voice>+1.2223334444</rdeRegistrar:voice>
-    <rdeRegistrar:email>new.registrar@example.com</rdeRegistrar:email>
+    <rdeRegistrar:email>the.registrar@example.com</rdeRegistrar:email>
     <rdeRegistrar:whoisInfo>
         <rdeRegistrar:name>whois.nic.fakewhois.example</rdeRegistrar:name>
     </rdeRegistrar:whoisInfo>
diff --git a/javatests/google/registry/ui/server/registrar/testdata/update_registrar_email.txt b/javatests/google/registry/ui/server/registrar/testdata/update_registrar_email.txt
index 4b9d3bcca..ad28d8b6e 100644
--- a/javatests/google/registry/ui/server/registrar/testdata/update_registrar_email.txt
+++ b/javatests/google/registry/ui/server/registrar/testdata/update_registrar_email.txt
@@ -7,7 +7,7 @@ localizedAddress.street.1: null -> Ste 156
 localizedAddress.city: Williamsburg -> New York
 localizedAddress.zip: 11211 -> 10011
 phoneNumber: +1.2223334444 -> +1.2223335555
-emailAddress: new.registrar@example.com -> thase@the.registrar
+emailAddress: the.registrar@example.com -> thase@the.registrar
 url: http://my.fake.url -> http://my.new.url
 contacts:
     ADDED:
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsWhoisEditError_page.png b/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsWhoisEditError_page.png
index f4dc1b1f3..d17826782 100644
Binary files a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsWhoisEditError_page.png and b/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsWhoisEditError_page.png differ
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsWhoisEdit_page.png b/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsWhoisEdit_page.png
index 520ad1558..06325a0f7 100644
Binary files a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsWhoisEdit_page.png and b/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsWhoisEdit_page.png differ
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsWhois_page.png b/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsWhois_page.png
index 8b1b7fcb0..8179046cc 100644
Binary files a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsWhois_page.png and b/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsWhois_page.png differ