diff --git a/tests/basic.js b/tests/basic.js
index b8cb869..5167666 100644
--- a/tests/basic.js
+++ b/tests/basic.js
@@ -94,8 +94,9 @@ var tests = [
   // create a new account
 , function () {
     var account = {
-      receipt: {}
-    , agreeTos: true
+      agreeTos: true
+    , keypair: goodGuy.keypair
+    , receipt: {}
     };
 
     return leStore.accounts.setAsync(goodGuy, account).then(function (account) {
@@ -145,6 +146,14 @@ var tests = [
       email: goodGuy.email
     }).then(function (account) {
 
+      if (!account) {
+        throw new Error("should have returned account for " + goodGuy.email);
+      }
+
+      if (!account.keypair) {
+        throw new Error("should have returned account.keypair for " + goodGuy.email);
+      }
+
       if (goodGuy.keypair.privateKeyPem !== account.keypair.privateKeyPem) {
         if (account.keypair.privateKeyJwk) {
           throw new Error("Error in test itself (not your fault). TODO: implement checking privateKeyJwk.");