diff --git a/crypto/schnorr/Cargo.toml b/crypto/schnorr/Cargo.toml
index e99fe96d..f26b3e13 100644
--- a/crypto/schnorr/Cargo.toml
+++ b/crypto/schnorr/Cargo.toml
@@ -25,6 +25,7 @@ ciphersuite = { path = "../ciphersuite", version = "0.1" }
 multiexp = { path = "../multiexp", version = "0.2", features = ["batch"] }
 
 [dev-dependencies]
-blake2 = "0.10"
+hex = "0.4"
+sha2 = "0.10"
 dalek-ff-group = { path =  "../dalek-ff-group", version = "^0.1.2" }
-ciphersuite = { path = "../ciphersuite", version = "0.1", features = ["ristretto"] }
+ciphersuite = { path = "../ciphersuite", version = "0.1", features = ["ed25519"] }
diff --git a/crypto/schnorr/src/tests.rs b/crypto/schnorr/src/tests/mod.rs
similarity index 90%
rename from crypto/schnorr/src/tests.rs
rename to crypto/schnorr/src/tests/mod.rs
index 7a912767..e70460d9 100644
--- a/crypto/schnorr/src/tests.rs
+++ b/crypto/schnorr/src/tests/mod.rs
@@ -1,22 +1,22 @@
 use core::ops::Deref;
 
+use zeroize::Zeroizing;
 use rand_core::OsRng;
 
-use zeroize::Zeroizing;
-
-use blake2::{digest::typenum::U32, Blake2b};
-type Blake2b256 = Blake2b<U32>;
+use sha2::Sha256;
 
 use group::{ff::Field, Group};
-
 use multiexp::BatchVerifier;
 
-use ciphersuite::{Ciphersuite, Ristretto};
+use ciphersuite::{Ciphersuite, Ed25519};
+
 use crate::{
   SchnorrSignature,
   aggregate::{SchnorrAggregator, SchnorrAggregate},
 };
 
