diff --git a/crates/e2e-tests/tests/request_during_resharing.rs b/crates/e2e-tests/tests/request_during_resharing.rs
index da3a146e0f..9459a53875 100644
--- a/crates/e2e-tests/tests/request_during_resharing.rs
+++ b/crates/e2e-tests/tests/request_during_resharing.rs
@@ -1,11 +1,23 @@
 use crate::common;
 
-use mpc_primitives::domain::{Curve, DomainId};
+use mpc_primitives::domain::DomainId;
 use near_mpc_contract_interface::types::{
     DomainConfig, DomainPurpose, Protocol, ProtocolContractState, ReconstructionThreshold,
+    RunningContractState,
 };
 use rand::SeedableRng;
 
+/// Panics if no domain matches; each protocol appears at most once in this test's domain set.
+fn find_domain_id(contract_state: &RunningContractState, protocol_type: Protocol) -> DomainId {
+    contract_state
+        .domains
+        .domains
+        .iter()
+        .find(|d| d.protocol == protocol_type)
+        .unwrap_or_else(|| panic!("no domain with protocol {protocol_type:?}"))
+        .id
+}
+
 /// Tests that signature and CKD requests are processed using the previous
 /// running state's threshold while resharing is in progress.
 ///
@@ -46,43 +58,17 @@ async fn test_request_during_resharing() {
     cluster.kill_nodes(&[5]).expect("failed to kill node 5");
 
     // then
-    let ecdsa_domain = contract_state
-        .domains
-        .domains
-        .iter()
-        .find(|d| {
-            Curve::from(d.protocol) == Curve::Secp256k1
-                && d.protocol == Protocol::CaitSith
-                && d.purpose == DomainPurpose::Sign
-        })
-        .expect("no CaitSith Sign domain");
-    let robust_ecdsa_domain = contract_state
-        .domains
-        .domains
-        .iter()
-        .find(|d| d.protocol == Protocol::DamgardEtAl && d.purpose == DomainPurpose::Sign)
-        .expect("no DamgardEtAl Sign domain");
-    let eddsa_domain = contract_state
-        .domains
-        .domains
-        .iter()
-        .find(|d| {
-            Curve::from(d.protocol) == Curve::Edwards25519 && d.purpose == DomainPurpose::Sign
-        })
-        .expect("no Edwards25519 Sign domain");
-    let ckd_domain = contract_state
-        .domains
-        .domains
-        .iter()
-        .find(|d| d.purpose == DomainPurpose::CKD)
-        .expect("no CKD domain");
+    let ecdsa_domain_id = find_domain_id(&contract_state, Protocol::CaitSith);
+    let robust_ecdsa_domain_id = find_domain_id(&contract_state, Protocol::DamgardEtAl);
+    let eddsa_domain_id = find_domain_id(&contract_state, Protocol::Frost);
+    let ckd_domain_id = find_domain_id(&contract_state, Protocol::ConfidentialKeyDerivation);
 
     let mut rng = rand::rngs::StdRng::seed_from_u64(0);
     for i in 0..3 {
         for (label, domain_id, is_eddsa) in [
-            ("ECDSA", ecdsa_domain.id, false),
-            ("robust ECDSA", robust_ecdsa_domain.id, false),
-            ("EdDSA", eddsa_domain.id, true),
+            ("ECDSA", ecdsa_domain_id, false),
+            ("robust ECDSA", robust_ecdsa_domain_id, false),
+            ("EdDSA", eddsa_domain_id, true),
         ] {
             let payload = if is_eddsa {
                 common::generate_eddsa_payload(&mut rng)
@@ -104,7 +90,7 @@ async fn test_request_during_resharing() {
         tracing::info!(i, "sending CKD request during resharing");
         let outcome = cluster
             .send_ckd_request(
-                ckd_domain.id,
+                ckd_domain_id,
                 common::generate_ckd_app_public_key(&mut rng),
                 cluster.default_user_account(),
             )