diff --git a/lib/tests/test_account.py b/lib/tests/test_account.py
index 4c01eda4..54a598e5 100644
--- a/lib/tests/test_account.py
+++ b/lib/tests/test_account.py
@@ -67,3 +67,57 @@ class Test_Account(unittest.TestCase):
                 xpub, seq = a.parse_xpubkey(pubkey)
                 self.assertEquals(xpub, a.xpub)
                 self.assertEquals(seq, [for_change, n])
+
+    def test_old_account(self):
+        v = {
+            'change': [
+                '04def41cbdc23003c5636fb3aafdbce23062a06bffeca3d02ea613a9516b1f884397a6718bc6eb45e1e58ee1bb16e13108b94061680b7930479bee7b45fbaec9b7',
+                '046570a52ad1d313821b22175b869171a118c7f8d032c6d4d8614a2672807b6a092cf9702dd457aa6dd1ee4cd66ff0593280d407e4dc2c7c8f8a78551390b6bb5c',
+                '04ee98d63800824486a1cf5b4376f2f574d86e0a3009a6448105703453f3368e8e1d8d090aaecdd626a45cc49876709a3bbb6dc96a4311b3cac03e225df5f63dfc',
+                '049251a067684656c18c2e009d8ecdf735515599d2ae838cf94646ed89a370e818d6653f5e1d2e3fb1c64f45875e717ba95ea3239d3f30854c9aeaefa33d5e2dc8',
+                '04c89a24f4ffc71f622e46ce35096c1bd31078b96805742edf94e6011a72e6cad5de3b9bef92cb37fbf7ca0680073aa1270feb274562212829199494330c588651',
+                '04b68706478edad4fb4bdac4fc3ddeacf337182ae291462b4f63b765bbb0eef12e96008a8682c3e6ee4e66380c9e80fd7ec4ca5423ebc179fd581281ad4c7bac47',
+                '0454bb2aee65d7aa78ee9c5ce5e6a4eee0f9c986114fafc59431cfaf51e503095c362afc011079aa6f9c123bce828c1fa8a19de06dcd0eb09725fc2350d2e30409'
+            ],
+            'receiving': [
+                '040900f07c15d3fa441979e71d7ccdcca1afc30a28de07a0525a3d7655dc49cca0f844fb0903b3cccc4604107a9de6a0571c4a39996a9e4bd6ab596138ecae54f5',
+                '0478aa6e296340d15563b1af073df57319ff4ffc09b16ff1b0f7c00e7b41410fb1353f59f5b9ce72853a53cb5a31416ed747352ccb9d55557f5e740121d2b1354d',
+                '0493021f661df7e2af42d2a6d8ee18b4566e17072040e649c4a272de3692cbad388b679b96b5c4216146868baf4a31d9aa0c07ba375cc3b166fcd3a1e7151705a0',
+                '0496ba9dc1028e109d01ca82b57fc1efec7dcdca74b2afabad45cdfecc84cc72c658d9404f7c4b36e67960d91b50e1e19da4e2ceb9348995aea74fecd22172ae96',
+                '04534a39b2418bbde9b6841e7ba7ee863cc392276d393425c5019f3eb3f68f0a3a47509ccea9837e6718e512917791e456ba1600bc953d54c84b8826a568315a53'
+            ],
+            'mpk': '4e13b0f311a55b8a5db9a32e959da9f011b131019d4cebe6141b9e2c93edcbfc0954c358b062a9f94111548e50bde5847a3096b8b7872dcffadb0e9579b9017b'
+        }
+
+        seed = '00000000000000000000000000000000'
+        self.assertEquals(account.OldAccount.mpk_from_seed(seed), v['mpk'])
+
+        a = account.OldAccount(v)
+        self.assertEquals(a.get_master_pubkeys(), [v['mpk']])
+        self.assertEquals(a.get_address(for_change=0, n=0), '1FHsTashEBUNPQwC1CwVjnKUxzwgw73pU4')
+        self.assertEquals(a.get_address(for_change=0, n=2), '1Got6wbjxQ592WfwLcfLLxn3aTetLzpTom')
+        self.assertEquals(a.get_address(for_change=1, n=0), '16RyjNDNEwwWkv6mvptvxT9qNN5shJxcxo')
+        self.assertEquals(a.get_address(for_change=1, n=3), '1M6kHXnzmiUNsoYKZgzPDVpsSmMcfKFiiM')
+
+        self.assertTrue(a.check_seed(seed))
+        with self.assertRaises(account.InvalidPassword):
+            a.check_seed('1' * len(seed))
+
+        storage = {
+            'seed': '00000000000000000000000000000000',
+            'wallet_type': 'old'
+        }
+        w = wallet.OldWallet(storage)
+        privkey = a.get_private_key(sequence=[0, 0], wallet=w, password=None)
+        self.assertEquals(privkey, ['5Khs7w6fBkogoj1v71Mdt4g8m5kaEyRaortmK56YckgTubgnrhz'])
+
+        for for_change in [0, 1]:
+            for n in range(5):
+                label = ['receiving', 'change'][for_change]
+                pubkey = a.derive_pubkeys(for_change, n)
+                self.assertEquals(pubkey, v[label][n])
+
+                pubkey, = a.get_xpubkeys(for_change, n)
+                mpk, seq = a.parse_xpubkey(pubkey)
+                self.assertEquals(mpk, v['mpk'])
+                self.assertEquals(seq, [for_change, n])