diff --git a/tests/constant_time/kem/passes/mceliece-348864 b/tests/constant_time/kem/passes/mceliece-348864
index ac98bf3d41..82bb60984e 100644
--- a/tests/constant_time/kem/passes/mceliece-348864
+++ b/tests/constant_time/kem/passes/mceliece-348864
@@ -1,3 +1,5 @@
+# VEC implementation
+
 {
    Rejection sampling for uniform indices
    Memcheck:Cond
@@ -19,3 +21,27 @@
    # fun:PQCLEAN_MCELIECE348864_VEC_pk_gen
    fun:PQCLEAN_MCELIECE348864_VEC_crypto_kem_keypair
 }
+
+# AVX implementation
+
+{
+   Rejection sampling for uniform indices
+   Memcheck:Cond
+   src:encrypt.c:43
+   # fun:gen_e
+   fun:PQCLEAN_MCELIECE348864_AVX_encrypt
+}
+{
+   Rejection sampling for unique indices
+   Memcheck:Cond
+   src:encrypt.c:58
+   # fun:gen_e
+   fun:PQCLEAN_MCELIECE348864_AVX_encrypt
+}
+{
+   Rejection sampling for systematic form matrix
+   Memcheck:Cond
+   src:pk_gen.c:193
+   # fun:PQCLEAN_MCELIECE348864_AVX_pk_gen
+   fun:PQCLEAN_MCELIECE348864_AVX_crypto_kem_keypair
+}
diff --git a/tests/constant_time/kem/passes/mceliece-348864f b/tests/constant_time/kem/passes/mceliece-348864f
index 965760cfaf..a60122ae94 100644
--- a/tests/constant_time/kem/passes/mceliece-348864f
+++ b/tests/constant_time/kem/passes/mceliece-348864f
@@ -1,3 +1,5 @@
+# VEC implementation
+
 {
    Rejection sampling for uniform indices
    Memcheck:Cond
@@ -26,3 +28,34 @@
    # fun:PQCLEAN_MCELIECE348864F_VEC_pk_gen
    fun:PQCLEAN_MCELIECE348864F_VEC_crypto_kem_keypair
 }
+
+# AVX implementation
+
+{
+   Rejection sampling for uniform indices
+   Memcheck:Cond
+   src:encrypt.c:43
+   # fun:gen_e
+   fun:PQCLEAN_MCELIECE348864F_AVX_encrypt
+}
+{
+   Rejection sampling for unique indices
+   Memcheck:Cond
+   src:encrypt.c:58
+   # fun:gen_e
+   fun:PQCLEAN_MCELIECE348864F_AVX_encrypt
+}
+{
+   Rejection sampling for full rank matrix
+   Memcheck:Cond
+   src:pk_gen.c:120
+   # fun:mov_columns
+   fun:PQCLEAN_MCELIECE348864F_AVX_pk_gen
+}
+{
+   Rejection sampling for systematic form matrix
+   Memcheck:Cond
+   src:pk_gen.c:289
+   # fun:PQCLEAN_MCELIECE348864F_AVX_pk_gen
+   fun:PQCLEAN_MCELIECE348864F_AVX_crypto_kem_keypair
+}
diff --git a/tests/constant_time/kem/passes/mceliece-460896 b/tests/constant_time/kem/passes/mceliece-460896
index 265ee15ae0..4221b2e7ce 100644
--- a/tests/constant_time/kem/passes/mceliece-460896
+++ b/tests/constant_time/kem/passes/mceliece-460896
@@ -1,3 +1,5 @@
+# VEC implementation
+
 {
    Rejection sampling for uniform indices
    Memcheck:Cond
@@ -19,3 +21,27 @@
    # fun:PQCLEAN_MCELIECE460896_VEC_pk_gen
    fun:PQCLEAN_MCELIECE460896_VEC_crypto_kem_keypair
 }
