Index: src/dbstat.c
==================================================================
--- src/dbstat.c
+++ src/dbstat.c
@@ -644,6 +644,8 @@
     0,                            /* xFindMethod */
     0,                            /* xRename */
   };
   return sqlite3_create_module(db, "dbstat", &dbstat_module, 0);
 }
+#else  /* Without the proper defines, sqlite3DbstatRegister is a no-op */
+int sqlite3DbstatRegister(sqlite3 *db){ return SQLITE_OK; }
 #endif /* SQLITE_ENABLE_DBSTAT_VTAB */

Index: test/analyzer1.test
==================================================================
--- test/analyzer1.test
+++ test/analyzer1.test
@@ -11,10 +11,16 @@
 #
 # Quick tests for the sqlite3_analyzer tool
 #
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
+
+ifcapable !vtab {
+  finish_test
+  return
+}
+
 if {$tcl_platform(platform)=="windows"} {
   set PROG "sqlite3_analyzer.exe"
 } else {
   set PROG "./sqlite3_analyzer"
 }

Index: test/sqldiff1.test
==================================================================
--- test/sqldiff1.test
+++ test/sqldiff1.test
@@ -11,10 +11,11 @@
 #
 # Quick tests for the sqldiff tool
 #
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
+
 if {$tcl_platform(platform)=="windows"} {
   set PROG "sqldiff.exe"
 } else {
   set PROG "./sqldiff"
 }

Index: tool/sqldiff.c
==================================================================
--- tool/sqldiff.c
+++ tool/sqldiff.c
@@ -1157,16 +1157,18 @@
       }else
       if( strcmp(z,"help")==0 ){
         showHelp();
         return 0;
       }else
+#ifndef SQLITE_OMIT_LOAD_EXTENSION
       if( strcmp(z,"lib")==0 || strcmp(z,"L")==0 ){
         if( i==argc-1 ) cmdlineError("missing argument to %s", argv[i]);
         azExt = realloc(azExt, sizeof(azExt[0])*(nExt+1));
         if( azExt==0 ) cmdlineError("out of memory");
         azExt[nExt++] = argv[++i];
       }else
+#endif
       if( strcmp(z,"primarykey")==0 ){
         g.bSchemaPK = 1;
       }else
       if( strcmp(z,"schema")==0 ){
         g.bSchemaOnly = 1;
@@ -1198,17 +1200,19 @@
   }
   rc = sqlite3_exec(g.db, "SELECT * FROM sqlite_master", 0, 0, &zErrMsg);
   if( rc || zErrMsg ){
     cmdlineError("\"%s\" does not appear to be a valid SQLite database", zDb1);
   }
+#ifndef SQLITE_OMIT_LOAD_EXTENSION
   sqlite3_enable_load_extension(g.db, 1);
   for(i=0; i<nExt; i++){
     rc = sqlite3_load_extension(g.db, azExt[i], 0, &zErrMsg);
     if( rc || zErrMsg ){
       cmdlineError("error loading %s: %s", azExt[i], zErrMsg);
     }
   }
+#endif
   free(azExt);
   zSql = sqlite3_mprintf("ATTACH %Q as aux;", zDb2);
   rc = sqlite3_exec(g.db, zSql, 0, 0, &zErrMsg);
   if( rc || zErrMsg ){
     cmdlineError("cannot attach database \"%s\"", zDb2);