diff --git a/tests/unit_tests/brain_wallet_test.cpp b/tests/unit_tests/brain_wallet_test.cpp
index 70fc6e7a..1336f6dd 100644
--- a/tests/unit_tests/brain_wallet_test.cpp
+++ b/tests/unit_tests/brain_wallet_test.cpp
@@ -13,10 +13,10 @@ TEST(brain_wallet, store_restore_test)
   {
     currency::account_base acc;
     acc.generate();
-    auto restore_data = acc.get_restore_data();
+    auto seed_phrase = acc.get_restore_braindata();
     
     currency::account_base acc2;
-    bool r = acc2.restore_keys(restore_data);
+    bool r = acc2.restore_from_braindata(seed_phrase);
     ASSERT_TRUE(r);
 
     if (memcmp(&acc2.get_keys(), &acc.get_keys(), sizeof(currency::account_keys)))
@@ -29,10 +29,10 @@ TEST(brain_wallet, store_restore_test)
   {
     currency::account_base acc;
     acc.generate();
-    auto restore_data = acc.get_restore_braindata();
+    auto seed_phrase = acc.get_restore_braindata();
 
     currency::account_base acc2;
-    bool r = acc2.restore_keys_from_braindata(restore_data);
+    bool r = acc2.restore_from_braindata(seed_phrase);
     ASSERT_TRUE(r);
 
     if (memcmp(&acc2.get_keys(), &acc.get_keys(), sizeof(currency::account_keys)))
@@ -42,3 +42,136 @@ TEST(brain_wallet, store_restore_test)
   }
 
 }
+
+struct wallet_seed_entry
+{
+  std::string seed_phrase;
+  std::string spend_secret_key;
+  std::string view_secret_key;
+  uint64_t timestamp;
+  bool auditable;
+  bool valid;
+};
+
+wallet_seed_entry wallet_seed_entries[] = 
+{
+  {
+    // legacy 24-word seed phrase -- invalid
+    "dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew",
+    "",
+    "",
+    0,
+    false,
+    false
+  },
+  {
+    // old-style 25-word seed phrase -- valid
+    "dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew",
+    "5e051454d7226b5734ebd64f754b57db4c655ecda00bd324f1b241d0b6381c0f",
+    "7dde5590fdf430568c00556ac2accf09da6cde9a29a4bc7d1cb6fd267130f006",
+    0,
+    false,
+    true
+  },
+  {
+    // old-style 25-word seed phrase -- valid
+    "conversation conversation conversation conversation conversation conversation conversation conversation conversation conversation conversation conversation conversation conversation conversation conversation conversation conversation conversation conversation conversation conversation conversation conversation conversation",
+    "71162f207499bc16260957c36a6586bb931d54be33ff56b94d565dfedbb3c70e",
+    "8454372096986c457f4e7dceef2f39b6050c35d87b31d9c9eb8d37bf8f1f430f",
+    0,
+    false,
+    true
+  },
+  {
+    // old-style 25-word seed phrase -- invalid word
+    "dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew dew!",
+    "",
+    "",
+    0,
+    false,
+    false
+  },
+  {
+    // old-style 25-word seed phrase -- invalid word
+    "six six six six six six six six six sex six six six six six six six six six six six six six six six",
+    "",
+    "",
+    0,
+    false,
+    false
+  },
+  {
+    // new-style 26-word seed phrase -- invalid word
+    "six six six six six six six six six six six six six six six six six six six six six six six six six sex",
+    "",
+    "",
+    0,
+    false,
+    false
+  },
+  {
+    // new-style 26-word seed phrase -- invalid checksum
+    "six six six six six six six six six six six six six six six six six six six six six six six six six six",
+    "",
+    "",
+    0,
+    false,
+    false
+  },
+  {
+    // new-style 26-word seed phrase - valid
+    "six six six six six six six six six six six six six six six six six six six six six six six six six frown",
+    "F54F61E3B974AD86171AE4944205C7BD0395BD7845899CDA8B1FBC5C947BB402",
+    "A18715058BBD914959C3A735B2022E9AE1D04452BC1FAD9E63C53668B7F57907",
+    1922832000,
+    false,
+    true
+  },
+  {
+    // new-style 26-word seed phrase auditable - valid
+    "six six six six six six six six six six six six six six six six six six six six six six six six six grace",
+    "F54F61E3B974AD86171AE4944205C7BD0395BD7845899CDA8B1FBC5C947BB402",
+    "A18715058BBD914959C3A735B2022E9AE1D04452BC1FAD9E63C53668B7F57907",
+    1922832000,
+    true,
+    true
+  },
+
+};
+
+TEST(wallet_seed, basic_test) 
+{
+  for (size_t i = 0; i < sizeof wallet_seed_entries / sizeof wallet_seed_entries[0]; ++i)
+  {
+    const wallet_seed_entry& wse = wallet_seed_entries[i];
+    currency::account_base acc;
+    bool r = false;
+    try
+    {
+      r = acc.restore_from_braindata(wse.seed_phrase);
+    }
+    catch (...)
+    {
+      r = false;
+    }
+    ASSERT_EQ(r, wse.valid);
+
+    if (r)
+    {
+      if (wse.timestamp)
+        ASSERT_EQ(wse.timestamp, acc.get_createtime());
+
+      ASSERT_EQ(wse.auditable, acc.get_public_address().is_auditable());
+
+      // check keys
+      crypto::secret_key v, s;
+      ASSERT_TRUE(epee::string_tools::parse_tpod_from_hex_string(wse.spend_secret_key, s));
+      ASSERT_EQ(s, acc.get_keys().spend_secret_key);
+
+      ASSERT_TRUE(epee::string_tools::parse_tpod_from_hex_string(wse.view_secret_key, v));
+      ASSERT_EQ(v, acc.get_keys().view_secret_key);
+    }
+
+  }
+
+}