diff --git a/docs/api/client/account.rst b/docs/api/client/account.rst
new file mode 100644
index 000000000..6fad87556
--- /dev/null
+++ b/docs/api/client/account.rst
@@ -0,0 +1,5 @@
+:mod:`letsencrypt.client.account`
+---------------------------------
+
+.. automodule:: letsencrypt.client.account
+   :members:
diff --git a/letsencrypt/acme/messages2_test.py b/letsencrypt/acme/messages2_test.py
index e1d5efe47..33a55dcf3 100644
--- a/letsencrypt/acme/messages2_test.py
+++ b/letsencrypt/acme/messages2_test.py
@@ -58,7 +58,6 @@ class ConstantTest(unittest.TestCase):
         self.MockConstant = MockConstant  # pylint: disable=invalid-name
         self.const_a = MockConstant('a')
         self.const_b = MockConstant('b')
-        self.const_a_prime = MockConstant('a')
 
     def test_to_partial_json(self):
         self.assertEqual('a', self.const_a.to_partial_json())
@@ -77,11 +76,12 @@ class ConstantTest(unittest.TestCase):
         self.assertEqual('MockConstant(b)', repr(self.const_b))
 
     def test_equality(self):
+        const_a_prime = self.MockConstant('a')
         self.assertFalse(self.const_a == self.const_b)
-        self.assertTrue(self.const_a == self.const_a_prime)
+        self.assertTrue(self.const_a == const_a_prime)
 
         self.assertTrue(self.const_a != self.const_b)
-        self.assertFalse(self.const_a != self.const_a_prime)
+        self.assertFalse(self.const_a != const_a_prime)
 
 class RegistrationTest(unittest.TestCase):
     """Tests for letsencrypt.acme.messages2.Registration."""
diff --git a/letsencrypt/client/interfaces.py b/letsencrypt/client/interfaces.py
index 48c384172..d432e656e 100644
--- a/letsencrypt/client/interfaces.py
+++ b/letsencrypt/client/interfaces.py
@@ -107,6 +107,10 @@ class IConfig(zope.interface.Interface):
     cert_key_backup = zope.interface.Attribute(
         "Directory where all certificates and keys are stored. "
         "Used for easy revocation.")
+    accounts_dir = zope.interface.Attribute(
+        "Directory where all account information is stored.")
+    account_keys_dir = zope.interface.Attribute(
+        "Directory where all account keys are stored".)
     rec_token_dir = zope.interface.Attribute(
         "Directory where all recovery tokens are saved.")
     key_dir = zope.interface.Attribute("Keys storage.")