diff --git a/test/keygen.c++ b/test/keygen.c++
index 7e0df590..a3879770 100644
--- a/test/keygen.c++
+++ b/test/keygen.c++
@@ -266,7 +266,7 @@ void maker::setup(const config::actor_params_pod &actor,
              value_essentials.bits - essentials::value_age_minwidth ||
          mapping.split >= mapping.width)
     mapping.split -= 1;
-  if (split != mapping.width)
+  if (split != mapping.split)
     log_notice("keygen: reduce mapping-split from %u to %u", split,
                mapping.split);
 
diff --git a/test/keygen.h++ b/test/keygen.h++
index 80a87d0e..a9d69dfe 100644
--- a/test/keygen.h++
+++ b/test/keygen.h++
@@ -101,9 +101,9 @@ class maker {
     uint16_t flags{0};
     uint32_t maxlen{0};
     serial_t mask{0};
-    unsigned bits;
+    unsigned bits{0};
   } key_essentials, value_essentials;
-  unsigned value_age_bits;
+  unsigned value_age_bits{0};
   serial_t value_age_mask{0};
 
   static serial_t mk_begin(serial_t serial, const essentials &params,