diff --git a/testing/conftest.py b/testing/conftest.py
index d4aa8ab5..d504a671 100644
--- a/testing/conftest.py
+++ b/testing/conftest.py
@@ -583,7 +583,7 @@ def goto_home(cap_menu, need_keypress, pick_menu_item):
 
             if m[0] in { 'New Seed Words',  'Ready To Sign'}:
                 break
-            if (m[1] == "Ready To Sign") and m[0][0] == "[":
+            if len(m) > 1 and (m[1] == "Ready To Sign") and (m[0][0] == "["):
                 # ephemeral has XFP as first menu item
                 break
         else:
diff --git a/testing/test_ephemeral.py b/testing/test_ephemeral.py
index db648c96..fdf67113 100644
--- a/testing/test_ephemeral.py
+++ b/testing/test_ephemeral.py
@@ -31,7 +31,8 @@ SEEDVAULT_TEST_DATA = [
 ]
 
 @pytest.fixture
-def seed_vault_enable(cap_story, pick_menu_item, need_keypress, goto_home):
+def seed_vault_enable(cap_story, pick_menu_item, need_keypress, goto_home,
+                      settings_set):
     def doit(enable=True):
         goto_home()
         pick_menu_item("Advanced/Tools")
@@ -46,6 +47,14 @@ def seed_vault_enable(cap_story, pick_menu_item, need_keypress, goto_home):
             pick_menu_item("Enable")
         else:
             pick_menu_item("Default Off")
+            time.sleep(.2)
+            _, story = cap_story()
+            if "Please remove all seeds from the vault" in story:
+                need_keypress("y")
+                settings_set("seeds", [])
+                pick_menu_item("Seed Vault")
+                time.sleep(.1)
+                pick_menu_item("Default Off")
 
         time.sleep(.1)
 
@@ -1217,16 +1226,13 @@ def test_temporary_from_backup(multisig, backup_system, import_ms_wallet, get_se
                                goto_eph_seed_menu, pick_menu_item, word_menu_entry,
                                verify_ephemeral_secret_ui, seedvault, settings_set,
                                seed_vault_enable, confirm_tmp_seed, settings_path,
-                               seed_vault_delete, restore_main_seed):
+                               seed_vault_delete, restore_main_seed, set_seed_words):
     xfp_str, encoded_str, mnemonic = data
-    encoded = a2b_hex(encoded_str)
     if mnemonic:
-        vlen = len(encoded)
-        assert vlen in [16, 24, 32]
-        marker = 0x80 | ((vlen // 8) - 2)
-        encoded = bytes([marker]) + encoded
-
-    set_encoded_secret(encoded)
+        set_seed_words(mnemonic)
+    else:
+        encoded = a2b_hex(encoded_str)
+        set_encoded_secret(encoded)
 
     settings_set("chain", "XTN")
 
diff --git a/testing/test_ux.py b/testing/test_ux.py
index 438ce1c7..f8a300ed 100644
--- a/testing/test_ux.py
+++ b/testing/test_ux.py
@@ -293,7 +293,7 @@ def test_new_wallet(nwords, goto_home, pick_menu_item, cap_story, need_keypress,
     unit_test('devtest/clear_seed.py')
     m = cap_menu()
     pick_menu_item('New Seed Words')
-    pick_menu_item(f'{nwords} Word')
+    pick_menu_item(f'{nwords} Words')
 
     title, body = cap_story()
     assert title == 'NO-TITLE'