diff --git a/test/duplicate_consistency/ntruhps2048677_avx2.yml b/test/duplicate_consistency/ntruhps2048677_avx2.yml
new file mode 100644
index 00000000..baccff7f
--- /dev/null
+++ b/test/duplicate_consistency/ntruhps2048677_avx2.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: ntruhps2048509
+    implementation: clean
+  files:
+    - cmov.c
+    - cmov.h
+    - kem.c
+    - LICENSE
+    - owcpa.c
+    - owcpa.h
+    - pack3.c
+    - packq.c
+    - poly.c
+    - poly_lift.c
+    - sample.c
+    - sample.h
+- source:
+    scheme: ntruhps2048509
+    implementation: avx2
+  files:
+    - crypto_sort_int32.c
+    - crypto_sort_int32.h
+    - poly.h
+    - sample_iid.c
+- source:
+    scheme: ntruhps2048677
+    implementation: clean
+  files:
+    - api.h
+    - params.h
diff --git a/test/duplicate_consistency/ntruhps2048677_clean.yml b/test/duplicate_consistency/ntruhps2048677_clean.yml
index 3437e899..68362051 100644
--- a/test/duplicate_consistency/ntruhps2048677_clean.yml
+++ b/test/duplicate_consistency/ntruhps2048677_clean.yml
@@ -3,16 +3,20 @@ consistency_checks:
     scheme: ntruhps2048509
     implementation: clean
   files:
-    - crypto_sort.c
-    - crypto_sort.h
+    - cmov.c
+    - cmov.h
+    - crypto_sort_int32.c
+    - crypto_sort_int32.h
     - kem.c
+    - LICENSE
     - owcpa.c
     - owcpa.h
     - pack3.c
     - packq.c
     - poly.c
     - poly.h
+    - poly_lift.c
+    - poly_mod.c
     - sample.c
     - sample.h
-    - verify.c
-    - verify.h
+    - sample_iid.c
diff --git a/test/duplicate_consistency/ntruhps4096821_avx2.yml b/test/duplicate_consistency/ntruhps4096821_avx2.yml
new file mode 100644
index 00000000..1608d344
--- /dev/null
+++ b/test/duplicate_consistency/ntruhps4096821_avx2.yml
@@ -0,0 +1,33 @@
+consistency_checks:
+- source:
+    scheme: ntruhps2048509
+    implementation: clean
+  files:
+    - cmov.c
+    - cmov.h
+    - kem.c
+    - LICENSE
+    - owcpa.c
+    - owcpa.h
+    - poly.c
+    - poly_lift.c
+    - sample.c
+    - sample.h
+- source:
+    scheme: ntruhrss701
+    implementation: clean
+  files:
+    - pack3.c
+- source:
+    scheme: ntruhps2048509
+    implementation: avx2
+  files:
+    - poly.h
+    - sample_iid.c
+- source:
+    scheme: ntruhps4096821
+    implementation: clean
+  files:
+    - api.h
+    - packq.c
+    - params.h
diff --git a/test/duplicate_consistency/ntruhps4096821_clean.yml b/test/duplicate_consistency/ntruhps4096821_clean.yml
index 232dcec5..7e9354c4 100644
--- a/test/duplicate_consistency/ntruhps4096821_clean.yml
+++ b/test/duplicate_consistency/ntruhps4096821_clean.yml
@@ -3,14 +3,23 @@ consistency_checks:
     scheme: ntruhps2048509
     implementation: clean
   files:
-    - crypto_sort.c
-    - crypto_sort.h
+    - cmov.c
+    - cmov.h
+    - crypto_sort_int32.c
+    - crypto_sort_int32.h
     - kem.c
+    - LICENSE
     - owcpa.c
     - owcpa.h
     - poly.c
     - poly.h
+    - poly_lift.c
+    - poly_mod.c
     - sample.c
     - sample.h
-    - verify.c
-    - verify.h
+    - sample_iid.c
+- source:
+    scheme: ntruhrss701
+    implementation: clean
+  files:
+    - pack3.c
diff --git a/test/duplicate_consistency/ntruhrss701_avx2.yml b/test/duplicate_consistency/ntruhrss701_avx2.yml
new file mode 100644
index 00000000..a6513744
--- /dev/null
+++ b/test/duplicate_consistency/ntruhrss701_avx2.yml
@@ -0,0 +1,26 @@
+consistency_checks:
+- source:
+    scheme: ntruhps2048509 
+    implementation: clean
+  files:
+    - cmov.c
+    - cmov.h
+    - kem.c
+    - LICENSE
+    - poly.c
+- source:
+    scheme: ntruhps2048509
+    implementation: avx2
+  files:
+    - poly.h
+    - sample_iid.c
+- source:
+    scheme: ntruhrss701
+    implementation: clean
+  files:
+    - api.h
+    - pack3.c
+    - packq.c
+    - params.h
+    - sample.c
+    - sample.h
diff --git a/test/duplicate_consistency/ntruhrss701_clean.yml b/test/duplicate_consistency/ntruhrss701_clean.yml
index cab7beaf..b2b48f84 100644
--- a/test/duplicate_consistency/ntruhrss701_clean.yml
+++ b/test/duplicate_consistency/ntruhrss701_clean.yml
@@ -3,12 +3,9 @@ consistency_checks:
     scheme: ntruhps2048509
     implementation: clean
   files:
+    - cmov.c
+    - cmov.h
     - kem.c
-    - poly.h
-    - verify.c
-    - verify.h
-- source:
-    scheme: ntruhps4096821
-    implementation: clean
-  files:
-    - pack3.c
+    - LICENSE
+    - poly.c
+    - poly_mod.c