diff --git a/manifest b/manifest
index 416a40d864..315698b1df 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\svariable\stype\smismatch\sproblem\sin\sthe\ssnapshot\slogic.
-D 2015-12-11T03:16:54.491
+C Disable\sthe\ssnapshot\stest\sscripts\sif\snot\scompiled\swith\sSQLITE_ENABLE_SNAPSHOT.
+D 2015-12-11T03:20:39.887
 F Makefile.in 28bcd6149e050dff35d4dcfd97e890cd387a499d
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e8fdca1cb89a1b58b5f4d3a130ea9a3d28cb314d
@@ -363,7 +363,7 @@ F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
 F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
 F src/test_blob.c e5a7a81d61a780da79101aeb1e60d300af169e07
 F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
-F src/test_config.c 48850687dd5abc8260e23835632511054ccae172
+F src/test_config.c 0dee90328e3dedf8ba002ee94b6a7e7ea7726fe4
 F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
 F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
 F src/test_fs.c 993c7eab65bed6add4bb48cca29775e963f710cf
@@ -1020,8 +1020,8 @@ F test/skipscan2.test d1d1450952b7275f0b0a3a981f0230532743951a
 F test/skipscan3.test ec5bab3f81c7038b43450e7b3062e04a198bdbb5
 F test/skipscan5.test 67817a4b6857c47e0e33ba3e506da6f23ef68de2
 F test/skipscan6.test 5866039d03a56f5bd0b3d172a012074a1d90a15b
-F test/snapshot.test bfcf728577d674d85b7da4bc69786ecafd2acebe
-F test/snapshot_fault.test 06472056c516be4610834de4688ea3357e8bde01
+F test/snapshot.test efc6b4edc5d571161835f9dd8552e181ad1f0ac2
+F test/snapshot_fault.test 25973aeb1b86a280800e0bcf1eb5ce70e9ef57ab
 F test/soak.test 0b5b6375c9f4110c828070b826b3b4b0bb65cd5f
 F test/softheap1.test 843cd84db9891b2d01b9ab64cef3e9020f98d087
 F test/sort.test 3f492e5b7be1d3f756728d2ff6edf4f6091e84cb
@@ -1410,7 +1410,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 767ee30efa5dd469e3a51d4e44cbe473061819b9
-R eb5f4e9ed632ef0781ac556c357a0ce5
+P 93fb8010e4999b6b832d63a7c5a152f65d4415a3
+R f04d367372fb1067c3ab40fd75809ec7
 U drh
-Z feb7b065ed13d6bdb0be293940a48a66
+Z 1fa92043878ab0279cb81464491eddf8
diff --git a/manifest.uuid b/manifest.uuid
index 27b39abfda..bf47079e76 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-93fb8010e4999b6b832d63a7c5a152f65d4415a3
\ No newline at end of file
+5fd008f0433833e4341d526dcc2387570ffe1fea
\ No newline at end of file
diff --git a/src/test_config.c b/src/test_config.c
index a9ef182e02..30b421e00b 100644
--- a/src/test_config.c
+++ b/src/test_config.c
@@ -143,6 +143,12 @@ static void set_options(Tcl_Interp *interp){
   Tcl_SetVar2(interp, "sqlite_options", "mem5", "0", TCL_GLOBAL_ONLY);
 #endif
 
+#ifdef SQLITE_ENABLE_SNAPSHOT
+  Tcl_SetVar2(interp, "sqlite_options", "snapshot", "1", TCL_GLOBAL_ONLY);
+#else
+  Tcl_SetVar2(interp, "sqlite_options", "snapshot", "0", TCL_GLOBAL_ONLY);
+#endif
+
 #ifdef SQLITE_MUTEX_OMIT
   Tcl_SetVar2(interp, "sqlite_options", "mutex", "0", TCL_GLOBAL_ONLY);
 #else
diff --git a/test/snapshot.test b/test/snapshot.test
index a01ac5a754..6e160166c3 100644
--- a/test/snapshot.test
+++ b/test/snapshot.test
@@ -14,6 +14,7 @@
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
+ifcapable !snapshot {finish_test; return}
 set testprefix snapshot
 
 #-------------------------------------------------------------------------
@@ -337,4 +338,3 @@ do_test 6.3 {
 sqlite3_snapshot_free $snapshot
 
 finish_test
-
diff --git a/test/snapshot_fault.test b/test/snapshot_fault.test
index a7731b8161..3ac13daefd 100644
--- a/test/snapshot_fault.test
+++ b/test/snapshot_fault.test
@@ -14,6 +14,7 @@
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
+ifcapable !snapshot {finish_test; return}
 set testprefix snapshot_fault
 
 #-------------------------------------------------------------------------
@@ -161,4 +162,3 @@ do_faultsim_test 3.0 -prep {
 
 
 finish_test
-