diff --git a/java/com/google/domain/registry/model/registrar/Registrar.java b/java/com/google/domain/registry/model/registrar/Registrar.java
index 206c186dd..445ec9b52 100644
--- a/java/com/google/domain/registry/model/registrar/Registrar.java
+++ b/java/com/google/domain/registry/model/registrar/Registrar.java
@@ -23,6 +23,7 @@ import static com.google.common.base.Predicates.notNull;
 import static com.google.common.base.Strings.emptyToNull;
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static com.google.common.base.Strings.nullToEmpty;
+import static com.google.common.collect.Sets.immutableEnumSet;
 import static com.google.common.io.BaseEncoding.base64;
 import static com.google.domain.registry.model.common.EntityGroupRoot.getCrossTldKey;
 import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
@@ -179,13 +180,13 @@ public class Registrar extends ImmutableObject implements Buildable, Jsonifiable
 
   /**
    * The types for which a {@link Registrar} should be included in WHOIS and RDAP output. We exclude
-   * PDT and TEST. We considered excluding INTERNAL as well, but decided that troubleshooting would
-   * be easier with INTERNAL registrars visible.
+   * registrars of type TEST. We considered excluding INTERNAL as well, but decided that
+   * troubleshooting would be easier with INTERNAL registrars visible.
    */
   //TODO(b/27274151): Expand documentation of this field.
   private static final ImmutableSet<Type> PUBLICLY_VISIBLE_TYPES =
-      Sets.immutableEnumSet(
-          Type.REAL, Type.OTE, Type.EXTERNAL_MONITORING, Type.MONITORING, Type.INTERNAL);
+      immutableEnumSet(
+          Type.REAL, Type.PDT, Type.OTE, Type.EXTERNAL_MONITORING, Type.MONITORING, Type.INTERNAL);
 
   @Parent
   Key<EntityGroupRoot> parent = getCrossTldKey();
diff --git a/javatests/com/google/domain/registry/whois/WhoisServerTest.java b/javatests/com/google/domain/registry/whois/WhoisServerTest.java
index d95257141..bd7030a6a 100644
--- a/javatests/com/google/domain/registry/whois/WhoisServerTest.java
+++ b/javatests/com/google/domain/registry/whois/WhoisServerTest.java
@@ -15,6 +15,8 @@
 package com.google.domain.registry.whois;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.domain.registry.model.registrar.Registrar.State.ACTIVE;
+import static com.google.domain.registry.model.registrar.Registrar.Type.PDT;
 import static com.google.domain.registry.testing.DatastoreHelper.createTlds;
 import static com.google.domain.registry.testing.DatastoreHelper.persistResource;
 import static com.google.domain.registry.testing.DatastoreHelper.persistSimpleGlobalResources;
