diff --git a/Makefile.in b/Makefile.in
index eb9389172e..5137d596da 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -691,7 +691,7 @@ fulltest:	testfixture$(TEXE) sqlite3$(TEXE)
 	./testfixture$(TEXE) $(TOP)/test/all.test
 
 test:	testfixture$(TEXE) sqlite3$(TEXE)
-	./testfixture$(TEXE) $(TOP)/test/quick.test
+	./testfixture$(TEXE) $(TOP)/test/veryquick.test
 
 sqlite3_analyzer$(TEXE):	$(TESTFIXTURE_SRC) $(TOP)/tool/spaceanal.tcl
 	sed \
diff --git a/main.mk b/main.mk
index c56aa21ad9..226c4c694e 100644
--- a/main.mk
+++ b/main.mk
@@ -462,7 +462,7 @@ soaktest:	testfixture$(EXE) sqlite3$(EXE)
 	./testfixture$(EXE) $(TOP)/test/all.test -soak 1
 
 test:	testfixture$(EXE) sqlite3$(EXE)
-	./testfixture$(EXE) $(TOP)/test/quick.test
+	./testfixture$(EXE) $(TOP)/test/veryquick.test
 
 sqlite3_analyzer$(EXE):	$(TOP)/src/tclsqlite.c sqlite3.c $(TESTSRC) \
 			$(TOP)/tool/spaceanal.tcl
diff --git a/manifest b/manifest
index 885ffc5ec9..a7f4529138 100644
--- a/manifest
+++ b/manifest
@@ -1,7 +1,7 @@
-C Remove\sinternal\sfunction\ssqlite3OsDefaultVfs().\sThe\sbuilt-in\sVFS\slayers\snow\sregister\stheir\sVFS\simplementations\sby\scalling\ssqlite3_vfs_register()\sfrom\swithin\ssqlite3_os_init().\s(CVS\s5307)
-D 2008-06-25T17:19:01
+C Change\sthe\smakefiles\sso\sthat\s"make\stest"\snow\sruns\sthe\sveryquick.test\sscript\sinstead\sof\squick.test.\sAlso\smodify\sveryquick.test\sto\sreuse\sthe\scode\sin\squick.test.\sveryquick.test\sis\snow\sthe\ssame\sas\squick.test\sexcept\sthat\sit\somits\sall\stesting\srelated\sto\smalloc\sand\sIO\serror\ssimulation.\s(CVS\s5308)
+D 2008-06-25T17:54:53
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
-F Makefile.in ff6f90048555a0088f6a4b7406bed5e55a7c4eff
+F Makefile.in dcf0ecf664a31c257f540d32e5d69a09edf962f0
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
 F README b974cdc3f9f12b87e851b04e75996d720ebf81ac
 F VERSION d739ba532eddc5c09ef9a55151328cd6a8a102c6
@@ -75,7 +75,7 @@ F ext/rtree/rtree_util.tcl ee0a0311eb12175319d78bfb37302320496cee6e
 F ext/rtree/viewrtree.tcl 09526398dae87a5a87c5aac2b3854dbaf8376869
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh 09fe5815427dc7d0abb188bbcdf0e34896577210
-F main.mk d05e1f618544095915ab4d91d6057d439eee7004
+F main.mk 4b4961d11a76f6f6c54f1137326ea6a556f359f8
 F mkdll.sh 712e74f3efe08a6ba12b2945d018a29a89d7fe3b
 F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
 F mkextw.sh 1a866b53637dab137191341cc875575a5ca110fb
@@ -428,7 +428,7 @@ F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test c3405535b418d454e8a52196a0fc592ec9eec58d
 F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301 x
 F test/ptrchng.test 83150cb7b513e33cce90fdc68f4b1817551857c0
-F test/quick.test 7c786e7829cda4844e03c7d8924a0d758e6fb3bc
+F test/quick.test c5e83a241e9adf989a79f83d1ade1c6cc768f68b
 F test/quote.test 215897dbe8de1a6f701265836d6601cc6ed103e6
 F test/rdonly.test b34db316525440d3b42c32e83942c02c37d28ef0
 F test/reindex.test 38b138abe36bf9a08c791ed44d9f76cd6b97b78b
