diff --git a/manifest b/manifest
index 7a130fa31a..86b99779d0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\smutex\sasserts.\s\sThe\squick\stest\sruns\sto\scompletion\swithout\nassertion\sfaults.\s(CVS\s4324)
-D 2007-08-29T17:43:20
+C Disable\stests\sthat\srequire\sSQLITE_ENABLE_ATOMIC_WRITE\sif\sthat\sfeature\sis\nnot\senabled.\s(CVS\s4325)
+D 2007-08-29T17:59:42
 F Makefile.in bfcc303429a5d9dcd552d807ee016c77427418c3
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -148,7 +148,7 @@ F src/test9.c b46c8fe02ac7cca1a7316436d8d38d50c66f4b2f
 F src/test_async.c f222bd196b55a2e73b1427400d5aa97841787167
 F src/test_autoext.c 855157d97aa28cf84233847548bfacda21807436
 F src/test_btree.c c1308ba0b88ab577fa56c9e493a09829dfcded9c
-F src/test_config.c f0b911bb615d93a192647e76910dce65cbbcf3ad
+F src/test_config.c 1eb08650f60a5ea652b45fb30781aad2543dd47b
 F src/test_hexio.c 82916f918687502658f02533b519c38cb180db6d
 F src/test_loadext.c 22065d601a18878e5542191001f0eaa5d77c0ed8
 F src/test_malloc.c 9f26ba3469efc97f38100a899ca889d480778864
@@ -325,7 +325,7 @@ F test/insert3.test 72ea6056811fd234f80d923f977c196089947381
 F test/insert4.test 1e27f0a3e5670d5f03c1636f699aa44270945bca
 F test/interrupt.test 81555fb0f8179bb2d0dc7151fd75428223f93cf2
 F test/intpkey.test af4fd826c4784ec5c93b444de07adea0254d0d30
-F test/io.test 29c016c1cc559520f8b76ed23e40d363a2c269d2
+F test/io.test f0203ae4a6d954ec843cb7e446f9774004b04c6a
 F test/ioerr.test 491d42c49bbec598966d26b01ed7901f55e5ee2d
 F test/ioerr2.test f938eadb12108048813869b86beee4a2f98e34b8
 F test/join.test af0443185378b64878750aa1cf4b83c216f246b4
@@ -567,7 +567,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P c790c234c369c6b7610e67dcaaa9eee347df729c
-R 673cf3ccb79c2542ccd493ed4a5e1538
+P 2732af0ec77dbc90c0439b6a61d893d9ea3b5697
+R 059f0847c9d9a250350f32e9db1368e9
 U drh
-Z a367643531757313c52ae724bb0d4a7f
+Z 45a6f3bdb4c80a793d38f336e5948655
diff --git a/manifest.uuid b/manifest.uuid
index 57297a0329..80179d9996 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2732af0ec77dbc90c0439b6a61d893d9ea3b5697
\ No newline at end of file
+4874499377e8f89a25d8cc2cf7982e6811d53f1b
\ No newline at end of file
diff --git a/src/test_config.c b/src/test_config.c
index 1fda2fc32d..2b933bfe18 100644
--- a/src/test_config.c
+++ b/src/test_config.c
@@ -16,7 +16,7 @@
 ** The focus of this file is providing the TCL testing layer
 ** access to compile-time constants.
 **
-** $Id: test_config.c,v 1.12 2007/08/22 20:18:22 drh Exp $
+** $Id: test_config.c,v 1.13 2007/08/29 17:59:42 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -77,6 +77,12 @@ static void set_options(Tcl_Interp *interp){
   Tcl_SetVar2(interp, "sqlite_options", "analyze", "1", TCL_GLOBAL_ONLY);
 #endif
 
+#ifdef SQLITE_ENABLE_ATOMIC_WRITE
+  Tcl_SetVar2(interp, "sqlite_options", "atomicwrite", "1", TCL_GLOBAL_ONLY);
+#else
+  Tcl_SetVar2(interp, "sqlite_options", "atomicwrite", "0", TCL_GLOBAL_ONLY);
+#endif
+
 #ifdef SQLITE_OMIT_ATTACH
   Tcl_SetVar2(interp, "sqlite_options", "attach", "0", TCL_GLOBAL_ONLY);
 #else
diff --git a/test/io.test b/test/io.test
index 7cdfba0ca3..320626f578 100644
--- a/test/io.test
+++ b/test/io.test
@@ -13,7 +13,7 @@
 # IO traffic generated by SQLite (making sure SQLite is not writing out
 # more database pages than it has to, stuff like that).
 #
-# $Id: io.test,v 1.6 2007/08/24 11:52:29 danielk1977 Exp $
+# $Id: io.test,v 1.7 2007/08/29 17:59:42 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -111,6 +111,7 @@ do_test io-1.5 {
 } {3}
 
 
+ifcapable atomicwrite {
 
 #----------------------------------------------------------------------
 # Test cases io-2.* test the atomic-write optimization.
@@ -331,6 +332,7 @@ do_test io-2.10.2 {
 do_test io-2.10.3 {
   execsql { ROLLBACK }
 } {}
+} ;# /* ifcapable atomicwrite */
 
 #----------------------------------------------------------------------
 # Test cases io-3.* test the IOCAP_SEQUENTIAL optimization.
@@ -490,6 +492,9 @@ foreach {char                 sectorsize pgsize} {
   file delete -force test.db test.db-journal
   sqlite3_simulate_device -char $char -sectorsize $sectorsize
   sqlite3 db test.db
+  ifcapable !atomicwrite {
+    if {[regexp {^atomic} $char]} continue
+  }
   do_test io-5.$tn {
     execsql {
       CREATE TABLE abc(a, b, c);
@@ -500,4 +505,3 @@ foreach {char                 sectorsize pgsize} {
 
 sqlite3_simulate_device -char {} -sectorsize 0
 finish_test
-