diff --git a/src/tests/system/data/test_passkey/test_passkey__su_fips_enable/passkey-mapping.ad b/src/tests/system/data/test_passkey/test_passkey__su_fips_fido_key/test_passkey__su_fips_enable/passkey-mapping.ad
similarity index 100%
rename from src/tests/system/data/test_passkey/test_passkey__su_fips_enable/passkey-mapping.ad
rename to src/tests/system/data/test_passkey/test_passkey__su_fips_fido_key/test_passkey__su_fips_enable/passkey-mapping.ad
diff --git a/src/tests/system/data/test_passkey/test_passkey__su_fips_enable/passkey-mapping.ipa b/src/tests/system/data/test_passkey/test_passkey__su_fips_fido_key/test_passkey__su_fips_enable/passkey-mapping.ipa
similarity index 100%
rename from src/tests/system/data/test_passkey/test_passkey__su_fips_enable/passkey-mapping.ipa
rename to src/tests/system/data/test_passkey/test_passkey__su_fips_fido_key/test_passkey__su_fips_enable/passkey-mapping.ipa
diff --git a/src/tests/system/data/test_passkey/test_passkey__su_fips_enable/passkey-mapping.ldap b/src/tests/system/data/test_passkey/test_passkey__su_fips_fido_key/test_passkey__su_fips_enable/passkey-mapping.ldap
similarity index 100%
rename from src/tests/system/data/test_passkey/test_passkey__su_fips_enable/passkey-mapping.ldap
rename to src/tests/system/data/test_passkey/test_passkey__su_fips_fido_key/test_passkey__su_fips_enable/passkey-mapping.ldap
diff --git a/src/tests/system/data/test_passkey/test_passkey__su_fips_enable/passkey-mapping.samba b/src/tests/system/data/test_passkey/test_passkey__su_fips_fido_key/test_passkey__su_fips_enable/passkey-mapping.samba
similarity index 100%
rename from src/tests/system/data/test_passkey/test_passkey__su_fips_enable/passkey-mapping.samba
rename to src/tests/system/data/test_passkey/test_passkey__su_fips_fido_key/test_passkey__su_fips_enable/passkey-mapping.samba
diff --git a/src/tests/system/data/test_passkey/test_passkey__su_fips_enable/umockdev.script.ad b/src/tests/system/data/test_passkey/test_passkey__su_fips_fido_key/test_passkey__su_fips_enable/umockdev.script.ad
similarity index 100%
rename from src/tests/system/data/test_passkey/test_passkey__su_fips_enable/umockdev.script.ad
rename to src/tests/system/data/test_passkey/test_passkey__su_fips_fido_key/test_passkey__su_fips_enable/umockdev.script.ad
diff --git a/src/tests/system/data/test_passkey/test_passkey__su_fips_enable/umockdev.script.ipa b/src/tests/system/data/test_passkey/test_passkey__su_fips_fido_key/test_passkey__su_fips_enable/umockdev.script.ipa
similarity index 100%
rename from src/tests/system/data/test_passkey/test_passkey__su_fips_enable/umockdev.script.ipa
rename to src/tests/system/data/test_passkey/test_passkey__su_fips_fido_key/test_passkey__su_fips_enable/umockdev.script.ipa
diff --git a/src/tests/system/data/test_passkey/test_passkey__su_fips_enable/umockdev.script.ldap b/src/tests/system/data/test_passkey/test_passkey__su_fips_fido_key/test_passkey__su_fips_enable/umockdev.script.ldap
similarity index 100%
rename from src/tests/system/data/test_passkey/test_passkey__su_fips_enable/umockdev.script.ldap
rename to src/tests/system/data/test_passkey/test_passkey__su_fips_fido_key/test_passkey__su_fips_enable/umockdev.script.ldap
diff --git a/src/tests/system/data/test_passkey/test_passkey__su_fips_enable/umockdev.script.samba b/src/tests/system/data/test_passkey/test_passkey__su_fips_fido_key/test_passkey__su_fips_enable/umockdev.script.samba
similarity index 100%
rename from src/tests/system/data/test_passkey/test_passkey__su_fips_enable/umockdev.script.samba
rename to src/tests/system/data/test_passkey/test_passkey__su_fips_fido_key/test_passkey__su_fips_enable/umockdev.script.samba