diff --git a/browserid/lib/ca.js b/browserid/lib/ca.js
index e4f096a037a59992d3b7035ea873ac6ca8e516fe..608bc22b733af9f56aca6ea4d138081c828032a0 100644
--- a/browserid/lib/ca.js
+++ b/browserid/lib/ca.js
@@ -96,7 +96,7 @@ function verifyChain(certChain) {
   // raw certs
   return jwcert.JWCert.verifyChain(certChain, function(issuer) {
     // for now we only do browserid.org issued keys
-    if (issuer != "browserid2.org")
+    if (issuer != "browserid.org")
       return null;
 
     return PUBLIC_KEY;
diff --git a/browserid/tests/cert-emails-test.js b/browserid/tests/cert-emails-test.js
index fbd5ab9cfcf9c46569a3af525077b75733782c29..d86493c7cc97168ab5ba94417acdacc3af49b4b1 100755
--- a/browserid/tests/cert-emails-test.js
+++ b/browserid/tests/cert-emails-test.js
@@ -127,10 +127,7 @@ suite.addBatch({
       assert.strictEqual(r.code, 200);
     },
     "returns a proper cert": function(r, err) {
-      var cert = new jwcert.JWCert();
-      cert.parse(r.body);
-
-      assert.isTrue(ca.verifyChain([cert]).equals(kp.publicKey));
+      assert.isTrue(kp.publicKey.equals(ca.verifyChain([r.body])));
     },
     "generate an assertion": {
       topic: function(r) {
@@ -149,20 +146,11 @@ suite.addBatch({
       },
       "assertion verifies": {
         topic: function(full_assertion) {
-          // check that the assertion is verified by the public key in the chain cert
-          var cert_chain = [];
-          for (var i=0; i<full_assertion.certificates.length; i++) {
-            var cert = new jwcert.JWCert();
-            cert.parse(full_assertion.certificates[i]);
-            cert_chain[cert_chain.length] = cert;
-          }
-
           // extract public key at the tail of the chain
-          var pk = ca.verifyChain(cert_chain);
-          
+          return ca.verifyChain(full_assertion.certificates);
         },
         "verifies": function(result) {
-          assert.isTrue(result);
+          assert.notEqual(result, null);
         }
       }
     }