diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c0a095..0ecf73a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,6 @@
 
 ## 0.7.0-pre.0 (June 28, 2026)
 * MSRV bumped to 1.87
-* `CipherSuite` no longer has a blanket impl via `VoprfParameters`; use `Suite<G, H>` instead (breaking change)
 * Migrated from `elliptic-curve 0.13` to `0.14`
 * Replaced `generic-array` with `hybrid-array`
 * Updated `digest` dependency to 0.11
diff --git a/src/ciphersuite.rs b/src/ciphersuite.rs
index d0eb7ef..1eb0887 100644
--- a/src/ciphersuite.rs
+++ b/src/ciphersuite.rs
@@ -13,7 +13,7 @@ use core::ops::Mul;
 use digest::block_api::BlockSizeUser;
 use digest::typenum::{IsLess, IsLessOrEqual, U256};
 use digest::{Digest, FixedOutput, HashMarker, OutputSizeUser};
-use hash2curve::OprfParameters;
+use hash2curve::{ExpandMsg, GroupDigest, OprfParameters};
 use hybrid_array::ArraySize;
 use hybrid_array::typenum::{IsGreaterOrEqual, Prod, True, U2};
 
@@ -39,22 +39,31 @@ where
     type Hash: Digest + BlockSizeUser + Default + FixedOutput + HashMarker;
 }
 
