Index: src/test_config.c
==================================================================
--- src/test_config.c
+++ src/test_config.c
@@ -211,10 +211,16 @@
 #ifdef SQLITE_ENABLE_JSON1
   Tcl_SetVar2(interp, "sqlite_options", "json1", "1", TCL_GLOBAL_ONLY);
 #else
   Tcl_SetVar2(interp, "sqlite_options", "json1", "0", TCL_GLOBAL_ONLY);
 #endif
+
+#ifdef SQLITE_HAS_CODEC
+  Tcl_SetVar2(interp, "sqlite_options", "has_codec", "1", TCL_GLOBAL_ONLY);
+#else
+  Tcl_SetVar2(interp, "sqlite_options", "has_codec", "0", TCL_GLOBAL_ONLY);
+#endif
 
 #ifdef SQLITE_LIKE_DOESNT_MATCH_BLOBS
   Tcl_SetVar2(interp, "sqlite_options", "like_match_blobs", "0", TCL_GLOBAL_ONLY);
 #else
   Tcl_SetVar2(interp, "sqlite_options", "like_match_blobs", "1", TCL_GLOBAL_ONLY);

Index: test/pragma.test
==================================================================
--- test/pragma.test
+++ test/pragma.test
@@ -1932,28 +1932,29 @@
     PRAGMA foreign_key_list(t2);
   }
 } {0 0 t1 y {} {NO ACTION} {NO ACTION} NONE}
 db2 close
 
-reset_db
-do_execsql_test 24.0 {
-  PRAGMA page_size = 1024;
-  CREATE TABLE t1(a, b, c);
-  CREATE INDEX i1 ON t1(b);
-  INSERT INTO t1 VALUES('a', 'b', 'c');
-  PRAGMA integrity_check;
-} {ok}
-
-set r [db one {SELECT rootpage FROM sqlite_master WHERE name = 't1'}]
-db close
-hexio_write test.db [expr $r*1024 - 16] 000000000000000701040f0f1f616263
-
-sqlite3 db test.db
-do_catchsql_test 24.1 {
-  SELECT * FROM t1;
-} {1 {database disk image is malformed}}
-do_catchsql_test 24.2 {
-  PRAGMA integrity_check;
-} {0 {{database disk image is malformed}}}
-
+ifcapable !has_codec {
+  reset_db
+  do_execsql_test 24.0 {
+    PRAGMA page_size = 1024;
+    CREATE TABLE t1(a, b, c);
+    CREATE INDEX i1 ON t1(b);
+    INSERT INTO t1 VALUES('a', 'b', 'c');
+    PRAGMA integrity_check;
+  } {ok}
+  
+  set r [db one {SELECT rootpage FROM sqlite_master WHERE name = 't1'}]
+  db close
+  hexio_write test.db [expr $r*1024 - 16] 000000000000000701040f0f1f616263
+  
+  sqlite3 db test.db
+  do_catchsql_test 24.1 {
+    SELECT * FROM t1;
+  } {1 {database disk image is malformed}}
+  do_catchsql_test 24.2 {
+    PRAGMA integrity_check;
+  } {0 {{database disk image is malformed}}}
+}  
 database_never_corrupt
 finish_test

Index: test/schema6.test
==================================================================
--- test/schema6.test
+++ test/schema6.test
@@ -16,10 +16,11 @@
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 set ::testprefix schema6
+do_not_use_codec
 
 # Command:   check_same_database_content TESTNAME SQL1 SQL2 SQL3 ...
 #
 # This command creates fresh databases using SQL1 and subsequent arguments
 # and checks to make sure the content of all database files is byte-for-byte

Index: test/swarmvtab.test
==================================================================
--- test/swarmvtab.test
+++ test/swarmvtab.test
@@ -13,10 +13,11 @@
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 set testprefix swarmvtab
+do_not_use_codec
 
 ifcapable !vtab {
   finish_test
   return
 }
@@ -241,6 +242,5 @@
 do_catchsql_test 3.3.2 { SELECT * FROM xyz } {1 {fetch_db error!}}
 
 
 
 finish_test
-

Index: test/swarmvtab2.test
==================================================================
--- test/swarmvtab2.test
+++ test/swarmvtab2.test
@@ -13,10 +13,11 @@
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 set testprefix swarmvtab
+do_not_use_codec
 
 ifcapable !vtab {
   finish_test
   return
 }