diff --git a/build/pgo/certs/cert8.db b/build/pgo/certs/cert8.db
index 96486df5f6a8..a6e25b9d59c8 100644
Binary files a/build/pgo/certs/cert8.db and b/build/pgo/certs/cert8.db differ
diff --git a/build/pgo/certs/key3.db b/build/pgo/certs/key3.db
index da98cabe9507..6238f5da9e5c 100644
Binary files a/build/pgo/certs/key3.db and b/build/pgo/certs/key3.db differ
diff --git a/build/pgo/server-locations.txt b/build/pgo/server-locations.txt
index 01541bd4d636..a123ef90009b 100644
--- a/build/pgo/server-locations.txt
+++ b/build/pgo/server-locations.txt
@@ -111,6 +111,8 @@ https://sub1.test2.example.com:443     privileged
 https://sub2.test1.example.com:443     privileged
 https://sub2.test2.example.com:443     privileged
 https://nocert.example.com:443         privileged,nocert
+https://self-signed.example.com:443    privileged,cert=selfsigned
+https://untrusted.example.com:443      privileged,cert=untrusted
 https://requestclientcert.example.com:443         privileged,clientauth=request
 https://requireclientcert.example.com:443         privileged,clientauth=require
 
diff --git a/testing/mochitest/ssltunnel/ssltunnel.cpp b/testing/mochitest/ssltunnel/ssltunnel.cpp
index 9c65757c3674..cd406eedf9e9 100644
--- a/testing/mochitest/ssltunnel/ssltunnel.cpp
+++ b/testing/mochitest/ssltunnel/ssltunnel.cpp
@@ -243,7 +243,7 @@ bool ConfigureSSLServerSocket(PRFileDesc* socket, server_info_t* si, string &cer
   AutoCert cert(PK11_FindCertFromNickname(
       certnick, NULL));
   if (!cert) {
-    fprintf(stderr, "Failed to find cert %s\n", si->cert_nickname.c_str());
+    fprintf(stderr, "Failed to find cert %s\n", certnick);
     return false;
   }