Index: test/shell1.test
==================================================================
--- test/shell1.test
+++ test/shell1.test
@@ -43,11 +43,11 @@
   list $rc \
        [regexp {Error: unknown option: -bad} $res]
 } {1 1}
 # error on extra options
 do_test shell1-1.1.2 {
-  catchcmd "test.db \"select 3\" \"select 4\"" ""
+  catchcmd "test.db \"select+3\" \"select+4\"" ""
 } {0 {3
 4}}
 # error on extra options
 do_test shell1-1.1.3 {
   catchcmd "test.db FOO test.db BAD" ".quit"

Index: test/shell2.test
==================================================================
--- test/shell2.test
+++ test/shell2.test
@@ -41,11 +41,11 @@
 } {{0 {}} 1}
 
 # Shell silently ignores extra parameters.
 # Ticket [f5cb008a65].
 do_test shell2-1.2.1 {
-  set rc [catch { eval exec $CLI \":memory:\" \"select 3\" \"select 4\" } msg]
+  set rc [catch { eval exec $CLI \":memory:\" \"select+3\" \"select+4\" } msg]
   list $rc $msg
 } {0 {3
 4}}
 
 # Test a problem reported on the mailing list. The shell was at one point

Index: test/shell3.test
==================================================================
--- test/shell3.test
+++ test/shell3.test
@@ -24,13 +24,18 @@
 set CLI [test_find_cli]
 db close
 forcedelete test.db test.db-journal test.db-wal
 sqlite3 db test.db
 
-if {[info exists env(MSYSCON)] && $env(MSYSCON)=="sh.exe"} {
-  puts "shell3 tests do not work with the mingw shell due to dodgy\
-        command-line parsing"
+# There are inconsistencies in command-line argument quoting on Windows.
+# In particular, individual applications are responsible for command-line
+# parsing in Windows, not the shell.  Depending on whether the sqlite3.exe
+# program is compiled with MinGW or MSVC, the command-line parsing is
+# different.  This causes problems for the tests below.  To avoid
+# issues, these tests are disabled for windows.
+#
+if {$::tcl_platform(platform)=="windows"} {
   finish_test
   return
 }
 
 #----------------------------------------------------------------------------