diff --git a/python/src/trezorlib/_internal/emulator.py b/python/src/trezorlib/_internal/emulator.py
index 0899692eaa..d171f58200 100644
--- a/python/src/trezorlib/_internal/emulator.py
+++ b/python/src/trezorlib/_internal/emulator.py
@@ -95,6 +95,15 @@ class Emulator:
             raise RuntimeError
         return self._client
 
+    @client.setter
+    def client(self, new_client: TrezorClientDebugLink) -> None:
+        """Setter for the client property to update _client."""
+        if not isinstance(new_client, TrezorClientDebugLink):
+            raise TypeError(
+                f"Expected a TrezorClientDebugLink, got {type(new_client).__name__}."
+            )
+        self._client = new_client
+
     def make_args(self) -> List[str]:
         return []
 
diff --git a/vendor/fido2-tests b/vendor/fido2-tests
index 93a68b36f6..c827648dd6 160000
--- a/vendor/fido2-tests
+++ b/vendor/fido2-tests
@@ -1 +1 @@
-Subproject commit 93a68b36f6eeaa605b11d7330aa04f6ae874cf61
+Subproject commit c827648dd6d44ce1935f8296d905afb9df1de685