diff --git a/core/tests/run_tests_device_emu_fido2.sh b/core/tests/run_tests_device_emu_fido2.sh
index bad434d9b..dca6996b5 100755
--- a/core/tests/run_tests_device_emu_fido2.sh
+++ b/core/tests/run_tests_device_emu_fido2.sh
@@ -32,6 +32,7 @@ fi
 cd ../../tests/fido_tests/fido2
 # run tests
 error=0
+export TREZOR_FIDO2_UDP_PORT=21326
 if ! pytest --random-order-seed=414020 --sim tests/standard/ --vendor trezor "$@"; then  # hardcoded order seed, which succeeds
   error=1
 fi
diff --git a/core/tests/run_tests_device_emu_u2f.sh b/core/tests/run_tests_device_emu_u2f.sh
index 6f6a4efc0..5902a6c4d 100755
--- a/core/tests/run_tests_device_emu_u2f.sh
+++ b/core/tests/run_tests_device_emu_u2f.sh
@@ -31,14 +31,15 @@ fi
 
 # run tests
 error=0
+TREZOR_FIDO2_UDP_PORT=21326
 # missuse loaddevice test to initialize the device
 if ! pytest ../../tests/device_tests -k "test_msg_loaddevice" "$@"; then
   error=1
 fi
-if ! ../../tests/fido_tests/u2f-tests-hid/HIDTest 21328 "$@"; then
+if ! ../../tests/fido_tests/u2f-tests-hid/HIDTest "${TREZOR_FIDO2_UDP_PORT}" "$@"; then
   error=1
 fi
-if ! ../../tests/fido_tests/u2f-tests-hid/U2FTest 21328 "$@"; then
+if ! ../../tests/fido_tests/u2f-tests-hid/U2FTest "${TREZOR_FIDO2_UDP_PORT}" "$@"; then
   error=1
 fi
 kill $upy_pid
diff --git a/vendor/fido2-tests b/vendor/fido2-tests
index f414dd2bc..e1e44d438 160000
--- a/vendor/fido2-tests
+++ b/vendor/fido2-tests
@@ -1 +1 @@
-Subproject commit f414dd2bc1094f148b217ed58516ccbf4cf43690
+Subproject commit e1e44d43893fd8eefde4f18f576d006747e5fc90