Index: src/loadext.c
==================================================================
--- src/loadext.c
+++ src/loadext.c
@@ -461,11 +461,15 @@
 #endif
   /* Version 3.28.0 and later */
   sqlite3_stmt_isexplain,
   sqlite3_value_frombind,
   /* Version 3.30.0 and later */
+#ifndef SQLITE_OMIT_VIRTUALTABLE
   sqlite3_drop_modules,
+#else
+  0,
+#endif
 };
 
 /*
 ** Attempt to load an SQLite extension library contained in the file
 ** zFile.  The entry point is zProc.  zProc may be 0 in which case a

Index: test/without_rowid1.test
==================================================================
--- test/without_rowid1.test
+++ test/without_rowid1.test
@@ -14,10 +14,14 @@
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 set testprefix without_rowid1
+
+proc do_execsql_test_if_vtab {tn sql {res {}}} {
+  ifcapable vtab { uplevel [list do_execsql_test $tn $sql $res] }
+}
 
 # Create and query a WITHOUT ROWID table.
 #
 do_execsql_test without_rowid1-1.0 {
   CREATE TABLE t1(a,b,c,d, PRIMARY KEY(c,a)) WITHOUT ROWID;
@@ -29,11 +33,11 @@
   SELECT *, '|' FROM t1 ORDER BY c, a;
 } {arctic sleep ammonia helena | journal sherman ammonia helena | dynamic juliet flipper command | journal sherman gamma patriot |}
 
 integrity_check without_rowid1-1.0ic
 
-do_execsql_test without_rowid1-1.0ixi {
+do_execsql_test_if_vtab without_rowid1-1.0ixi {
   SELECT name, key FROM pragma_index_xinfo('t1');
 } {c 1 a 1 b 0 d 0}
 
 do_execsql_test without_rowid1-1.1 {
   SELECT *, '|' FROM t1 ORDER BY +c, a;
@@ -117,11 +121,11 @@
 } {abc def}
 do_execsql_test 2.1.2 {
   UPDATE t4 SET a = 'ABC';
   SELECT * FROM t4;
 } {ABC def}
-do_execsql_test 2.1.3 {
+do_execsql_test_if_vtab 2.1.3 {
   SELECT name, coll, key FROM pragma_index_xinfo('t4');
 } {a nocase 1 b BINARY 0}
 
 do_execsql_test 2.2.1 {
   DROP TABLE t4;
@@ -133,11 +137,11 @@
 do_execsql_test 2.2.2 {
   UPDATE t4 SET a = 'ABC', b = 'xyz';
   SELECT * FROM t4;
 } {xyz ABC}
 
-do_execsql_test 2.2.3 {
+do_execsql_test_if_vtab 2.2.3 {
   SELECT name, coll, key FROM pragma_index_xinfo('t4');
 } {a nocase 1 b BINARY 0}
 
 
 do_execsql_test 2.3.1 {
@@ -144,11 +148,11 @@
   CREATE TABLE t5 (a, b, PRIMARY KEY(b, a)) WITHOUT ROWID;
   INSERT INTO t5(a, b) VALUES('abc', 'def');
   UPDATE t5 SET a='abc', b='def';
 } {}
 
-do_execsql_test 2.3.2 {
+do_execsql_test_if_vtab 2.3.2 {
   SELECT name, coll, key FROM pragma_index_xinfo('t5');
 } {b BINARY 1 a BINARY 1}
 
 
 do_execsql_test 2.4.1 {
@@ -163,11 +167,11 @@
 do_execsql_test 2.4.2 {
   SELECT * FROM t6 ORDER BY b, a;
   SELECT * FROM t6 ORDER BY c;
 } {ABC def ghi ABC def ghi}
 
-do_execsql_test 2.4.3 {
+do_execsql_test_if_vtab 2.4.3 {
   SELECT name, coll, key FROM pragma_index_xinfo('t6');
 } {b BINARY 1 a nocase 1 c BINARY 0}
 
 
 #-------------------------------------------------------------------------

Index: test/without_rowid6.test
==================================================================
--- test/without_rowid6.test
+++ test/without_rowid6.test
@@ -13,20 +13,24 @@
 # has redundant columns.
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
+
+proc do_execsql_test_if_vtab {tn sql {res {}}} {
+  ifcapable vtab { uplevel [list do_execsql_test $tn $sql $res] }
+}
 
 do_execsql_test without_rowid6-100 {
   CREATE TABLE t1(a,b,c,d,e, PRIMARY KEY(a,b,c,a,b,c,d,a,b,c)) WITHOUT ROWID;
   CREATE INDEX t1a ON t1(b, b);
   WITH RECURSIVE
     c(i) AS (VALUES(1) UNION ALL SELECT i+1 FROM c WHERE i<1000)
   INSERT INTO t1(a,b,c,d,e) SELECT i, i+1000, printf('x%dy',i), 0, 0 FROM c;
   ANALYZE;
 } {}
-do_execsql_test without_rowid6-101 {
+do_execsql_test_if_vtab without_rowid6-101 {
   SELECT name, key FROM pragma_index_xinfo('t1');
 } {a 1 b 1 c 1 d 1 e 0}
 do_execsql_test without_rowid6-110 {
   SELECT c FROM t1 WHERE a=123;
 } {x123y}
@@ -52,11 +56,11 @@
     PRIMARY KEY(b)
   ) WITHOUT ROWID;
   INSERT INTO t1(a,b,c) VALUES(1,8,3),(4,5,6),(7,2,9);
   SELECT a FROM t1 WHERE b>3 ORDER BY b;
 } {4 1}
-do_execsql_test without_rowid6-201 {
+do_execsql_test_if_vtab without_rowid6-201 {
   SELECT name, key FROM pragma_index_xinfo('t1');
 } {b 1 a 0 c 0}
 do_execsql_test without_rowid6-210 {
   EXPLAIN QUERY PLAN
   SELECT a FROM t1 WHERE b>3 ORDER BY b;
@@ -109,11 +113,11 @@
     PRIMARY KEY(b,c)
   ) WITHOUT ROWID;
   INSERT INTO t1(a,b,c) VALUES(1,8,3),(4,5,6),(7,2,9);
   SELECT a FROM t1 WHERE b>3 ORDER BY b;
 } {4 1}
-do_execsql_test without_rowid6-501 {
+do_execsql_test_if_vtab without_rowid6-501 {
   SELECT name, key FROM pragma_index_xinfo('t1');
 } {b 1 c 1 a 0}
 do_execsql_test without_rowid6-510 {
   EXPLAIN QUERY PLAN
   SELECT a FROM t1 WHERE b>3 ORDER BY b;

Index: test/without_rowid7.test
==================================================================
--- test/without_rowid7.test
+++ test/without_rowid7.test
@@ -12,10 +12,14 @@
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 set testprefix without_rowid7
+
+proc do_execsql_test_if_vtab {tn sql {res {}}} {
+  ifcapable vtab { uplevel [list do_execsql_test $tn $sql $res] }
+}
 
 do_execsql_test 1.0 {
   CREATE TABLE t1(a, b COLLATE nocase, PRIMARY KEY(a, a, b)) WITHOUT ROWID;
 }
 
@@ -34,17 +38,17 @@
 } {one}
 
 do_execsql_test 2.2a {
   PRAGMA index_info(t2);
 } {0 0 a 1 0 a}
-do_execsql_test 2.2b {
+do_execsql_test_if_vtab 2.2b {
   SELECT *, '|' FROM pragma_index_info('t2');
 } {0 0 a | 1 0 a |}
 do_execsql_test 2.3a {
   PRAGMA index_xinfo(t2);
 } {0 0 a 0 nocase 1 1 0 a 0 BINARY 1 2 1 b 0 BINARY 0}
-do_execsql_test 2.3b {
+do_execsql_test_if_vtab 2.3b {
   SELECT *, '|' FROM pragma_index_xinfo('t2');
 } {0 0 a 0 nocase 1 | 1 0 a 0 BINARY 1 | 2 1 b 0 BINARY 0 |}
 
 do_execsql_test 2.4 {
   CREATE TABLE t3(a, b, PRIMARY KEY(a COLLATE nocase, a));