+
+# AVX implementation
+
+{
+   Rejection sampling for uniform indices
+   Memcheck:Cond
+   src:encrypt.c:45
+   # fun:gen_e
+   fun:PQCLEAN_MCELIECE460896_AVX_encrypt
+}
+{
+   Rejection sampling for unique indices
+   Memcheck:Cond
+   src:encrypt.c:60
+   # fun:gen_e
+   fun:PQCLEAN_MCELIECE460896_AVX_encrypt
+}
+{
+   Rejection sampling for systematic form matrix
+   Memcheck:Cond
+   src:pk_gen.c:200
+   # fun:PQCLEAN_MCELIECE460896_AVX_pk_gen
+   fun:PQCLEAN_MCELIECE460896_AVX_crypto_kem_keypair
+}
diff --git a/tests/constant_time/kem/passes/mceliece-460896f b/tests/constant_time/kem/passes/mceliece-460896f
index 02c621fed5..16f149bbcf 100644
--- a/tests/constant_time/kem/passes/mceliece-460896f
+++ b/tests/constant_time/kem/passes/mceliece-460896f
@@ -1,3 +1,5 @@
+# VEC implementation
+
 {
    Rejection sampling for uniform indices
    Memcheck:Cond
@@ -26,3 +28,34 @@
    # fun:PQCLEAN_MCELIECE460896F_VEC_pk_gen
    fun:PQCLEAN_MCELIECE460896F_VEC_crypto_kem_keypair
 }
+
+# AVX implementation
+
+{
+   Rejection sampling for uniform indices
+   Memcheck:Cond
+   src:encrypt.c:45
+   # fun:gen_e
+   fun:PQCLEAN_MCELIECE460896F_AVX_encrypt
+}
+{
+   Rejection sampling for unique indices
+   Memcheck:Cond
+   src:encrypt.c:60
+   # fun:gen_e
+   fun:PQCLEAN_MCELIECE460896F_AVX_encrypt
+}
+{
+   Rejection sampling for full rank matrix
+   Memcheck:Cond
+   src:pk_gen.c:150
+   # fun:mov_columns
+   fun:PQCLEAN_MCELIECE460896F_AVX_pk_gen
+}
+{
+   Rejection sampling for systematic form matrix
+   Memcheck:Cond
+   src:pk_gen.c:319
+   # fun:PQCLEAN_MCELIECE460896F_AVX_pk_gen
+   fun:PQCLEAN_MCELIECE460896F_AVX_crypto_kem_keypair
+}
diff --git a/tests/constant_time/kem/passes/mceliece-6688128 b/tests/constant_time/kem/passes/mceliece-6688128
index 7f3c51b3b9..fd595c4028 100644
--- a/tests/constant_time/kem/passes/mceliece-6688128
+++ b/tests/constant_time/kem/passes/mceliece-6688128
@@ -1,3 +1,5 @@
+# VEC implementation
+
 {
    Rejection sampling for uniform indices
    Memcheck:Cond
@@ -19,3 +21,27 @@
    # fun:PQCLEAN_MCELIECE6688128_VEC_pk_gen
    fun:PQCLEAN_MCELIECE6688128_VEC_crypto_kem_keypair
 }
+
+# AVX implementation
+
+{
+   Rejection sampling for uniform indices
+   Memcheck:Cond
+   src:encrypt.c:45
+   # fun:gen_e
+   fun:PQCLEAN_MCELIECE6688128_AVX_encrypt
+}
+{
+   Rejection sampling for unique indices
+   Memcheck:Cond
+   src:encrypt.c:60
+   # fun:gen_e
+   fun:PQCLEAN_MCELIECE6688128_AVX_encrypt
+}
+{
+   Rejection sampling for systematic form matrix
+   Memcheck:Cond
+   src:pk_gen.c:199
+   # fun:PQCLEAN_MCELIECE6688128_AVX_pk_gen
+   fun:PQCLEAN_MCELIECE6688128_AVX_crypto_kem_keypair
+}
diff --git a/tests/constant_time/kem/passes/mceliece-6688128f b/tests/constant_time/kem/passes/mceliece-6688128f
index 00dfaf8b13..0f8bac9b1c 100644
--- a/tests/constant_time/kem/passes/mceliece-6688128f
+++ b/tests/constant_time/kem/passes/mceliece-6688128f
@@ -1,3 +1,5 @@
+# VEC implementation
+
 {
    Rejection sampling for uniform indices
    Memcheck:Cond
@@ -26,3 +28,34 @@
    # fun:mov_columns
    fun:PQCLEAN_MCELIECE6688128F_VEC_pk_gen
 }
