diff --git a/docs/changes.txt b/docs/changes.txt
index 48290e341..89d5a8ac8 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -29,6 +29,7 @@
 - Fixed bug on benchmark engine, from now it will not stop at the first error detected
 - Fixed false negative on Unit Test in case of out-of-memory with grep in single mode
 - Fixed Unit Test early exit on luks test file download/extract failure
+- Fixed Unit Test salt-max in case of optimized kernel, with hash-type 22 and 23
 
 ##
 ## Technical
diff --git a/tools/test_modules/m00022.pm b/tools/test_modules/m00022.pm
index 631be7bbd..fccdc879e 100644
--- a/tools/test_modules/m00022.pm
+++ b/tools/test_modules/m00022.pm
@@ -10,7 +10,7 @@ use warnings;
 
 use Digest::MD5 qw (md5);
 
-sub module_constraints { [[0, 232], [0, 232], [0, 32], [0, 32], [0, 32]] }
+sub module_constraints { [[0, 232], [0, 232], [0, 32], [0, 28], [0, 32]] }
 
 sub module_generate_hash
 {
diff --git a/tools/test_modules/m00023.pm b/tools/test_modules/m00023.pm
index 8caa91577..19120e329 100644
--- a/tools/test_modules/m00023.pm
+++ b/tools/test_modules/m00023.pm
@@ -10,7 +10,7 @@ use warnings;
 
 use Digest::MD5 qw (md5_hex);
 
-sub module_constraints { [[0, 247], [0, 247], [0, 47], [0, 47], [0, 47]] }
+sub module_constraints { [[0, 247], [0, 247], [0, 47], [0, 43], [0, 47]] }
 
 sub module_generate_hash
 {