diff --git a/src/kat_tests.rs b/src/kat_tests.rs
index 7f004b6..44d5baa 100644
--- a/src/kat_tests.rs
+++ b/src/kat_tests.rs
@@ -455,7 +455,7 @@ pub mod gen {
     use super::*;
 
     use crate::{
-        aead::{AeadCtxR, AeadCtxS, AesGcm128, AesGcm256, ChaCha20Poly1305, ExportOnlyAead},
+        aead::{AeadCtxR, AeadCtxS},
         kdf::{labeled_extract, LabeledExpand},
         setup::ExporterSecret,
         OpModeS,
@@ -868,8 +868,17 @@ fn kat_test() {
         // This unrolls into 36 `if let` statements
         dispatch_testcase!(
             tv,
-            (AesGcm128, AesGcm256, ChaCha20Poly1305, ExportOnlyAead),
-            (HkdfSha256, HkdfSha384, HkdfSha512),
+            (
+                crate::aead::AesGcm128,
+                crate::aead::AesGcm256,
+                crate::aead::ChaCha20Poly1305,
+                crate::aead::ExportOnlyAead
+            ),
+            (
+                crate::kdf::HkdfSha256,
+                crate::kdf::HkdfSha384,
+                crate::kdf::HkdfSha512
+            ),
             (SecpK256HkdfSha256)
         );