diff --git a/manifest b/manifest
index 54db67c2c8..7c801c8035 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Simplify\s.import\sleak\splug\sand\sarrange\sfor\sCLI\sto\sbe\srun\sunder\svalgrind.
-D 2022-05-09T12:29:47.606
+C Cause\smost\sshell\stests\sto\sbe\srun\sunder\sTcl\ssuite\svalgrind\sconfig.
+D 2022-05-10T01:11:51.402
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1294,7 +1294,7 @@ F test/parser1.test 6ccdf5e459a5dc4673d3273dc311a7e9742ca952dd0551a6a6320d27035c
 F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
 F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
-F test/permutations.test 68b6dcd2667acdc643140d502c0b6c503abe444495cf5d16aa3a4f0391604020
+F test/permutations.test cf5f31bab83a452288b2a050880152cdf99d62e9aab71948268d549debcc6942
 F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b7640d9f
 F test/pragma.test cae534c12a033a5c319ccc94f50b32811acdef9f67bf19a82ff42697caccd69f
 F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
@@ -1482,7 +1482,7 @@ F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
 F test/temptable2.test d2940417496e2b9548e01d09990763fbe88c316504033256d51493e1f1a5ce6a
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
-F test/tester.tcl eea76fe47703d4bd2d12ddc761fb0be623f9a7b878e50a2dcb7bd6fe4b3040f1
+F test/tester.tcl f453db5abee4c60e8c3b5c6a87476da1b00ac162e9ab382b779b5dd994fab015
 F test/thread001.test b61a29dd87cf669f5f6ac96124a7c97d71b0c80d9012746072055877055cf9ef
 F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@ -1953,8 +1953,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P f5f09368b33b6af00f96e5b8f763e7ee2d00ba6af2aee0f2ca86bb58c03d0b71
-R 84088aa54a74f88fa3741dd082a651c8
+P 0d3e2380197aa3e725591266acaeb0d43a7e794ca9153e6c56253cdcf60720b1
+R 8b383cc869801f72e74e4d10a3a8a711
 U larrybr
-Z 4cea09d549ba44b05dc5240e31984b9e
+Z 8c26ccdbc4c29d056a0925b62032154d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b8969acb8f..51469b9721 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0d3e2380197aa3e725591266acaeb0d43a7e794ca9153e6c56253cdcf60720b1
\ No newline at end of file
+cd085b36ff777396ac2705c030c1518f8094a70a0b0ba4a628776429524d20f0
\ No newline at end of file
diff --git a/test/permutations.test b/test/permutations.test
index 0987daeb1d..f2710da0f1 100644
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -217,7 +217,8 @@ test_suite "valgrind" -prefix "" -description {
   fail under valgrind) omitted.
 } -files [
   test_set $allquicktests -exclude *malloc* *ioerr* *fault* *_err* wal.test \
-              shell*.test crash8.test atof1.test selectG.test \
+              shell2.test shell6.test shell7.test \
+              crash8.test atof1.test selectG.test \
               tkt-fc62af4523.test numindex1.test corruptK.test
 ] -initialize {
   set ::G(valgrind) 1
diff --git a/test/tester.tcl b/test/tester.tcl
index 4dee3b5a8b..3407506c74 100644
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -2499,12 +2499,17 @@ proc test_find_cli {} {
 proc test_cli_invocation {} {
   set prog [test_find_binary sqlite3]
   if {$prog==""} { return -code return }
-  if {[info exists ::env(SQLITE_CLI_VALGRIND_OPT)]} {
-    set vgo $::env(SQLITE_CLI_VALGRIND_OPT)
+  set vgrun [expr {[permutation]=="valgrind"}]
+  if {$vgrun || [info exists ::env(SQLITE_CLI_VALGRIND_OPT)]} {
+    if {$vgrun} {
+      set vgo "--quiet"
+    } else {
+      set vgo $::env(SQLITE_CLI_VALGRIND_OPT)
+    }
     if {$vgo == 0 || $vgo eq ""} {
       return $prog
     } elseif {$vgo == 1} {
-      return "valgrind -q --leak-check=yes $prog"
+      return "valgrind --quiet --leak-check=yes $prog"
     } else {
       return "valgrind $vgo $prog"
     }