diff --git a/benches/opaque.rs b/benches/opaque.rs
index 15a0a96..5c3800e 100644
--- a/benches/opaque.rs
+++ b/benches/opaque.rs
@@ -7,8 +7,8 @@ extern crate criterion;
 
 use criterion::Criterion;
 use opaque_vx::*;
-use rand::rngs::SysRng;
 use rand::rand_core::UnwrapErr;
+use rand::rngs::SysRng;
 
 #[cfg(feature = "ristretto255")]
 static SUFFIX: &str = "ristretto255";
diff --git a/src/key_exchange/group/ed25519.rs b/src/key_exchange/group/ed25519.rs
index 6dd6e3f..9abe645 100644
--- a/src/key_exchange/group/ed25519.rs
+++ b/src/key_exchange/group/ed25519.rs
@@ -429,8 +429,8 @@ mod test {
     use std::iter;
 
     use ed25519_dalek::{Signer, SigningKey, Verifier, VerifyingKey};
-    use rand::rngs::SysRng;
     use rand::rand_core::UnwrapErr;
+    use rand::rngs::SysRng;
 
     use super::*;
 
diff --git a/src/key_exchange/sigma_i/ecdsa.rs b/src/key_exchange/sigma_i/ecdsa.rs
index a532df0..0f8bbe2 100644
--- a/src/key_exchange/sigma_i/ecdsa.rs
+++ b/src/key_exchange/sigma_i/ecdsa.rs
@@ -111,8 +111,8 @@ fn ecdsa() {
     use p256::ecdsa::signature::RandomizedDigestSigner;
     use p256::ecdsa::{Signature, SigningKey, VerifyingKey};
     use p256::{NistP256, PublicKey};
-    use rand::rngs::SysRng;
     use rand::rand_core::UnwrapErr;
+    use rand::rngs::SysRng;
     use sha2::Sha256;
 
     use crate::tests::mock_rng::CycleRng;
diff --git a/src/keypair.rs b/src/keypair.rs
index 8898af9..0e6104d 100644
--- a/src/keypair.rs
+++ b/src/keypair.rs
@@ -307,8 +307,8 @@ mod tests {
         ServerRegistrationStartResult, ServerSetup,
     };
     use hkdf::Hkdf;
-    use rand::rngs::SysRng;
     use rand::rand_core::UnwrapErr;
+    use rand::rngs::SysRng;
 
     macro_rules! test {
         ($mod:ident, $point:ty) => {
diff --git a/src/serialization/tests.rs b/src/serialization/tests.rs
index 42d8dec..10751e4 100644
--- a/src/serialization/tests.rs
+++ b/src/serialization/tests.rs
@@ -12,8 +12,8 @@ use generic_array::typenum::{Sum, Unsigned};
 use proptest::collection::vec;
 use proptest::prelude::*;
 use rand::Rng;
-use rand::rngs::SysRng;
 use rand::rand_core::UnwrapErr;
+use rand::rngs::SysRng;
 use voprf::Group as _;
 
 use crate::ciphersuite::{CipherSuite, KeGroup, OprfGroup, OprfHash};
diff --git a/src/tests/full_test.rs b/src/tests/full_test.rs
index 6013d91..b28f86c 100644
--- a/src/tests/full_test.rs
+++ b/src/tests/full_test.rs
@@ -15,9 +15,9 @@ use generic_array::{ArrayLength, GenericArray};
 #[cfg(feature = "kem")]
 use ml_kem::MlKem768;
 use rand::SeedableRng;
+use rand::rand_core::UnwrapErr;
 use rand::rngs::SysRng;
 use rand_chacha::ChaCha20Rng;
-use rand::rand_core::UnwrapErr;
 use serde_json::Value;
 use subtle::ConstantTimeEq;
 use voprf::Group as _;
diff --git a/src/tests/test_opaque_vectors.rs b/src/tests/test_opaque_vectors.rs
index d16ce61..e9eb604 100644
--- a/src/tests/test_opaque_vectors.rs
+++ b/src/tests/test_opaque_vectors.rs
@@ -26,8 +26,8 @@ use digest::OutputSizeUser;
 use generic_array::typenum::Sum;
 use generic_array::{ArrayLength, GenericArray};
 use rand::Rng;
-use rand::rngs::SysRng;
 use rand::rand_core::UnwrapErr;
+use rand::rngs::SysRng;
 use serde_json::Value;
 
 #[allow(non_snake_case)]