@@ -85,7 +87,7 @@ public class WhoisServerTest {
   @Test
   public void testRun_domainQuery_works() throws Exception {
     Registrar registrar = persistResource(makeRegistrar(
-        "evilregistrar", "Yes Virginia <script>", Registrar.State.ACTIVE));
+        "evilregistrar", "Yes Virginia <script>", ACTIVE));
     persistResource(makeDomainResource(
         "cat.lol",
         persistResource(makeContactResource("5372808-ERL", "Goblin Market", "lol@cat.lol")),
@@ -103,7 +105,7 @@ public class WhoisServerTest {
   @Test
   public void testRun_idnDomain_works() throws Exception {
     Registrar registrar = persistResource(makeRegistrar(
-        "evilregistrar", "Yes Virginia <script>", Registrar.State.ACTIVE));
+        "evilregistrar", "Yes Virginia <script>", ACTIVE));
     persistResource(makeDomainResource(
         "cat.みんな",
         persistResource(makeContactResource("5372808-ERL", "(◕‿◕)", "lol@cat.みんな")),
@@ -121,7 +123,7 @@ public class WhoisServerTest {
   @Test
   public void testRun_punycodeDomain_works() throws Exception {
     Registrar registrar = persistResource(makeRegistrar(
-        "evilregistrar", "Yes Virginia <script>", Registrar.State.ACTIVE));
+        "evilregistrar", "Yes Virginia <script>", ACTIVE));
     persistResource(makeDomainResource(
         "cat.みんな",
         persistResource(makeContactResource("5372808-ERL", "(◕‿◕)", "lol@cat.みんな")),
@@ -150,7 +152,7 @@ public class WhoisServerTest {
   public void testRun_domainInTestTld_isConsideredNotFound() throws Exception {
     persistResource(Registry.get("lol").asBuilder().setTldType(Registry.TldType.TEST).build());
     Registrar registrar = persistResource(makeRegistrar(
-        "evilregistrar", "Yes Virginia <script>", Registrar.State.ACTIVE));
+        "evilregistrar", "Yes Virginia <script>", ACTIVE));
     persistResource(makeDomainResource(
         "cat.lol",
         persistResource(makeContactResource("5372808-ERL", "Goblin Market", "lol@cat.lol")),
@@ -179,7 +181,7 @@ public class WhoisServerTest {
         persistResource(makeHostResource("ns1.cat.lol", "1.2.3.4")),
         persistResource(makeHostResource("ns2.cat.lol", "bad:f00d:cafe::15:beef")),
         persistResource(
-            (registrar = makeRegistrar("example", "Example Registrar", Registrar.State.ACTIVE))))
+            (registrar = makeRegistrar("example", "Example Registrar", ACTIVE))))
                 .asBuilder().setDeletionTime(clock.nowUtc().minusDays(1)).build());
     persistSimpleGlobalResources(makeRegistrarContacts(registrar));
     newWhoisServer("domain cat.lol\r\n").run();
@@ -205,7 +207,7 @@ public class WhoisServerTest {
         persistResource(makeHostResource("ns1.cat.lol", "1.2.3.4")),
         persistResource(makeHostResource("ns2.cat.lol", "bad:f00d:cafe::15:beef")),
         persistResource(
-            makeRegistrar("example", "Example Registrar", Registrar.State.ACTIVE))).asBuilder()
+            makeRegistrar("example", "Example Registrar", ACTIVE))).asBuilder()
                 .setCreationTimeForTest(DateTime.now().minusDays(2))
                 .setDeletionTime(DateTime.now().minusDays(1)).build());
     DomainResource domain2 = persistResource(makeDomainResource("cat.lol",
@@ -219,7 +221,7 @@ public class WhoisServerTest {
         persistResource(makeHostResource("ns1.google.lol", "9.9.9.9")),
         persistResource(makeHostResource("ns2.google.lol", "4311::f143")),
         persistResource((registrar = makeRegistrar(
-            "example", "Example Registrar", Registrar.State.ACTIVE)))).asBuilder()
+            "example", "Example Registrar", ACTIVE)))).asBuilder()
             .setCreationTimeForTest(DateTime.now()).build());
     persistSimpleGlobalResources(makeRegistrarContacts(registrar));
     assertThat(domain1.getRepoId()).isNotEqualTo(domain2.getRepoId());
@@ -366,7 +368,23 @@ public class WhoisServerTest {
   @Test
   public void testRun_registrarLookup_works() throws Exception {
     Registrar registrar = persistResource(
-        makeRegistrar("example", "Example Registrar, Inc.", Registrar.State.ACTIVE));
+        makeRegistrar("example", "Example Registrar, Inc.", ACTIVE));
+    persistSimpleGlobalResources(makeRegistrarContacts(registrar));
+    // Notice the partial search without "inc".
+    newWhoisServer("registrar example registrar").run();
+    assertThat(response.getStatus()).isEqualTo(200);
+    assertThat(response.getPayload()).isEqualTo(loadWhoisTestFile("whois_server_registrar.txt"));
+  }
+
+  @Test
+  public void testRun_pdtRegistrarLookup_works() throws Exception {
+    Registrar registrar =
+        persistResource(
+            makeRegistrar("example", "Example Registrar, Inc.", ACTIVE)
+                .asBuilder()
+                .setIanaIdentifier(9995L)
+                .setType(PDT)
+                .build());
     persistSimpleGlobalResources(makeRegistrarContacts(registrar));
     // Notice the partial search without "inc".
     newWhoisServer("registrar example registrar").run();
@@ -388,7 +406,7 @@ public class WhoisServerTest {
   @Test
   public void testRun_registrarLookupWithTestType_returnsNotFound() throws Exception {
     Registrar registrar = persistResource(
-        makeRegistrar("example", "Example Registrar, Inc.", Registrar.State.ACTIVE)
+        makeRegistrar("example", "Example Registrar, Inc.", ACTIVE)
             .asBuilder()
             .setIanaIdentifier(null)
             .setType(Registrar.Type.TEST)
@@ -403,7 +421,7 @@ public class WhoisServerTest {
   @Test
   public void testRun_multilevelDomain_isNotConsideredAHostname() throws Exception {
     Registrar registrar =
-        persistResource(makeRegistrar("example", "Example Registrar", Registrar.State.ACTIVE));
+        persistResource(makeRegistrar("example", "Example Registrar", ACTIVE));
     persistResource(makeDomainResource("cat.1.test",
         persistResource(makeContactResource("5372808-ERL", "(◕‿◕)", "lol@cat.1.test")),
         persistResource(makeContactResource("5372808-IRL", "Santa Claus", "BOFH@cat.1.test")),