+
+# AVX implementation
+
+{
+   Rejection sampling for uniform indices
+   Memcheck:Cond
+   src:encrypt.c:45
+   # fun:gen_e
+   fun:PQCLEAN_MCELIECE6688128F_AVX_encrypt
+}
+{
+   Rejection sampling for unique indices
+   Memcheck:Cond
+   src:encrypt.c:60
+   # fun:gen_e
+   fun:PQCLEAN_MCELIECE6688128F_AVX_encrypt
+}
+{
+   Rejection sampling for systematic form matrix
+   Memcheck:Cond
+   src:pk_gen.c:320
+   # fun:PQCLEAN_MCELIECE6688128F_AVX_pk_gen
+   fun:PQCLEAN_MCELIECE6688128F_AVX_crypto_kem_keypair
+}
+{
+   Rejection sampling for full rank matrix
+   Memcheck:Cond
+   src:pk_gen.c:151
+   # fun:mov_columns
+   fun:PQCLEAN_MCELIECE6688128F_AVX_pk_gen
+}
diff --git a/tests/constant_time/kem/passes/mceliece-6960119 b/tests/constant_time/kem/passes/mceliece-6960119
index 91691df273..685b1a17eb 100644
--- a/tests/constant_time/kem/passes/mceliece-6960119
+++ b/tests/constant_time/kem/passes/mceliece-6960119
@@ -1,3 +1,5 @@
+# VEC implementation
+
 {
    Rejection sampling for uniform indices
    Memcheck:Cond
@@ -19,3 +21,27 @@
    # fun:PQCLEAN_MCELIECE6960119_VEC_pk_gen
    fun:PQCLEAN_MCELIECE6960119_VEC_crypto_kem_keypair
 }
+
+# AVX implementation
+
+{
+   Rejection sampling for uniform indices
+   Memcheck:Cond
+   src:encrypt.c:45
+   # fun:gen_e
+   fun:PQCLEAN_MCELIECE6960119_AVX_encrypt
+}
+{
+   Rejection sampling for unique indices
+   Memcheck:Cond
+   src:encrypt.c:60
+   # fun:gen_e
+   fun:PQCLEAN_MCELIECE6960119_AVX_encrypt
+}
+{
+   Rejection sampling for systematic form matrix
+   Memcheck:Cond
+   src:pk_gen.c:200
+   # fun:PQCLEAN_MCELIECE6960119_AVX_pk_gen
+   fun:PQCLEAN_MCELIECE6960119_AVX_crypto_kem_keypair
+}
diff --git a/tests/constant_time/kem/passes/mceliece-6960119f b/tests/constant_time/kem/passes/mceliece-6960119f
index 9ce577fb63..ab19f1bee6 100644
--- a/tests/constant_time/kem/passes/mceliece-6960119f
+++ b/tests/constant_time/kem/passes/mceliece-6960119f
@@ -1,3 +1,5 @@
+# VEC implementation
+
 {
    Rejection sampling for uniform indices
    Memcheck:Cond
@@ -26,3 +28,34 @@
    # fun:mov_columns
    fun:PQCLEAN_MCELIECE6960119F_VEC_pk_gen
 }
+
+# AVX implementation
+
+{
+   Rejection sampling for uniform indices
+   Memcheck:Cond
+   src:encrypt.c:45
+   # fun:gen_e
+   fun:PQCLEAN_MCELIECE6960119F_AVX_encrypt
+}
+{
+   Rejection sampling for unique indices
+   Memcheck:Cond
+   src:encrypt.c:60
+   # fun:gen_e
+   fun:PQCLEAN_MCELIECE6960119F_AVX_encrypt
+}
+{
+   Rejection sampling for systematic form matrix
+   Memcheck:Cond
+   src:pk_gen.c:324
+   # fun:PQCLEAN_MCELIECE6960119F_AVX_pk_gen
+   fun:PQCLEAN_MCELIECE6960119F_AVX_crypto_kem_keypair
+}
+{
+   Rejection sampling for full rank matrix
+   Memcheck:Cond
+   src:pk_gen.c:152
+   # fun:mov_columns
+   fun:PQCLEAN_MCELIECE6960119F_AVX_pk_gen
+}
diff --git a/tests/constant_time/kem/passes/mceliece-8192128 b/tests/constant_time/kem/passes/mceliece-8192128
index c5968b971e..1a798de0dc 100644
--- a/tests/constant_time/kem/passes/mceliece-8192128
+++ b/tests/constant_time/kem/passes/mceliece-8192128
@@ -1,3 +1,5 @@
+# VEC implementation
+
 {
    Rejection sampling for unique indices
    Memcheck:Cond
@@ -12,3 +14,20 @@
    # fun:PQCLEAN_MCELIECE8192128_VEC_pk_gen
    fun:PQCLEAN_MCELIECE8192128_VEC_crypto_kem_keypair
 }
