diff --git a/.github/workflows/motoko-threshold-schnorr-example.yaml b/.github/workflows/motoko-threshold-schnorr-example.yaml
index 68e774f0d..2ef3f35c5 100644
--- a/.github/workflows/motoko-threshold-schnorr-example.yaml
+++ b/.github/workflows/motoko-threshold-schnorr-example.yaml
@@ -21,7 +21,6 @@ jobs:
         run: bash .github/workflows/provision-darwin.sh
       - name: Motoko Threshold Schnorr Darwin
         run: |
-          dfxvm default 0.22.0-beta.0
           dfx start --background
           npm install @noble/curves
           pushd motoko/threshold-schnorr
@@ -34,7 +33,6 @@ jobs:
         run: bash .github/workflows/provision-linux.sh
       - name: Motoko Threshold Schnorr Linux
         run: |
-          dfxvm default 0.22.0-beta.0
           dfx start --background
           npm install @noble/curves
           pushd motoko/threshold-schnorr
diff --git a/rust/threshold-schnorr/Makefile b/rust/threshold-schnorr/Makefile
index 07fd3fbfb..c277d4a9e 100644
--- a/rust/threshold-schnorr/Makefile
+++ b/rust/threshold-schnorr/Makefile
@@ -1,6 +1,11 @@
 .PHONY: all
 all: build
 
+.PHONY: build
+.SILENT: build
+build:
+	dfx build --check
+
 .PHONY: deploy
 .SILENT: deploy
 deploy:
@@ -8,7 +13,7 @@ deploy:
 
 .PHONY: test
 .SILENT: test
-test:
+test: build
 	cargo test
 
 .PHONY: clean
diff --git a/rust/threshold-schnorr/src/schnorr_example_rust/src/wasm_only.rs b/rust/threshold-schnorr/src/schnorr_example_rust/src/wasm_only.rs
index 1aa02d4db..f9fef1fe7 100644
--- a/rust/threshold-schnorr/src/schnorr_example_rust/src/wasm_only.rs
+++ b/rust/threshold-schnorr/src/schnorr_example_rust/src/wasm_only.rs
@@ -42,7 +42,7 @@ async fn public_key(algorithm: SchnorrAlgorithm) -> Result<PublicKeyReply, Strin
     let request = ManagementCanisterSchnorrPublicKeyRequest {
         canister_id: None,
         derivation_path: vec![ic_cdk::api::caller().as_slice().to_vec()],
-        key_id: SchnorrKeyIds::TestKeyLocalDevelopment.to_key_id(algorithm),
+        key_id: SchnorrKeyIds::TestKey1.to_key_id(algorithm),
     };
 
     let (res,): (ManagementCanisterSchnorrPublicKeyReply,) = ic_cdk::call(
@@ -63,7 +63,7 @@ async fn sign(message: String, algorithm: SchnorrAlgorithm) -> Result<SignatureR
     let internal_request = ManagementCanisterSignatureRequest {
         message: message.as_bytes().to_vec(),
         derivation_path: vec![ic_cdk::api::caller().as_slice().to_vec()],
-        key_id: SchnorrKeyIds::TestKeyLocalDevelopment.to_key_id(algorithm),
+        key_id: SchnorrKeyIds::TestKey1.to_key_id(algorithm),
     };
 
     let (internal_reply,): (ManagementCanisterSignatureReply,) =
@@ -71,7 +71,7 @@ async fn sign(message: String, algorithm: SchnorrAlgorithm) -> Result<SignatureR
             Principal::management_canister(),
             "sign_with_schnorr",
             (internal_request,),
-            25_000_000_000,
+            26_153_846_153,
         )
         .await
         .map_err(|e| format!("sign_with_schnorr failed {e:?}"))?;
diff --git a/rust/threshold-schnorr/src/schnorr_example_rust/tests/tests.rs b/rust/threshold-schnorr/src/schnorr_example_rust/tests/tests.rs
index 5600b14af..1eb1b78cf 100644
--- a/rust/threshold-schnorr/src/schnorr_example_rust/tests/tests.rs
+++ b/rust/threshold-schnorr/src/schnorr_example_rust/tests/tests.rs
@@ -1,5 +1,5 @@
 use candid::{decode_one, encode_args, encode_one, CandidType, Principal};
-use pocket_ic::{PocketIc, WasmResult};
+use pocket_ic::{PocketIc, PocketIcBuilder, WasmResult};
 use schnorr_example_rust::{
     PublicKeyReply, SchnorrAlgorithm, SignatureReply, SignatureVerificationReply,
 };
@@ -11,7 +11,11 @@ fn signing_and_verification_should_work_correctly() {
     const ALGORITHMS: [SchnorrAlgorithm; 2] =
         [SchnorrAlgorithm::Bip340Secp256k1, SchnorrAlgorithm::Ed25519];
 
-    let pic = PocketIc::new();
+    let pic = PocketIcBuilder::new()
+        .with_application_subnet()
+        .with_ii_subnet()
+        .with_fiduciary_subnet()
+        .build();
 
     for algorithm in ALGORITHMS {
         for _trial in 0..5 {
@@ -33,14 +37,19 @@ fn test_impl(pic: &PocketIc, algorithm: SchnorrAlgorithm) {
     // Make sure the canister is properly initialized
     fast_forward(&pic, 5);
 
-    let message_hex = hex::encode("Test message");
+    // a message we can reverse to break the signature
+    // currently pocket IC only supports 32B messages for BIP340
+    let message: String = std::iter::repeat('a')
+        .take(16)
+        .chain(std::iter::repeat('b').take(16))
+        .collect();
 
     let sig_reply: Result<SignatureReply, String> = update(
         &pic,
         my_principal,
         example_canister_id,
         "sign",
-        encode_args((message_hex.clone(), algorithm)).unwrap(),
+        encode_args((message.clone(), algorithm)).unwrap(),
     );
 
     let signature_hex = sig_reply.expect("failed to sign").signature_hex;
@@ -63,7 +72,7 @@ fn test_impl(pic: &PocketIc, algorithm: SchnorrAlgorithm) {
             "verify",
             encode_args((
                 signature_hex.clone(),
-                message_hex.clone(),
+                message.clone(),
                 public_key_hex.clone(),
                 algorithm,
             ))
@@ -81,7 +90,7 @@ fn test_impl(pic: &PocketIc, algorithm: SchnorrAlgorithm) {
             "verify",
             encode_args((
                 clone_and_reverse_chars(&signature_hex),
-                message_hex.clone(),
+                message.clone(),
                 public_key_hex.clone(),
                 algorithm,
             ))
@@ -99,7 +108,7 @@ fn test_impl(pic: &PocketIc, algorithm: SchnorrAlgorithm) {
             "verify",
             encode_args((
                 signature_hex.clone(),
-                clone_and_reverse_chars(&message_hex),
+                clone_and_reverse_chars(&message),
                 public_key_hex.clone(),
                 algorithm,
             ))
@@ -117,7 +126,7 @@ fn test_impl(pic: &PocketIc, algorithm: SchnorrAlgorithm) {
             "verify",
             encode_args((
                 signature_hex.clone(),
-                message_hex.clone(),
+                message.clone(),
                 clone_and_reverse_chars(&public_key_hex),
                 algorithm,
             ))
@@ -138,7 +147,7 @@ fn test_impl(pic: &PocketIc, algorithm: SchnorrAlgorithm) {
             "verify",
             encode_args((
                 signature_hex.clone(),
-                message_hex.clone(),
+                message.clone(),
                 public_key_hex.clone(),
                 other_algorithm(algorithm),
             ))