@@ -546,7 +546,7 @@ F test/vacuum.test 0bc75ee74ab9c69322d6563aa2287375697e630b
 F test/vacuum2.test d3b9691541fe6ed5c711f547a1c7d70e9760ac6f
 F test/vacuum3.test 6149b24613f487915ca9cedfbb9147d5759714ec
 F test/varint.test ab7b110089a08b9926ed7390e7e97bdefeb74102
-F test/veryquick.test d93a2f36ef0f7bb0f1048ae339e9d8bda774c941
+F test/veryquick.test fdd8108de66eec378291d9a0e46e30d129eef1ca
 F test/view.test 4864e3841ab3213a95297718b94d5d6a8d3bc78b
 F test/vtab1.test 47092e3ac59141f08e09a6c0cc0df8997242bc79
 F test/vtab2.test 1da49b015582965a8fc386aa23d051a5a622b08e
@@ -594,7 +594,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 9e3c95ff4048cd8e4c56acf7a8ebedc49621e9c7
-R dd99e8c754ee82c9c2d08705cbcbd9a2
+P 8fa33b79d7369ec5777fd9ad3349f0fa31b98fd6
+R 1a6c7219f503b204e4bc313620ed4688
 U danielk1977
-Z d4c5b3f927846f2701cf2cdd435f8f43
+Z 2704037bd54444a7717bec83b4f04306
diff --git a/manifest.uuid b/manifest.uuid
index 8eeec8f09c..808d17b87c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8fa33b79d7369ec5777fd9ad3349f0fa31b98fd6
\ No newline at end of file
+8c65146ea0e77e8e31fffc467806b1edf91fb4db
\ No newline at end of file
diff --git a/test/quick.test b/test/quick.test
index 161beb8db3..9f2aa63d92 100644
--- a/test/quick.test
+++ b/test/quick.test
@@ -6,7 +6,7 @@
 #***********************************************************************
 # This file runs all tests.
 #