+mod rfc8032;
+
 pub(crate) fn sign<C: Ciphersuite>() {
   let private_key = Zeroizing::new(C::random_nonzero_F(&mut OsRng));
   let nonce = Zeroizing::new(C::random_nonzero_F(&mut OsRng));
@@ -82,7 +82,7 @@ pub(crate) fn aggregate<C: Ciphersuite>() {
   // Create 5 signatures
   let mut keys = vec![];
   let mut challenges = vec![];
-  let mut aggregator = SchnorrAggregator::<Blake2b256, C>::new();
+  let mut aggregator = SchnorrAggregator::<Sha256, C>::new();
   for i in 0 .. 5 {
     keys.push(Zeroizing::new(C::random_nonzero_F(&mut OsRng)));
     challenges.push(C::random_nonzero_F(&mut OsRng));
@@ -100,7 +100,7 @@ pub(crate) fn aggregate<C: Ciphersuite>() {
   let aggregate = aggregator.complete().unwrap();
   let aggregate =
     SchnorrAggregate::<C>::read::<&[u8]>(&mut aggregate.serialize().as_ref()).unwrap();
-  assert!(aggregate.verify::<Blake2b256>(
+  assert!(aggregate.verify::<Sha256>(
     keys
       .iter()
       .map(|key| C::generator() * key.deref())
@@ -112,8 +112,8 @@ pub(crate) fn aggregate<C: Ciphersuite>() {
 
 #[test]
 fn test() {
-  sign::<Ristretto>();
-  verify::<Ristretto>();
-  batch_verify::<Ristretto>();
-  aggregate::<Ristretto>();
+  sign::<Ed25519>();
+  verify::<Ed25519>();
+  batch_verify::<Ed25519>();
+  aggregate::<Ed25519>();
 }
diff --git a/crypto/schnorr/src/tests/rfc8032.rs b/crypto/schnorr/src/tests/rfc8032.rs
new file mode 100644
index 00000000..001927ac
--- /dev/null
+++ b/crypto/schnorr/src/tests/rfc8032.rs
@@ -0,0 +1,60 @@
+// RFC 8032 Ed25519 test vectors
+// The s = r + cx format modernly used for Schnorr signatures was popularized by EdDSA
+// While not all RFC 8032 signatures will work with this library, any canonical ones will, and
+// these vectors are canonical
+
+use sha2::{Digest, Sha512};
+
+use group::GroupEncoding;
+use dalek_ff_group::Scalar;
+use ciphersuite::{Ciphersuite, Ed25519};
+
+use crate::SchnorrSignature;
+
+// Public key, message, signature
+#[rustfmt::skip]
+const VECTORS: [(&str, &str, &str); 5] = [
+  (
+    "d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a",
+    "",
+    "e5564300c360ac729086e2cc806e828a84877f1eb8e5d974d873e065224901555fb8821590a33bacc61e39701cf9b46bd25bf5f0595bbe24655141438e7a100b"
+  ),
+
+  (
+    "3d4017c3e843895a92b70aa74d1b7ebc9c982ccf2ec4968cc0cd55f12af4660c",
+    "72",
+    "92a009a9f0d4cab8720e820b5f642540a2b27b5416503f8fb3762223ebdb69da085ac1e43e15996e458f3613d0f11d8c387b2eaeb4302aeeb00d291612bb0c00"
+  ),
+
+  (
+    "fc51cd8e6218a1a38da47ed00230f0580816ed13ba3303ac5deb911548908025",
+    "af82",
+    "6291d657deec24024827e69c3abe01a30ce548a284743a445e3680d7db5ac3ac18ff9b538d16f290ae67f760984dc6594a7c15e9716ed28dc027beceea1ec40a"
+  ),
+
+  (
+    "278117fc144c72340f67d0f2316e8386ceffbf2b2428c9c51fef7c597f1d426e",
+    "08b8b2b733424243760fe426a4b54908632110a66c2f6591eabd3345e3e4eb98fa6e264bf09efe12ee50f8f54e9f77b1e355f6c50544e23fb1433ddf73be84d879de7c0046dc4996d9e773f4bc9efe5738829adb26c81b37c93a1b270b20329d658675fc6ea534e0810a4432826bf58c941efb65d57a338bbd2e26640f89ffbc1a858efcb8550ee3a5e1998bd177e93a7363c344fe6b199ee5d02e82d522c4feba15452f80288a821a579116ec6dad2b3b310da903401aa62100ab5d1a36553e06203b33890cc9b832f79ef80560ccb9a39ce767967ed628c6ad573cb116dbefefd75499da96bd68a8a97b928a8bbc103b6621fcde2beca1231d206be6cd9ec7aff6f6c94fcd7204ed3455c68c83f4a41da4af2b74ef5c53f1d8ac70bdcb7ed185ce81bd84359d44254d95629e9855a94a7c1958d1f8ada5d0532ed8a5aa3fb2d17ba70eb6248e594e1a2297acbbb39d502f1a8c6eb6f1ce22b3de1a1f40cc24554119a831a9aad6079cad88425de6bde1a9187ebb6092cf67bf2b13fd65f27088d78b7e883c8759d2c4f5c65adb7553878ad575f9fad878e80a0c9ba63bcbcc2732e69485bbc9c90bfbd62481d9089beccf80cfe2df16a2cf65bd92dd597b0707e0917af48bbb75fed413d238f5555a7a569d80c3414a8d0859dc65a46128bab27af87a71314f318c782b23ebfe808b82b0ce26401d2e22f04d83d1255dc51addd3b75a2b1ae0784504df543af8969be3ea7082ff7fc9888c144da2af58429ec96031dbcad3dad9af0dcbaaaf268cb8fcffead94f3c7ca495e056a9b47acdb751fb73e666c6c655ade8297297d07ad1ba5e43f1bca32301651339e22904cc8c42f58c30c04aafdb038dda0847dd988dcda6f3bfd15c4b4c4525004aa06eeff8ca61783aacec57fb3d1f92b0fe2fd1a85f6724517b65e614ad6808d6f6ee34dff7310fdc82aebfd904b01e1dc54b2927094b2db68d6f903b68401adebf5a7e08d78ff4ef5d63653a65040cf9bfd4aca7984a74d37145986780fc0b16ac451649de6188a7dbdf191f64b5fc5e2ab47b57f7f7276cd419c17a3ca8e1b939ae49e488acba6b965610b5480109c8b17b80e1b7b750dfc7598d5d5011fd2dcc5600a32ef5b52a1ecc820e308aa342721aac0943bf6686b64b2579376504ccc493d97e6aed3fb0f9cd71a43dd497f01f17c0e2cb3797aa2a2f256656168e6c496afc5fb93246f6b1116398a346f1a641f3b041e989f7914f90cc2c7fff357876e506b50d334ba77c225bc307ba537152f3f1610e4eafe595f6d9d90d11faa933a15ef1369546868a7f3a45a96768d40fd9d03412c091c6315cf4fde7cb68606937380db2eaaa707b4c4185c32eddcdd306705e4dc1ffc872eeee475a64dfac86aba41c0618983f8741c5ef68d3a101e8a3b8cac60c905c15fc910840b94c00a0b9d0",
+    "0aab4c900501b3e24d7cdf4663326a3a87df5e4843b2cbdb67cbf6e460fec350aa5371b1508f9f4528ecea23c436d94b5e8fcd4f681e30a6ac00a9704a188a03"
+  ),
+
+  (
+    "ec172b93ad5e563bf4932c70e1245034c35467ef2efd4d64ebf819683467e2bf",
+    "ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f",
+    "dc2a4459e7369633a52b1bf277839a00201009a3efbf3ecb69bea2186c26b58909351fc9ac90b3ecfdfbc7c66431e0303dca179c138ac17ad9bef1177331a704"
+  ),
+];
+
+#[test]
+fn test_rfc8032() {
+  for vector in VECTORS {
+    let key = Ed25519::read_G::<&[u8]>(&mut hex::decode(vector.0).unwrap().as_ref()).unwrap();
+    let sig =
+      SchnorrSignature::<Ed25519>::read::<&[u8]>(&mut hex::decode(vector.2).unwrap().as_ref())
+        .unwrap();
+    let hram = Sha512::new_with_prefix(
+      &[sig.R.to_bytes().as_ref(), &key.to_bytes(), &hex::decode(vector.1).unwrap()].concat(),
+    );
+    assert!(sig.verify(key, Scalar::from_hash(hram)));
+  }
+}