-/// A generic [`CipherSuite`] implementation for any compatible (Group, Hash) pair
-#[allow(dead_code)]
-#[derive(Debug)]
-pub struct Suite<G, H>(core::marker::PhantomData<(G, H)>);
-
-impl<G, H> CipherSuite for Suite<G, H>
-where
-    G: Group + OprfParameters,
-    H: BlockSizeUser + Default + FixedOutput + HashMarker + OutputSizeUser,
-    <G as Group>::SecurityLevel: Mul<U2>,
-    <H as OutputSizeUser>::OutputSize: ArraySize
-        + IsLess<U256>
-        + IsLessOrEqual<<H as BlockSizeUser>::BlockSize, Output = True>
-        + IsGreaterOrEqual<Prod<<G as Group>::SecurityLevel, U2>, Output = True>,
-{
-    const ID: &'static [u8] = G::ID;
-    type Group = G;
-    type Hash = H;
+/// Trait associating a hash to an elliptic curve for OPRF usage.
+pub trait OprfCipherSuite: OprfParameters + Group {
+    type Hash: Digest + BlockSizeUser + Default + FixedOutput + HashMarker + OutputSizeUser;
+}
+
+impl<T> OprfCipherSuite for T
+where
+    T: OprfParameters + Group,
+    <T as GroupDigest>::ExpandMsg: ExpandMsg<<T as Group>::SecurityLevel>,
+    <<T as GroupDigest>::ExpandMsg as ExpandMsg<<T as Group>::SecurityLevel>>::Hash:
+        Digest + BlockSizeUser + Default + FixedOutput + HashMarker + OutputSizeUser,
+{
+    type Hash = <<T as GroupDigest>::ExpandMsg as ExpandMsg<<T as Group>::SecurityLevel>>::Hash;
+}
+
+impl<T: OprfCipherSuite> CipherSuite for T
+where
+    T: Group,
+    <T as Group>::SecurityLevel: Mul<U2>,
+    <<T as OprfCipherSuite>::Hash as OutputSizeUser>::OutputSize: ArraySize
+        + IsLess<U256>
+        + IsLessOrEqual<<<T as OprfCipherSuite>::Hash as BlockSizeUser>::BlockSize, Output = True>
+        + IsGreaterOrEqual<Prod<<T as Group>::SecurityLevel, U2>, Output = True>,
+{
+    const ID: &'static [u8] = T::ID;
+    type Group = T;
+    type Hash = <T as OprfCipherSuite>::Hash;
 }
diff --git a/src/lib.rs b/src/lib.rs
index 29d232a..873995c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -53,7 +53,7 @@
 //! # #[cfg(feature = "ristretto255")]
 //! # type CipherSuite = voprf_vexahub::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
-//! # type CipherSuite = voprf_vexahub::P256CipherSuite;
+//! # type CipherSuite = p256::NistP256;
 //! use rand::rngs::SysRng;
 //! use rand::Rng;
 //! use voprf_vexahub::OprfServer;
@@ -73,7 +73,7 @@
 //! # #[cfg(feature = "ristretto255")]
 //! # type CipherSuite = voprf_vexahub::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
-//! # type CipherSuite = voprf_vexahub::P256CipherSuite;
+//! # type CipherSuite = p256::NistP256;
 //! use rand::rngs::SysRng;
 //! use rand::Rng;
 //! use voprf_vexahub::OprfClient;
@@ -94,7 +94,7 @@
 //! # #[cfg(feature = "ristretto255")]
 //! # type CipherSuite = voprf_vexahub::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
-//! # type CipherSuite = voprf_vexahub::P256CipherSuite;
+//! # type CipherSuite = p256::NistP256;
 //! # use voprf_vexahub::OprfClient;
 //! # use rand::{rngs::SysRng, Rng};
 //! #
@@ -119,7 +119,7 @@
 //! # #[cfg(feature = "ristretto255")]
 //! # type CipherSuite = voprf_vexahub::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
-//! # type CipherSuite = voprf_vexahub::P256CipherSuite;
+//! # type CipherSuite = p256::NistP256;
 //! # use voprf_vexahub::OprfClient;
 //! # use rand::{rngs::SysRng, Rng};
 //! #
@@ -152,7 +152,7 @@
 //! # #[cfg(feature = "ristretto255")]
 //! # type CipherSuite = voprf_vexahub::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
-//! # type CipherSuite = voprf_vexahub::P256CipherSuite;
+//! # type CipherSuite = p256::NistP256;
 //! # use voprf_vexahub::OprfClient;
 //! # use rand::{rngs::SysRng, Rng};
 //! #
@@ -199,7 +199,7 @@
 //! # #[cfg(feature = "ristretto255")]
 //! # type CipherSuite = voprf_vexahub::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
-//! # type CipherSuite = voprf_vexahub::P256CipherSuite;
+//! # type CipherSuite = p256::NistP256;
 //! use rand::rngs::SysRng;
 //! use rand::Rng;
 //! use voprf_vexahub::VoprfServer;
@@ -226,7 +226,7 @@
 //! # #[cfg(feature = "ristretto255")]
 //! # type CipherSuite = voprf_vexahub::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
-//! # type CipherSuite = voprf_vexahub::P256CipherSuite;
+//! # type CipherSuite = p256::NistP256;
 //! use rand::rngs::SysRng;
 //! use rand::Rng;
 //! use voprf_vexahub::VoprfClient;
@@ -248,7 +248,7 @@
 //! # #[cfg(feature = "ristretto255")]
 //! # type CipherSuite = voprf_vexahub::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
-//! # type CipherSuite = voprf_vexahub::P256CipherSuite;
+//! # type CipherSuite = p256::NistP256;
 //! # use voprf_vexahub::{VoprfServerEvaluateResult, VoprfClient};
 //! # use rand::{rngs::SysRng, Rng};
 //! #
@@ -275,7 +275,7 @@
 //! # #[cfg(feature = "ristretto255")]
 //! # type CipherSuite = voprf_vexahub::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
-//! # type CipherSuite = voprf_vexahub::P256CipherSuite;
+//! # type CipherSuite = p256::NistP256;
 //! # use voprf_vexahub::VoprfClient;
 //! # use rand::{rngs::SysRng, Rng};
 //! #
@@ -316,7 +316,7 @@
 //! # #[cfg(feature = "ristretto255")]
 //! # type CipherSuite = voprf_vexahub::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
-//! # type CipherSuite = voprf_vexahub::P256CipherSuite;
+//! # type CipherSuite = p256::NistP256;
 //! # use voprf_vexahub::VoprfClient;
 //! # use rand::{rngs::SysRng, Rng};
 //! #
@@ -370,7 +370,7 @@
 //! # #[cfg(feature = "ristretto255")]
 //! # type CipherSuite = voprf_vexahub::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
-//! # type CipherSuite = voprf_vexahub::P256CipherSuite;
+//! # type CipherSuite = p256::NistP256;
 //! # use voprf_vexahub::VoprfClient;
 //! # use rand::{rngs::SysRng, Rng};
 //! #
@@ -394,7 +394,7 @@
 //! # #[cfg(feature = "ristretto255")]
 //! # type CipherSuite = voprf_vexahub::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
-//! # type CipherSuite = voprf_vexahub::P256CipherSuite;
+//! # type CipherSuite = p256::NistP256;
 //! # use voprf_vexahub::{VoprfServerBatchEvaluateFinishResult, VoprfClient};
 //! # use rand::{rngs::SysRng, Rng};
 //! #
@@ -428,7 +428,7 @@
 //! # #[cfg(feature = "ristretto255")]
 //! # type CipherSuite = voprf_vexahub::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
-//! # type CipherSuite = voprf_vexahub::P256CipherSuite;
+//! # type CipherSuite = p256::NistP256;
 //! # use voprf_vexahub::{VoprfServerBatchEvaluateResult, VoprfClient};
 //! # use rand::{rngs::SysRng, Rng};
 //! #
@@ -462,7 +462,7 @@
 //! # #[cfg(feature = "ristretto255")]
 //! # type CipherSuite = voprf_vexahub::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
-//! # type CipherSuite = voprf_vexahub::P256CipherSuite;
+//! # type CipherSuite = p256::NistP256;
 //! # use voprf_vexahub::{VoprfServerBatchEvaluateResult, VoprfClient};
 //! # use rand::{rngs::SysRng, Rng};
 //! #
@@ -566,13 +566,9 @@ mod voprf;
 #[cfg(test)]
 mod tests;
 
-/// A [`CipherSuite`] using P-256 and SHA-256, exposed for doctests.
-#[cfg(feature = "doctest")]
-pub type P256CipherSuite = Suite<p256::NistP256, sha2::Sha256>;
-
 // Exports
 
-pub use crate::ciphersuite::{CipherSuite, Suite};
+pub use crate::ciphersuite::CipherSuite;
 #[cfg(feature = "danger")]
 pub use crate::common::derive_key;
 pub use crate::common::{
diff --git a/src/oprf.rs b/src/oprf.rs
index 0a072c4..488c93b 100644
--- a/src/oprf.rs
+++ b/src/oprf.rs
@@ -271,8 +271,8 @@ mod tests {
     use rand::rngs::SysRng;
 
     use super::*;
+    use crate::Group;
     use crate::common::{Dst, STR_HASH_TO_GROUP};
-    use crate::{Group, Suite};
 
     fn prf<CS: CipherSuite>(
         input: &[u8],
@@ -393,26 +393,26 @@ mod tests {
             zeroize_oprf_server::<Ristretto255>();
         }
 
-        base_retrieval::<Suite<NistP256, sha2::Sha256>>();
-        base_inversion_unsalted::<Suite<NistP256, sha2::Sha256>>();
-        server_evaluate::<Suite<NistP256, sha2::Sha256>>();
+        base_retrieval::<NistP256>();
+        base_inversion_unsalted::<NistP256>();
+        server_evaluate::<NistP256>();
 
-        zeroize_oprf_client::<Suite<NistP256, sha2::Sha256>>();
-        zeroize_oprf_server::<Suite<NistP256, sha2::Sha256>>();
+        zeroize_oprf_client::<NistP256>();
+        zeroize_oprf_server::<NistP256>();
 
-        base_retrieval::<Suite<NistP384, sha2::Sha384>>();
-        base_inversion_unsalted::<Suite<NistP384, sha2::Sha384>>();
-        server_evaluate::<Suite<NistP384, sha2::Sha384>>();
+        base_retrieval::<NistP384>();
+        base_inversion_unsalted::<NistP384>();
+        server_evaluate::<NistP384>();
 
-        zeroize_oprf_client::<Suite<NistP384, sha2::Sha384>>();
-        zeroize_oprf_server::<Suite<NistP384, sha2::Sha384>>();
+        zeroize_oprf_client::<NistP384>();
+        zeroize_oprf_server::<NistP384>();
 
-        base_retrieval::<Suite<NistP521, sha2::Sha512>>();
-        base_inversion_unsalted::<Suite<NistP521, sha2::Sha512>>();
-        server_evaluate::<Suite<NistP521, sha2::Sha512>>();
+        base_retrieval::<NistP521>();
+        base_inversion_unsalted::<NistP521>();
+        server_evaluate::<NistP521>();
 
-        zeroize_oprf_client::<Suite<NistP521, sha2::Sha512>>();
-        zeroize_oprf_server::<Suite<NistP521, sha2::Sha512>>();
+        zeroize_oprf_client::<NistP521>();
+        zeroize_oprf_server::<NistP521>();
 
         Ok(())
     }
diff --git a/src/poprf.rs b/src/poprf.rs
index 9f926fb..7f12169 100644
--- a/src/poprf.rs
+++ b/src/poprf.rs
@@ -736,8 +736,8 @@ mod tests {
     use rand::rngs::SysRng;
 
     use super::*;
+    use crate::Group;
     use crate::common::STR_HASH_TO_GROUP;
-    use crate::{Group, Suite};
 
     fn prf<CS: CipherSuite>(
         input: &[u8],
@@ -895,26 +895,26 @@ mod tests {
             zeroize_verifiable_server::<Ristretto255>();
         }
 
-        verifiable_retrieval::<Suite<NistP256, sha2::Sha256>>();
-        verifiable_bad_public_key::<Suite<NistP256, sha2::Sha256>>();
-        verifiable_server_evaluate::<Suite<NistP256, sha2::Sha256>>();
+        verifiable_retrieval::<NistP256>();
+        verifiable_bad_public_key::<NistP256>();
+        verifiable_server_evaluate::<NistP256>();
 
-        zeroize_verifiable_client::<Suite<NistP256, sha2::Sha256>>();
-        zeroize_verifiable_server::<Suite<NistP256, sha2::Sha256>>();
+        zeroize_verifiable_client::<NistP256>();
+        zeroize_verifiable_server::<NistP256>();
 
-        verifiable_retrieval::<Suite<NistP384, sha2::Sha384>>();
-        verifiable_bad_public_key::<Suite<NistP384, sha2::Sha384>>();
-        verifiable_server_evaluate::<Suite<NistP384, sha2::Sha384>>();
+        verifiable_retrieval::<NistP384>();
+        verifiable_bad_public_key::<NistP384>();
+        verifiable_server_evaluate::<NistP384>();
 
-        zeroize_verifiable_client::<Suite<NistP384, sha2::Sha384>>();
-        zeroize_verifiable_server::<Suite<NistP384, sha2::Sha384>>();
+        zeroize_verifiable_client::<NistP384>();
+        zeroize_verifiable_server::<NistP384>();
 
-        verifiable_retrieval::<Suite<NistP521, sha2::Sha512>>();
-        verifiable_bad_public_key::<Suite<NistP521, sha2::Sha512>>();
-        verifiable_server_evaluate::<Suite<NistP521, sha2::Sha512>>();
+        verifiable_retrieval::<NistP521>();
+        verifiable_bad_public_key::<NistP521>();
+        verifiable_server_evaluate::<NistP521>();
 
-        zeroize_verifiable_client::<Suite<NistP521, sha2::Sha512>>();
-        zeroize_verifiable_server::<Suite<NistP521, sha2::Sha512>>();
+        zeroize_verifiable_client::<NistP521>();
+        zeroize_verifiable_server::<NistP521>();
 
         Ok(())
     }
diff --git a/src/serialization.rs b/src/serialization.rs
index 167d024..ecaa8d6 100644
--- a/src/serialization.rs
+++ b/src/serialization.rs
@@ -328,9 +328,9 @@ mod test {
                 let _ = $item::<crate::Ristretto255>::deserialize(&$bytes[..]);
             }
 
-            let _ = $item::<crate::Suite<p256::NistP256, sha2::Sha256>>::deserialize(&$bytes[..]);
-            let _ = $item::<crate::Suite<p384::NistP384, sha2::Sha384>>::deserialize(&$bytes[..]);
-            let _ = $item::<crate::Suite<p521::NistP521, sha2::Sha512>>::deserialize(&$bytes[..]);
+            let _ = $item::<p256::NistP256>::deserialize(&$bytes[..]);
+            let _ = $item::<p384::NistP384>::deserialize(&$bytes[..]);
+            let _ = $item::<p521::NistP521>::deserialize(&$bytes[..]);
         };
     }
 
diff --git a/src/tests/test_cfrg_vectors.rs b/src/tests/test_cfrg_vectors.rs
index bb7cd58..99c96aa 100644
--- a/src/tests/test_cfrg_vectors.rs
+++ b/src/tests/test_cfrg_vectors.rs
@@ -17,7 +17,7 @@ use crate::tests::parser::*;
 use crate::{
     BlindedElement, CipherSuite, EvaluationElement, Group, OprfClient, OprfServer, PoprfClient,
     PoprfServer, PoprfServerBatchEvaluateFinishResult, PoprfServerBatchEvaluatePrepareResult,
-    Proof, Result, Suite, VoprfClient, VoprfServer, VoprfServerBatchEvaluateFinishResult,
+    Proof, Result, VoprfClient, VoprfServer, VoprfServerBatchEvaluateFinishResult,
 };
 
 #[derive(Debug)]
@@ -133,83 +133,83 @@ fn test_vectors() -> Result<()> {
     let p256_oprf_tvs =
         json_to_test_vectors!(rfc, String::from("P256-SHA256"), String::from("OPRF"));
     assert_ne!(p256_oprf_tvs.len(), 0);
-    test_oprf_seed_to_key::<Suite<NistP256, sha2::Sha256>>(&p256_oprf_tvs)?;
-    test_oprf_blind::<Suite<NistP256, sha2::Sha256>>(&p256_oprf_tvs)?;
-    test_oprf_blind_evaluate::<Suite<NistP256, sha2::Sha256>>(&p256_oprf_tvs)?;
-    test_oprf_finalize::<Suite<NistP256, sha2::Sha256>>(&p256_oprf_tvs)?;
-    test_oprf_evaluate::<Suite<NistP256, sha2::Sha256>>(&p256_oprf_tvs)?;
+    test_oprf_seed_to_key::<NistP256>(&p256_oprf_tvs)?;
+    test_oprf_blind::<NistP256>(&p256_oprf_tvs)?;
+    test_oprf_blind_evaluate::<NistP256>(&p256_oprf_tvs)?;
+    test_oprf_finalize::<NistP256>(&p256_oprf_tvs)?;
+    test_oprf_evaluate::<NistP256>(&p256_oprf_tvs)?;
 
     let p256_voprf_tvs =
         json_to_test_vectors!(rfc, String::from("P256-SHA256"), String::from("VOPRF"));
     assert_ne!(p256_voprf_tvs.len(), 0);
-    test_voprf_seed_to_key::<Suite<NistP256, sha2::Sha256>>(&p256_voprf_tvs)?;
-    test_voprf_blind::<Suite<NistP256, sha2::Sha256>>(&p256_voprf_tvs)?;
-    test_voprf_blind_evaluate::<Suite<NistP256, sha2::Sha256>>(&p256_voprf_tvs)?;
-    test_voprf_finalize::<Suite<NistP256, sha2::Sha256>>(&p256_voprf_tvs)?;
-    test_voprf_evaluate::<Suite<NistP256, sha2::Sha256>>(&p256_voprf_tvs)?;
+    test_voprf_seed_to_key::<NistP256>(&p256_voprf_tvs)?;
+    test_voprf_blind::<NistP256>(&p256_voprf_tvs)?;
+    test_voprf_blind_evaluate::<NistP256>(&p256_voprf_tvs)?;
+    test_voprf_finalize::<NistP256>(&p256_voprf_tvs)?;
+    test_voprf_evaluate::<NistP256>(&p256_voprf_tvs)?;
 
     let p256_poprf_tvs =
         json_to_test_vectors!(rfc, String::from("P256-SHA256"), String::from("POPRF"));
     assert_ne!(p256_poprf_tvs.len(), 0);
-    test_poprf_seed_to_key::<Suite<NistP256, sha2::Sha256>>(&p256_poprf_tvs)?;
-    test_poprf_blind::<Suite<NistP256, sha2::Sha256>>(&p256_poprf_tvs)?;
-    test_poprf_blind_evaluate::<Suite<NistP256, sha2::Sha256>>(&p256_poprf_tvs)?;
-    test_poprf_finalize::<Suite<NistP256, sha2::Sha256>>(&p256_poprf_tvs)?;
-    test_poprf_evaluate::<Suite<NistP256, sha2::Sha256>>(&p256_poprf_tvs)?;
+    test_poprf_seed_to_key::<NistP256>(&p256_poprf_tvs)?;
+    test_poprf_blind::<NistP256>(&p256_poprf_tvs)?;
+    test_poprf_blind_evaluate::<NistP256>(&p256_poprf_tvs)?;
+    test_poprf_finalize::<NistP256>(&p256_poprf_tvs)?;
+    test_poprf_evaluate::<NistP256>(&p256_poprf_tvs)?;
 
     let p384_oprf_tvs =
         json_to_test_vectors!(rfc, String::from("P384-SHA384"), String::from("OPRF"));
     assert_ne!(p384_oprf_tvs.len(), 0);
-    test_oprf_seed_to_key::<Suite<NistP384, sha2::Sha384>>(&p384_oprf_tvs)?;
-    test_oprf_blind::<Suite<NistP384, sha2::Sha384>>(&p384_oprf_tvs)?;
-    test_oprf_blind_evaluate::<Suite<NistP384, sha2::Sha384>>(&p384_oprf_tvs)?;
-    test_oprf_finalize::<Suite<NistP384, sha2::Sha384>>(&p384_oprf_tvs)?;
-    test_oprf_evaluate::<Suite<NistP384, sha2::Sha384>>(&p384_oprf_tvs)?;
+    test_oprf_seed_to_key::<NistP384>(&p384_oprf_tvs)?;
+    test_oprf_blind::<NistP384>(&p384_oprf_tvs)?;
+    test_oprf_blind_evaluate::<NistP384>(&p384_oprf_tvs)?;
+    test_oprf_finalize::<NistP384>(&p384_oprf_tvs)?;
+    test_oprf_evaluate::<NistP384>(&p384_oprf_tvs)?;
 
     let p384_voprf_tvs =
         json_to_test_vectors!(rfc, String::from("P384-SHA384"), String::from("VOPRF"));
     assert_ne!(p384_voprf_tvs.len(), 0);
-    test_voprf_seed_to_key::<Suite<NistP384, sha2::Sha384>>(&p384_voprf_tvs)?;
-    test_voprf_blind::<Suite<NistP384, sha2::Sha384>>(&p384_voprf_tvs)?;
-    test_voprf_blind_evaluate::<Suite<NistP384, sha2::Sha384>>(&p384_voprf_tvs)?;
-    test_voprf_finalize::<Suite<NistP384, sha2::Sha384>>(&p384_voprf_tvs)?;
-    test_voprf_evaluate::<Suite<NistP384, sha2::Sha384>>(&p384_voprf_tvs)?;
+    test_voprf_seed_to_key::<NistP384>(&p384_voprf_tvs)?;
+    test_voprf_blind::<NistP384>(&p384_voprf_tvs)?;
+    test_voprf_blind_evaluate::<NistP384>(&p384_voprf_tvs)?;
+    test_voprf_finalize::<NistP384>(&p384_voprf_tvs)?;
+    test_voprf_evaluate::<NistP384>(&p384_voprf_tvs)?;
 
     let p384_poprf_tvs =
         json_to_test_vectors!(rfc, String::from("P384-SHA384"), String::from("POPRF"));
     assert_ne!(p384_poprf_tvs.len(), 0);
-    test_poprf_seed_to_key::<Suite<NistP384, sha2::Sha384>>(&p384_poprf_tvs)?;
-    test_poprf_blind::<Suite<NistP384, sha2::Sha384>>(&p384_poprf_tvs)?;
-    test_poprf_blind_evaluate::<Suite<NistP384, sha2::Sha384>>(&p384_poprf_tvs)?;
-    test_poprf_finalize::<Suite<NistP384, sha2::Sha384>>(&p384_poprf_tvs)?;
-    test_poprf_evaluate::<Suite<NistP384, sha2::Sha384>>(&p384_poprf_tvs)?;
+    test_poprf_seed_to_key::<NistP384>(&p384_poprf_tvs)?;
+    test_poprf_blind::<NistP384>(&p384_poprf_tvs)?;
+    test_poprf_blind_evaluate::<NistP384>(&p384_poprf_tvs)?;
+    test_poprf_finalize::<NistP384>(&p384_poprf_tvs)?;
+    test_poprf_evaluate::<NistP384>(&p384_poprf_tvs)?;
 
     let p521_oprf_tvs =
         json_to_test_vectors!(rfc, String::from("P521-SHA512"), String::from("OPRF"));
     assert_ne!(p521_oprf_tvs.len(), 0);
-    test_oprf_seed_to_key::<Suite<NistP521, sha2::Sha512>>(&p521_oprf_tvs)?;
-    test_oprf_blind::<Suite<NistP521, sha2::Sha512>>(&p521_oprf_tvs)?;
-    test_oprf_blind_evaluate::<Suite<NistP521, sha2::Sha512>>(&p521_oprf_tvs)?;
-    test_oprf_finalize::<Suite<NistP521, sha2::Sha512>>(&p521_oprf_tvs)?;
-    test_oprf_evaluate::<Suite<NistP521, sha2::Sha512>>(&p521_oprf_tvs)?;
+    test_oprf_seed_to_key::<NistP521>(&p521_oprf_tvs)?;
+    test_oprf_blind::<NistP521>(&p521_oprf_tvs)?;
+    test_oprf_blind_evaluate::<NistP521>(&p521_oprf_tvs)?;
+    test_oprf_finalize::<NistP521>(&p521_oprf_tvs)?;
+    test_oprf_evaluate::<NistP521>(&p521_oprf_tvs)?;
 
     let p521_voprf_tvs =
         json_to_test_vectors!(rfc, String::from("P521-SHA512"), String::from("VOPRF"));
     assert_ne!(p521_voprf_tvs.len(), 0);
-    test_voprf_seed_to_key::<Suite<NistP521, sha2::Sha512>>(&p521_voprf_tvs)?;
-    test_voprf_blind::<Suite<NistP521, sha2::Sha512>>(&p521_voprf_tvs)?;
-    test_voprf_blind_evaluate::<Suite<NistP521, sha2::Sha512>>(&p521_voprf_tvs)?;
-    test_voprf_finalize::<Suite<NistP521, sha2::Sha512>>(&p521_voprf_tvs)?;
-    test_voprf_evaluate::<Suite<NistP521, sha2::Sha512>>(&p521_voprf_tvs)?;
+    test_voprf_seed_to_key::<NistP521>(&p521_voprf_tvs)?;
+    test_voprf_blind::<NistP521>(&p521_voprf_tvs)?;
+    test_voprf_blind_evaluate::<NistP521>(&p521_voprf_tvs)?;
+    test_voprf_finalize::<NistP521>(&p521_voprf_tvs)?;
+    test_voprf_evaluate::<NistP521>(&p521_voprf_tvs)?;
 
     let p521_poprf_tvs =
         json_to_test_vectors!(rfc, String::from("P521-SHA512"), String::from("POPRF"));
     assert_ne!(p521_poprf_tvs.len(), 0);
-    test_poprf_seed_to_key::<Suite<NistP521, sha2::Sha512>>(&p521_poprf_tvs)?;
-    test_poprf_blind::<Suite<NistP521, sha2::Sha512>>(&p521_poprf_tvs)?;
-    test_poprf_blind_evaluate::<Suite<NistP521, sha2::Sha512>>(&p521_poprf_tvs)?;
-    test_poprf_finalize::<Suite<NistP521, sha2::Sha512>>(&p521_poprf_tvs)?;
-    test_poprf_evaluate::<Suite<NistP521, sha2::Sha512>>(&p521_poprf_tvs)?;
+    test_poprf_seed_to_key::<NistP521>(&p521_poprf_tvs)?;
+    test_poprf_blind::<NistP521>(&p521_poprf_tvs)?;
+    test_poprf_blind_evaluate::<NistP521>(&p521_poprf_tvs)?;
+    test_poprf_finalize::<NistP521>(&p521_poprf_tvs)?;
+    test_poprf_evaluate::<NistP521>(&p521_poprf_tvs)?;
 
     Ok(())
 }
diff --git a/src/voprf.rs b/src/voprf.rs
index 3e46ac1..ebf43fd 100644
--- a/src/voprf.rs
+++ b/src/voprf.rs
@@ -553,8 +553,8 @@ mod tests {
     use rand::rngs::SysRng;
 
     use super::*;
+    use crate::Group;
     use crate::common::{Dst, STR_HASH_TO_GROUP};
-    use crate::{Group, Suite};
 
     fn prf<CS: CipherSuite>(
         input: &[u8],
@@ -774,32 +774,32 @@ mod tests {
             zeroize_voprf_server::<Ristretto255>();
         }
 
-        verifiable_retrieval::<Suite<NistP256, sha2::Sha256>>();
-        verifiable_batch_retrieval::<Suite<NistP256, sha2::Sha256>>();
-        verifiable_bad_public_key::<Suite<NistP256, sha2::Sha256>>();
-        verifiable_batch_bad_public_key::<Suite<NistP256, sha2::Sha256>>();
-        verifiable_server_evaluate::<Suite<NistP256, sha2::Sha256>>();
+        verifiable_retrieval::<NistP256>();
+        verifiable_batch_retrieval::<NistP256>();
+        verifiable_bad_public_key::<NistP256>();
+        verifiable_batch_bad_public_key::<NistP256>();
+        verifiable_server_evaluate::<NistP256>();
 
-        zeroize_voprf_client::<Suite<NistP256, sha2::Sha256>>();
-        zeroize_voprf_server::<Suite<NistP256, sha2::Sha256>>();
+        zeroize_voprf_client::<NistP256>();
+        zeroize_voprf_server::<NistP256>();
 
-        verifiable_retrieval::<Suite<NistP384, sha2::Sha384>>();
-        verifiable_batch_retrieval::<Suite<NistP384, sha2::Sha384>>();
-        verifiable_bad_public_key::<Suite<NistP384, sha2::Sha384>>();
-        verifiable_batch_bad_public_key::<Suite<NistP384, sha2::Sha384>>();
-        verifiable_server_evaluate::<Suite<NistP384, sha2::Sha384>>();
+        verifiable_retrieval::<NistP384>();
+        verifiable_batch_retrieval::<NistP384>();
+        verifiable_bad_public_key::<NistP384>();
+        verifiable_batch_bad_public_key::<NistP384>();
+        verifiable_server_evaluate::<NistP384>();
 
-        zeroize_voprf_client::<Suite<NistP384, sha2::Sha384>>();
-        zeroize_voprf_server::<Suite<NistP384, sha2::Sha384>>();
+        zeroize_voprf_client::<NistP384>();
+        zeroize_voprf_server::<NistP384>();
 
-        verifiable_retrieval::<Suite<NistP521, sha2::Sha512>>();
-        verifiable_batch_retrieval::<Suite<NistP521, sha2::Sha512>>();
-        verifiable_bad_public_key::<Suite<NistP521, sha2::Sha512>>();
-        verifiable_batch_bad_public_key::<Suite<NistP521, sha2::Sha512>>();
-        verifiable_server_evaluate::<Suite<NistP521, sha2::Sha512>>();
+        verifiable_retrieval::<NistP521>();
+        verifiable_batch_retrieval::<NistP521>();
+        verifiable_bad_public_key::<NistP521>();
+        verifiable_batch_bad_public_key::<NistP521>();
+        verifiable_server_evaluate::<NistP521>();
 
-        zeroize_voprf_client::<Suite<NistP521, sha2::Sha512>>();
-        zeroize_voprf_server::<Suite<NistP521, sha2::Sha512>>();
+        zeroize_voprf_client::<NistP521>();
+        zeroize_voprf_server::<NistP521>();
 
         Ok(())
     }