diff --git a/tools/test.pl b/tools/test.pl
index 388ab0a84..c121d1580 100755
--- a/tools/test.pl
+++ b/tools/test.pl
@@ -346,7 +346,7 @@ sub init_db_word_rand
 
   my @pool;
 
-  for (my $len = $len_min + 1; $len < $len_max - 1; $len++)
+  for (my $len = $len_min; $len <= $len_max; $len++)
   {
     push @pool, $len;
   }
@@ -357,9 +357,6 @@ sub init_db_word_rand
 
   my $idx = 0;
 
-  $db_out->[$idx++] = $len_min;
-  $db_out->[$idx++] = $len_max;
-
   for ($idx .. $outputs)
   {
     $db_out->[$idx++] = shift @pool;
@@ -395,7 +392,7 @@ sub init_db_salt_rand
 
   my @pool;
 
-  for my $len ($len_min + 1 .. $len_max - 1)
+  for (my $len = $len_min; $len <= $len_max; $len++)
   {
     push @pool, $len;
   }
@@ -406,9 +403,6 @@ sub init_db_salt_rand
 
   my $idx = 0;
 
-  $db_out->[$idx++] = $len_min;
-  $db_out->[$idx++] = $len_max;
-
   for ($idx .. $outputs)
   {
     $db_out->[$idx++] = shift @pool;
diff --git a/tools/test.sh b/tools/test.sh
index 27fa3797b..b2f001b4b 100755
--- a/tools/test.sh
+++ b/tools/test.sh
@@ -16,9 +16,9 @@ VC_MODES="13711 13712 13713 13721 13722 13723 13731 13732 13733 13741 13742 1374
 
 HASH_TYPES=$(ls ${TDIR}/test_modules/*.pm | sed 's/.*m0*\([0-9]\+\)\.pm/\1/')
 
-HASH_TYPES="${HASH_TYPES} ${VC_MODES} 14600"
+#HASH_TYPES="${HASH_TYPES} ${VC_MODES} 14600"
 
-HASH_TYPES="$(echo -n ${HASH_TYPES} | tr ' ' '\n' | sort -n | tr '\n' ' ')"
+#HASH_TYPES="$(echo -n ${HASH_TYPES} | tr ' ' '\n' | sort -n | tr '\n' ' ')"
 
 VECTOR_WIDTHS="1 2 4 8 16"