-# $Id: quick.test,v 1.82 2008/06/24 11:21:21 danielk1977 Exp $
+# $Id: quick.test,v 1.83 2008/06/25 17:54:55 danielk1977 Exp $
 
 proc lshift {lvar} {
   upvar $lvar l
@@ -47,20 +47,15 @@ set EXCLUDE {
   crash2.test
   crash3.test
   crash4.test
+  crash5.test
   crash6.test
   crash7.test
-  exclusive3.test
+  delete3.test
   fts3.test
   fuzz.test
   fuzz_malloc.test
   in2.test
-  jrnlmode3.test
   loadext.test
-  mallocAll.test
-  malloc.test
-  malloc2.test
-  malloc3.test
-  malloc4.test
   memleak.test
   misc7.test
   misuse.test
@@ -77,17 +72,18 @@ set EXCLUDE {
   speed4.test
   speed4p.test
   sqllimits1.test
-
+  tkt2686.test
   thread001.test
   thread002.test
+  vacuum3.test
 
   incrvacuum_ioerr.test
   autovacuum_crash.test
   btree8.test
-  utf16.test
   shared_err.test
   vtab_err.test
   veryquick.test
+  mallocAll.test
 }
 
 if {[sqlite3 -has-codec]} {
@@ -103,6 +99,14 @@ set INCLUDE {
 }
 
 foreach testfile [lsort -dictionary [glob $testdir/*.test]] {
+  # If this is "veryquick.test", do not run any of the malloc or 
+  # IO error simulations.
+  if {[info exists ISVERYQUICK] && (
+    [string match *malloc* $testfile] || [string match *ioerr* $testfile]
+  ) } {
+    continue
+  }
+
   set tail [file tail $testfile]
   if {[lsearch -exact $EXCLUDE $tail]>=0} continue
   if {[llength $INCLUDE]>0 && [lsearch -exact $INCLUDE $tail]<0} continue
@@ -117,9 +121,9 @@ foreach testfile [lsort -dictionary [glob $testdir/*.test]] {
     set sqlite_open_file_count 0
   }
 }
-set argv quick
-source $testdir/permutations.test
-set argv ""
+#set argv quick
+#source $testdir/permutations.test
+#set argv ""
 source $testdir/misuse.test
 
 set sqlite_open_file_count 0
diff --git a/test/veryquick.test b/test/veryquick.test
index 67cb513377..7634f3d2d4 100644
--- a/test/veryquick.test
+++ b/test/veryquick.test
@@ -4,147 +4,13 @@
 #    May you share freely, never taking more than you give.
 #
 #***********************************************************************
-# This file runs all tests.
+# This file runs all the tests run by quick.test except for those related
+# to malloc or IO error simulation. With these tests omitted, the overall
+# run time is reduced by about 75%.
 #
-# $Id: veryquick.test,v 1.7 2008/06/24 11:21:21 danielk1977 Exp $
-
-proc lshift {lvar} {
-  upvar $lvar l
-  set ret [lindex $l 0]
-  set l [lrange $l 1 end]
-  return $ret
-}
-while {[set arg [lshift argv]] != ""} {
-  switch -- $arg {
-    -sharedpagercache {
-      sqlite3_enable_shared_cache 1
-    }
-    -soak {
-       set SOAKTEST 1
-    }
-    -start {
-       set STARTAT "[lshift argv]*"
-    }
-    default {
-      set argv [linsert $argv 0 $arg]
-      break
-    }
-  }
-}
+# $Id: veryquick.test,v 1.8 2008/06/25 17:54:55 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
-source $testdir/tester.tcl
-rename finish_test really_finish_test
-proc finish_test {} {}
-set ISQUICK 1
+set ISVERYQUICK 1
+source $testdir/quick.test
 
-set EXCLUDE {
-  all.test
-  async.test
-  async2.test
-  altermalloc.test
-  attachmalloc.test
-  autovacuum_crash.test
-  autovacuum_ioerr.test
-  autovacuum_ioerr2.test
-  bitvec.test
-  corrupt.test
-  crash.test
-  crash2.test
-  crash3.test
-  crash4.test
-  crash6.test
-  crash7.test
-  diskfull.test
-  exclusive3.test
-  fts3.test
-  fuzz.test
-  fuzz_malloc.test
-  in2.test
-  interrupt.test
-  ioerr.test
-  ioerr2.test
-  jrnlmode3.test
-  loadext.test
-  mallocAll.test
-  malloc.test
-  malloc2.test
-  malloc3.test
-  malloc4.test
-  malloc5.test
-  malloc6.test
-  malloc7.test
-  malloc8.test
-  malloc9.test
-  mallocA.test
-  mallocB.test
-  mallocC.test
-  mallocD.test
-  mallocE.test
-  mallocF.test
-  mallocG.test
-  memleak.test
-  misc7.test
-  misuse.test
-  mutex2.test
-  onefile.test
-  permutations.test
-  quick.test
-  select9.test
-  soak.test
-  speed1.test
-  speed1p.test
-  speed2.test
-  speed3.test
-  speed4.test
-  speed4p.test
-  sqllimits1.test
-  vacuum3.test
-
-  tkt2686.test
-  thread001.test
-  thread002.test
-
-  incrvacuum_ioerr.test
-  autovacuum_crash.test
-  btree8.test
-  utf16.test
-  shared_err.test
-  vtab_err.test
-  veryquick.test
-}
-
-if {[sqlite3 -has-codec]} {
-  # lappend EXCLUDE \
-  #  conflict.test
-}
-
-
-# Files to include in the test.  If this list is empty then everything
-# that is not in the EXCLUDE list is run.
-#
-set INCLUDE {
-}
-
-foreach testfile [lsort -dictionary [glob $testdir/*.test]] {
-  set tail [file tail $testfile]
-  if {[lsearch -exact $EXCLUDE $tail]>=0} continue
-  if {[llength $INCLUDE]>0 && [lsearch -exact $INCLUDE $tail]<0} continue
-  if {[info exists STARTAT] && [string match $STARTAT $tail]} {unset STARTAT}
-  if {[info exists STARTAT]} continue
-  source $testfile
-  catch {db close}
-  if {$sqlite_open_file_count>0} {
-    puts "$tail did not close all files: $sqlite_open_file_count"
-    incr nErr
-    lappend ::failList $tail
-    set sqlite_open_file_count 0
-  }
-}
-set argv veryquick
-source $testdir/permutations.test
-set argv ""
-source $testdir/misuse.test
-
-set sqlite_open_file_count 0
-really_finish_test