diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index da002df2..1c4902a7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -32,9 +32,14 @@ Thus, any PR should revisit and possibly update this file suitably.
 
 This project has adopted the [OpenSSL coding style](https://www.openssl.org/policies/technical/coding-style.html).
 To check adherence of any new code to this, it therefore is highly recommended to
-run the following command in the project main directory prior to finishing a PR:
+run the following commands in the project main directory prior to finishing a PR:
 
     find oqsprov -type f -and '(' -name '*.h' -or -name '*.c' -or -name '*.inc' ')' | xargs clang-format --dry-run --Werror
+    find test -type f -and '(' -name '*.h' -or -name '*.c' -or -name '*.inc' ')' | xargs clang-format --dry-run --Werror
+
+If errors are reported, consider replacing `--dry-run --Werror` with `-i` to
+enable in-place correction of the coding errors, or correct the code manually
+to pass this CI acceptance test.
 
 ### Running CI locally
 
diff --git a/test/oqs_test_evp_pkey_params.c b/test/oqs_test_evp_pkey_params.c
index aadfeca9..6cf04994 100644
--- a/test/oqs_test_evp_pkey_params.c
+++ b/test/oqs_test_evp_pkey_params.c
@@ -19,8 +19,32 @@
 
 /** \brief List of hybrid signature algorithms. */
 const char *kHybridSignatureAlgorithms[] = {
-"p256_dilithium2","rsa3072_dilithium2","p384_dilithium3","p521_dilithium5","p256_mldsa44","rsa3072_mldsa44","p384_mldsa65","p521_mldsa87","p256_falcon512","rsa3072_falcon512","p256_falconpadded512","rsa3072_falconpadded512","p521_falcon1024","p521_falconpadded1024","p256_sphincssha2128fsimple","rsa3072_sphincssha2128fsimple","p256_sphincssha2128ssimple","rsa3072_sphincssha2128ssimple","p384_sphincssha2192fsimple","p256_sphincsshake128fsimple","rsa3072_sphincsshake128fsimple","p256_mayo1","p256_mayo2","p384_mayo3","p521_mayo5",
-NULL,
+    "p256_dilithium2",
+    "rsa3072_dilithium2",
+    "p384_dilithium3",
+    "p521_dilithium5",
+    "p256_mldsa44",
+    "rsa3072_mldsa44",
+    "p384_mldsa65",
+    "p521_mldsa87",
+    "p256_falcon512",
+    "rsa3072_falcon512",
+    "p256_falconpadded512",
+    "rsa3072_falconpadded512",
+    "p521_falcon1024",
+    "p521_falconpadded1024",
+    "p256_sphincssha2128fsimple",
+    "rsa3072_sphincssha2128fsimple",
+    "p256_sphincssha2128ssimple",
+    "rsa3072_sphincssha2128ssimple",
+    "p384_sphincssha2192fsimple",
+    "p256_sphincsshake128fsimple",
+    "rsa3072_sphincsshake128fsimple",
+    "p256_mayo1",
+    "p256_mayo2",
+    "p384_mayo3",
+    "p521_mayo5",
+    NULL,
 };
 ///// OQS_TEMPLATE_FRAGMENT_HYBRID_SIG_ALGS_END
 
@@ -28,43 +52,19 @@ NULL,
 
 /** \brief List of hybrid KEMs. */
 const char *kHybridKEMAlgorithms[] = {
-    "p256_frodo640aes",
-    "x25519_frodo640aes",
-    "p256_frodo640shake",
-    "x25519_frodo640shake",
-    "p384_frodo976aes",
-    "x448_frodo976aes",
-    "p384_frodo976shake",
-    "x448_frodo976shake",
-    "p521_frodo1344aes",
-    "p521_frodo1344shake",
-    "p256_kyber512",
-    "x25519_kyber512",
-    "p384_kyber768",
-    "x448_kyber768",
-    "x25519_kyber768",
-    "p256_kyber768",
-    "p521_kyber1024",
-    "p256_mlkem512",
-    "x25519_mlkem512",
-    "p384_mlkem768",
-    "x448_mlkem768",
-    "x25519_mlkem768",
-    "p256_mlkem768",
-    "p521_mlkem1024",
-    "p384_mlkem1024",
-    "p256_bikel1",
-    "x25519_bikel1",
-    "p384_bikel3",
-    "x448_bikel3",
-    "p521_bikel5",
-    "p256_hqc128",
-    "x25519_hqc128",
-    "p384_hqc192",
-    "x448_hqc192",
-    "p521_hqc256",
-NULL,
-};///// OQS_TEMPLATE_FRAGMENT_HYBRID_KEM_ALGS_END
+    "p256_frodo640aes",     "x25519_frodo640aes", "p256_frodo640shake",
+    "x25519_frodo640shake", "p384_frodo976aes",   "x448_frodo976aes",
+    "p384_frodo976shake",   "x448_frodo976shake", "p521_frodo1344aes",
+    "p521_frodo1344shake",  "p256_kyber512",      "x25519_kyber512",
+    "p384_kyber768",        "x448_kyber768",      "x25519_kyber768",
+    "p256_kyber768",        "p521_kyber1024",     "p256_mlkem512",
+    "x25519_mlkem512",      "p384_mlkem768",      "x448_mlkem768",
+    "x25519_mlkem768",      "p256_mlkem768",      "p521_mlkem1024",
+    "p384_mlkem1024",       "p256_bikel1",        "x25519_bikel1",
+    "p384_bikel3",          "x448_bikel3",        "p521_bikel5",
+    "p256_hqc128",          "x25519_hqc128",      "p384_hqc192",
+    "x448_hqc192",          "p521_hqc256",        NULL,
+}; ///// OQS_TEMPLATE_FRAGMENT_HYBRID_KEM_ALGS_END
 
 /** \brief Indicates if a string is in a given list of strings.
  *