diff --git a/Tests/LibCrypto/TestCurves.cpp b/Tests/LibCrypto/TestCurves.cpp
index 8d599632291..356cb4416a1 100644
--- a/Tests/LibCrypto/TestCurves.cpp
+++ b/Tests/LibCrypto/TestCurves.cpp
@@ -327,3 +327,116 @@ TEST_CASE(test_secp384r1)
     EXPECT_EQ(expected_public_key.x, generated_public.x);
     EXPECT_EQ(expected_public_key.y, generated_public.y);
 }
+
+TEST_CASE(test_secp521r1)
+{
+    // clang-format off
+    Array<u8, 66> alice_private_key_data {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x01,
+    };
+
+    Array<u8, 133> alice_public_key_data {
+        0x04, 0x00, 0xC6, 0x85, 0x8E, 0x06, 0xB7, 0x04, 0x04, 0xE9, 0xCD, 0x9E, 0x3E, 0xCB, 0x66, 0x23,
+        0x95, 0xB4, 0x42, 0x9C, 0x64, 0x81, 0x39, 0x05, 0x3F, 0xB5, 0x21, 0xF8, 0x28, 0xAF, 0x60, 0x6B,
+        0x4D, 0x3D, 0xBA, 0xA1, 0x4B, 0x5E, 0x77, 0xEF, 0xE7, 0x59, 0x28, 0xFE, 0x1D, 0xC1, 0x27, 0xA2,
+        0xFF, 0xA8, 0xDE, 0x33, 0x48, 0xB3, 0xC1, 0x85, 0x6A, 0x42, 0x9B, 0xF9, 0x7E, 0x7E, 0x31, 0xC2,
+        0xE5, 0xBD, 0x66, 0x01, 0x18, 0x39, 0x29, 0x6A, 0x78, 0x9A, 0x3B, 0xC0, 0x04, 0x5C, 0x8A, 0x5F,
+        0xB4, 0x2C, 0x7D, 0x1B, 0xD9, 0x98, 0xF5, 0x44, 0x49, 0x57, 0x9B, 0x44, 0x68, 0x17, 0xAF, 0xBD,
+        0x17, 0x27, 0x3E, 0x66, 0x2C, 0x97, 0xEE, 0x72, 0x99, 0x5E, 0xF4, 0x26, 0x40, 0xC5, 0x50, 0xB9,
+        0x01, 0x3F, 0xAD, 0x07, 0x61, 0x35, 0x3C, 0x70, 0x86, 0xA2, 0x72, 0xC2, 0x40, 0x88, 0xBE, 0x94,
+        0x76, 0x9F, 0xD1, 0x66, 0x50
+    };
+
+    Array<u8, 66> bob_private_key_data {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x02,
+    };
+
+    Array<u8, 133> bob_public_key_data {
+        0x04,
+        0x00, 0x43, 0x3C, 0x21, 0x90, 0x24, 0x27, 0x7E, 0x7E, 0x68, 0x2F, 0xCB, 0x28, 0x81, 0x48,
+        0xC2, 0x82, 0x74, 0x74, 0x03, 0x27, 0x9B, 0x1C, 0xCC, 0x06, 0x35, 0x2C, 0x6E, 0x55, 0x05, 0xD7,
+        0x69, 0xBE, 0x97, 0xB3, 0xB2, 0x04, 0xDA, 0x6E, 0xF5, 0x55, 0x07, 0xAA, 0x10, 0x4A, 0x3A, 0x35,
+        0xC5, 0xAF, 0x41, 0xCF, 0x2F, 0xA3, 0x64, 0xD6, 0x0F, 0xD9, 0x67, 0xF4, 0x3E, 0x39, 0x33, 0xBA,
+        0x6D, 0x78, 0x3D, 0x00, 0xF4, 0xBB, 0x8C, 0xC7, 0xF8, 0x6D, 0xB2, 0x67, 0x00, 0xA7, 0xF3, 0xEC,
+        0xEE, 0xEE, 0xD3, 0xF0, 0xB5, 0xC6, 0xB5, 0x10, 0x7C, 0x4D, 0xA9, 0x77, 0x40, 0xAB, 0x21, 0xA2,
+        0x99, 0x06, 0xC4, 0x2D, 0xBB, 0xB3, 0xE3, 0x77, 0xDE, 0x9F, 0x25, 0x1F, 0x6B, 0x93, 0x93, 0x7F,
+        0xA9, 0x9A, 0x32, 0x48, 0xF4, 0xEA, 0xFC, 0xBE, 0x95, 0xED, 0xC0, 0xF4, 0xF7, 0x1B, 0xE3, 0x56,
+        0xD6, 0x61, 0xF4, 0x1B, 0x02
+    };
+
+    Array<u8, 133> shared_secret_data {
+        0x04,
+        0x00, 0x43, 0x3C, 0x21, 0x90, 0x24, 0x27, 0x7E, 0x7E, 0x68, 0x2F, 0xCB, 0x28, 0x81, 0x48,
+        0xC2, 0x82, 0x74, 0x74, 0x03, 0x27, 0x9B, 0x1C, 0xCC, 0x06, 0x35, 0x2C, 0x6E, 0x55, 0x05, 0xD7,
+        0x69, 0xBE, 0x97, 0xB3, 0xB2, 0x04, 0xDA, 0x6E, 0xF5, 0x55, 0x07, 0xAA, 0x10, 0x4A, 0x3A, 0x35,
+        0xC5, 0xAF, 0x41, 0xCF, 0x2F, 0xA3, 0x64, 0xD6, 0x0F, 0xD9, 0x67, 0xF4, 0x3E, 0x39, 0x33, 0xBA,
+        0x6D, 0x78, 0x3D, 0x00, 0xF4, 0xBB, 0x8C, 0xC7, 0xF8, 0x6D, 0xB2, 0x67, 0x00, 0xA7, 0xF3, 0xEC,
+        0xEE, 0xEE, 0xD3, 0xF0, 0xB5, 0xC6, 0xB5, 0x10, 0x7C, 0x4D, 0xA9, 0x77, 0x40, 0xAB, 0x21, 0xA2,
+        0x99, 0x06, 0xC4, 0x2D, 0xBB, 0xB3, 0xE3, 0x77, 0xDE, 0x9F, 0x25, 0x1F, 0x6B, 0x93, 0x93, 0x7F,
+        0xA9, 0x9A, 0x32, 0x48, 0xF4, 0xEA, 0xFC, 0xBE, 0x95, 0xED, 0xC0, 0xF4, 0xF7, 0x1B, 0xE3, 0x56,
+        0xD6, 0x61, 0xF4, 0x1B, 0x02
+    };
+
+    Array<u8, 66> private_key_data {
+        0x69, 0x8B, 0x78, 0x37, 0xD0, 0x3A, 0xBC, 0xEB, 0xAD, 0xB7, 0x73, 0xB9, 0x38, 0xC3, 0x55, 0xB2,
+        0x7F, 0x23, 0x4D, 0x35, 0x65, 0x93, 0xF7, 0xBC, 0xE5, 0x2, 0xDB, 0xE4, 0x8E, 0xB4, 0x6E, 0x99,
+        0x70, 0x8D, 0x3C, 0x39, 0x42, 0x18, 0xFA, 0xBC, 0x17, 0xED, 0x96, 0x70, 0x2F, 0xB2, 0xAB, 0x41,
+        0xD3, 0xD8, 0xF6, 0x33, 0x33, 0x75, 0x9B, 0xAD, 0x4D, 0x3C, 0x98, 0x20, 0xC3, 0x1F, 0xC5, 0xA8,
+        0x60, 0xA
+    };
+
+    Array<u8, 133> expected_public_key_data {
+        0x04,
+        0x00, 0x08, 0x25, 0x26, 0x8B, 0x37, 0xB0, 0x98, 0xC7, 0x91, 0xFD, 0xF1, 0x06, 0x14, 0xC9,
+        0x42, 0x1C, 0x74, 0x82, 0x69, 0x5C, 0xF2, 0x31, 0x0D, 0x22, 0x1B, 0xDF, 0xED, 0x70, 0x3D, 0xA2,
+        0xC6, 0xA3, 0xB6, 0x0C, 0xB8, 0x28, 0xD5, 0xB2, 0x0A, 0x6C, 0xE8, 0x9C, 0xBF, 0x8F, 0x7C, 0x50,
+        0x67, 0x3F, 0xEB, 0x34, 0x91, 0xF0, 0x83, 0xF2, 0x8C, 0xFF, 0x20, 0x21, 0xC5, 0xD4, 0xB7, 0x42,
+        0x6A, 0x77, 0xB8, 0x01, 0x00, 0xAC, 0xC4, 0x12, 0x0A, 0x85, 0x53, 0x23, 0x58, 0x0C, 0xD1, 0xBD,
+        0x89, 0x3C, 0x05, 0x38, 0xE7, 0x6C, 0x23, 0x6C, 0xC5, 0x9F, 0xF5, 0x23, 0x94, 0xC7, 0xF1, 0x23,
+        0x83, 0x80, 0x41, 0x03, 0x48, 0x3C, 0x66, 0x63, 0xC8, 0x73, 0x51, 0xD3, 0x1D, 0x70, 0x52, 0x7C,
+        0xEC, 0xE9, 0x86, 0x19, 0x22, 0x9F, 0xE3, 0x92, 0x25, 0x8E, 0x6F, 0xF6, 0x05, 0x7A, 0x60, 0x02,
+        0x00, 0x8B, 0xC7, 0xD4, 0xE0
+    };
+    // clang-format on
+
+    auto alice_private_key = Crypto::UnsignedBigInteger::import_data(alice_private_key_data.data(), alice_private_key_data.size());
+    auto alice_public_key = TRY_OR_FAIL(Crypto::Curves::SECPxxxr1Point::from_uncompressed({ alice_public_key_data.data(), alice_public_key_data.size() }));
+    auto bob_private_key = Crypto::UnsignedBigInteger::import_data(bob_private_key_data.data(), bob_private_key_data.size());
+    auto bob_public_key = TRY_OR_FAIL(Crypto::Curves::SECPxxxr1Point::from_uncompressed({ bob_public_key_data.data(), bob_public_key_data.size() }));
+    auto shared_secret = TRY_OR_FAIL(Crypto::Curves::SECPxxxr1Point::from_uncompressed({ shared_secret_data.data(), shared_secret_data.size() }));
+    auto private_key = Crypto::UnsignedBigInteger::import_data(private_key_data.data(), private_key_data.size());
+    auto expected_public_key = TRY_OR_FAIL(Crypto::Curves::SECPxxxr1Point::from_uncompressed({ expected_public_key_data.data(), expected_public_key_data.size() }));
+
+    Crypto::Curves::SECP521r1 curve;
+
+    auto generated_alice_public = MUST(curve.generate_public_key(alice_private_key));
+    EXPECT_EQ(alice_public_key.x, generated_alice_public.x);
+    EXPECT_EQ(alice_public_key.y, generated_alice_public.y);
+
+    auto generated_bob_public = MUST(curve.generate_public_key(bob_private_key));
+    EXPECT_EQ(bob_public_key.x, generated_bob_public.x);
+    EXPECT_EQ(bob_public_key.y, generated_bob_public.y);
+
+    auto shared_alice = MUST(curve.compute_coordinate(alice_private_key, bob_public_key));
+    EXPECT_EQ(shared_alice.x, shared_secret.x);
+    EXPECT_EQ(shared_alice.y, shared_secret.y);
+
+    auto shared_bob = MUST(curve.compute_coordinate(bob_private_key, alice_public_key));
+    EXPECT_EQ(shared_bob.x, shared_secret.x);
+    EXPECT_EQ(shared_bob.y, shared_secret.y);
+
+    EXPECT_EQ(shared_alice.x, shared_bob.x);
+    EXPECT_EQ(shared_alice.y, shared_bob.y);
+
+    auto generated_public = MUST(curve.generate_public_key(private_key));
+    EXPECT_EQ(expected_public_key.x, generated_public.x);
+    EXPECT_EQ(expected_public_key.y, generated_public.y);
+}