+
+# AVX implementation
+
+{
+   Rejection sampling for unique indices
+   Memcheck:Cond
+   src:encrypt.c:42
+   # fun:gen_e
+   fun:PQCLEAN_MCELIECE8192128_AVX_encrypt
+}
+{
+   Rejection sampling for systematic form matrix
+   Memcheck:Cond
+   src:pk_gen.c:196
+   # fun:PQCLEAN_MCELIECE8192128_AVX_pk_gen
+   fun:PQCLEAN_MCELIECE8192128_AVX_crypto_kem_keypair
+}
diff --git a/tests/constant_time/kem/passes/mceliece-8192128f b/tests/constant_time/kem/passes/mceliece-8192128f
index 0da4dd9a86..e11ec7eb2e 100644
--- a/tests/constant_time/kem/passes/mceliece-8192128f
+++ b/tests/constant_time/kem/passes/mceliece-8192128f
@@ -1,3 +1,5 @@
+# VEC implementation
+
 {
    Rejection sampling for unique indices
    Memcheck:Cond
@@ -19,3 +21,27 @@
    # fun:mov_columns
    fun:PQCLEAN_MCELIECE8192128F_VEC_pk_gen
 }
+
+# AVX implementation
+
+{
+   Rejection sampling for unique indices
+   Memcheck:Cond
+   src:encrypt.c:42
+   # fun:gen_e
+   fun:PQCLEAN_MCELIECE8192128F_AVX_encrypt
+}
+{
+   Rejection sampling for systematic form matrix
+   Memcheck:Cond
+   src:pk_gen.c:319
+   # fun:PQCLEAN_MCELIECE8192128F_AVX_pk_gen
+   fun:PQCLEAN_MCELIECE8192128F_AVX_crypto_kem_keypair
+}
+{
+   Rejection sampling for full rank matrix
+   Memcheck:Cond
+   src:pk_gen.c:151
+   # fun:mov_columns
+   fun:PQCLEAN_MCELIECE8192128F_AVX_pk_gen
+}
diff --git a/tests/constant_time/kem/passes/mceliece-sk_gen b/tests/constant_time/kem/passes/mceliece-sk_gen
index b0685ee788..96e01a1dcd 100644
--- a/tests/constant_time/kem/passes/mceliece-sk_gen
+++ b/tests/constant_time/kem/passes/mceliece-sk_gen
@@ -1,3 +1,5 @@
+# VEC implementation
+
 {
    Rejection sampling for systematic form matrix
    Memcheck:Cond
@@ -12,3 +14,20 @@
    # fun:PQCLEAN_MCELIECE*_VEC_perm_check
    fun:PQCLEAN_MCELIECE*_VEC_crypto_kem_keypair
 }
+
+# AVX implementation
+
+{
+   Rejection sampling for systematic form matrix
+   Memcheck:Cond
+   src:sk_gen.c:49
+   # fun:PQCLEAN_MCELIECE*_AVX_genpoly_gen
+   fun:PQCLEAN_MCELIECE*_AVX_crypto_kem_keypair
+}
+{
+   Rejection sampling for permutation
+   Memcheck:Cond
+   src:sk_gen.c:91
+   # fun:PQCLEAN_MCELIECE*_AVX_perm_check
+   fun:PQCLEAN_MCELIECE*_AVX_crypto_kem_keypair
+}