diff --git a/crypto/tests/test_check.c b/crypto/tests/test_check.c
index 12a604ba4..91b9fac16 100644
--- a/crypto/tests/test_check.c
+++ b/crypto/tests/test_check.c
@@ -73,6 +73,7 @@
 #include "slip39_wordlist.h"
 #include "zkp_context.h"
 #include "zkp_ecdsa.h"
+#include "zkp_schnorr.h"
 
 #if VALGRIND
 /*
@@ -9152,6 +9153,150 @@ START_TEST(test_schnorr_verify_digest) {
 }
 END_TEST
 
+START_TEST(test_zkp_schnorr_sign) {
+  static struct {
+    const char *priv_key;
+    const char *pub_key;
+    const char *aux_input;
+    const char *digest;
+    const char *sig;
+  } tests[] = {
+      // Test vectors from
+      // https://github.com/bitcoin/bips/blob/master/bip-0340/test-vectors.csv
+      {"0000000000000000000000000000000000000000000000000000000000000003",
+       "F9308A019258C31049344F85F89D5229B531C845836F99B08601F113BCE036F9",
+       "0000000000000000000000000000000000000000000000000000000000000000",
+       "0000000000000000000000000000000000000000000000000000000000000000",
+       "E907831F80848D1069A5371B402410364BDF1C5F8307B0084C55F1CE2DCA821525F66A4"
+       "A85EA8B71E482A74F382D2CE5EBEEE8FDB2172F477DF4900D310536C0"},
+      {"B7E151628AED2A6ABF7158809CF4F3C762E7160F38B4DA56A784D9045190CFEF",
+       "DFF1D77F2A671C5F36183726DB2341BE58FEAE1DA2DECED843240F7B502BA659",
+       "0000000000000000000000000000000000000000000000000000000000000001",
+       "243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89",
+       "6896BD60EEAE296DB48A229FF71DFE071BDE413E6D43F917DC8DCF8C78DE33418906D11"
+       "AC976ABCCB20B091292BFF4EA897EFCB639EA871CFA95F6DE339E4B0A"},
+      {"C90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B14E5C9",
+       "DD308AFEC5777E13121FA72B9CC1B7CC0139715309B086C960E18FD969774EB8",
+       "C87AA53824B4D7AE2EB035A2B5BBBCCC080E76CDC6D1692C4B0B62D798E6D906",
+       "7E2D58D8B3BCDF1ABADEC7829054F90DDA9805AAB56C77333024B9D0A508B75C",
+       "5831AAEED7B44BB74E5EAB94BA9D4294C49BCF2A60728D8B4C200F50DD313C1BAB74587"
+       "9A5AD954A72C45A91C3A51D3C7ADEA98D82F8481E0E1E03674A6F3FB7"},
+      {"0B432B2677937381AEF05BB02A66ECD012773062CF3FA2549E44F58ED2401710",
+       "25D1DFF95105F5253C4022F628A996AD3A0D95FBF21D468A1B33F8C160D8F517",
+       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
+       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
+       "7EB0509757E246F19449885651611CB965ECC1A187DD51B64FDA1EDC9637D5EC97582B9"
+       "CB13DB3933705B32BA982AF5AF25FD78881EBB32771FC5922EFC66EA3"}};
+
+  int res = 0;
+  uint8_t priv_key[32] = {0};
+  uint8_t expected_pub_key[32] = {0};
+  uint8_t aux_input[32] = {0};
+  uint8_t digest[32] = {0};
+  uint8_t expected_sig[32] = {0};
+  uint8_t pub_key[32] = {0};
+  uint8_t sig[32] = {0};
+
+  for (size_t i = 0; i < sizeof(tests) / sizeof(*tests); i++) {
+    memcpy(priv_key, fromhex(tests[i].priv_key), 32);
+    memcpy(expected_pub_key, fromhex(tests[i].pub_key), 32);
+    memcpy(aux_input, fromhex(tests[i].aux_input), 32);
+    memcpy(digest, fromhex(tests[i].digest), 32);
+    memcpy(expected_sig, fromhex(tests[i].sig), 32);
+
+    zkp_schnorr_get_public_key(priv_key, pub_key);
+    ck_assert_mem_eq(expected_pub_key, pub_key, 32);
+
+    res = zkp_schnorr_sign_digest(priv_key, digest, sig, aux_input);
+    ck_assert_mem_eq(expected_sig, sig, 32);
+    ck_assert_int_eq(res, 0);
+  }
+}
+END_TEST
+
+START_TEST(test_zkp_schnorr_verify) {
+  static struct {
+    const char *pub_key;
+    const char *digest;
+    const char *sig;
+    const int res;
+  } tests[] = {
+      // Test vectors from
+      // https://github.com/bitcoin/bips/blob/master/bip-0340/test-vectors.csv
+      {"D69C3509BB99E412E68B0FE8544E72837DFA30746D8BE2AA65975F29D22DC7B9",
+       "4DF3C3F68FCC83B27E9D42C90431A72499F17875C81A599B566C9889B9696703",
+       "00000000000000000000003B78CE563F89A0ED9414F5AA28AD0D96D6795F9C6376AFB15"
+       "48AF603B3EB45C9F8207DEE1060CB71C04E80F593060B07D28308D7F4",
+       0},
+      {"EEFDEA4CDB677750A420FEE807EACF21EB9898AE79B9768766E4FAA04A2D4A34",
+       "243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89",
+       "6CFF5C3BA86C69EA4B7376F31A9BCB4F74C1976089B2D9963DA2E5543E17776969E89B4"
+       "C5564D00349106B8497785DD7D1D713A8AE82B32FA79D5F7FC407D39B",
+       1},
+      {"DFF1D77F2A671C5F36183726DB2341BE58FEAE1DA2DECED843240F7B502BA659",
+       "243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89",
+       "FFF97BD5755EEEA420453A14355235D382F6472F8568A18B2F057A14602975563CC2794"
+       "4640AC607CD107AE10923D9EF7A73C643E166BE5EBEAFA34B1AC553E2",
+       5},
+      {"DFF1D77F2A671C5F36183726DB2341BE58FEAE1DA2DECED843240F7B502BA659",
+       "243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89",
+       "1FA62E331EDBC21C394792D2AB1100A7B432B013DF3F6FF4F99FCB33E0E1515F28890B3"
+       "EDB6E7189B630448B515CE4F8622A954CFE545735AAEA5134FCCDB2BD",
+       5},
+      {"DFF1D77F2A671C5F36183726DB2341BE58FEAE1DA2DECED843240F7B502BA659",
+       "243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89",
+       "6CFF5C3BA86C69EA4B7376F31A9BCB4F74C1976089B2D9963DA2E5543E177769961764B"
+       "3AA9B2FFCB6EF947B6887A226E8D7C93E00C5ED0C1834FF0D0C2E6DA6",
+       5},
+      {"DFF1D77F2A671C5F36183726DB2341BE58FEAE1DA2DECED843240F7B502BA659",
+       "243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89",
+       "0000000000000000000000000000000000000000000000000000000000000000123DDA8"
+       "328AF9C23A94C1FEECFD123BA4FB73476F0D594DCB65C6425BD186051",
+       5},
+      {"DFF1D77F2A671C5F36183726DB2341BE58FEAE1DA2DECED843240F7B502BA659",
+       "243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89",
+       "00000000000000000000000000000000000000000000000000000000000000017615FBA"
+       "F5AE28864013C099742DEADB4DBA87F11AC6754F93780D5A1837CF197",
+       5},
+      {"DFF1D77F2A671C5F36183726DB2341BE58FEAE1DA2DECED843240F7B502BA659",
+       "243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89",
+       "4A298DACAE57395A15D0795DDBFD1DCB564DA82B0F269BC70A74F8220429BA1D69E89B4"
+       "C5564D00349106B8497785DD7D1D713A8AE82B32FA79D5F7FC407D39B",
+       5},
+      {"DFF1D77F2A671C5F36183726DB2341BE58FEAE1DA2DECED843240F7B502BA659",
+       "243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89",
+       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F69E89B4"
+       "C5564D00349106B8497785DD7D1D713A8AE82B32FA79D5F7FC407D39B",
+       5},
+      {"DFF1D77F2A671C5F36183726DB2341BE58FEAE1DA2DECED843240F7B502BA659",
+       "243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89",
+       "6CFF5C3BA86C69EA4B7376F31A9BCB4F74C1976089B2D9963DA2E5543E177769FFFFFFF"
+       "FFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141",
+       5},
+      {"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC30",
+       "243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89",
+       "6CFF5C3BA86C69EA4B7376F31A9BCB4F74C1976089B2D9963DA2E5543E17776969E89B4"
+       "C5564D00349106B8497785DD7D1D713A8AE82B32FA79D5F7FC407D39B",
+       1}
+
+  };
+
+  int res = 0;
+  uint8_t pub_key[32] = {0};
+  uint8_t digest[32] = {0};
+  uint8_t sig[64] = {0};
+
+  for (size_t i = 0; i < sizeof(tests) / sizeof(*tests); i++) {
+    memcpy(pub_key, fromhex(tests[i].pub_key), 32);
+    memcpy(digest, fromhex(tests[i].digest), 32);
+    memcpy(sig, fromhex(tests[i].sig), 64);
+
+    res = zkp_schnorr_verify_digest(pub_key, sig, digest);
+    ck_assert_int_eq(res, tests[i].res);
+  }
+}
+END_TEST
+
 static int my_strncasecmp(const char *s1, const char *s2, size_t n) {
   size_t i = 0;
   while (i < n) {
@@ -9464,6 +9609,11 @@ Suite *test_suite(void) {
   tcase_add_test(tc, test_schnorr_verify_digest);
   suite_add_tcase(s, tc);
 
+  tc = tcase_create("zkp_schnorr");
+  tcase_add_test(tc, test_zkp_schnorr_sign);
+  tcase_add_test(tc, test_zkp_schnorr_verify);
+  suite_add_tcase(s, tc);
+
 #if USE_CARDANO
   tc = tcase_create("bip32-cardano");