Index: ext/fts5/test/fts5_common.tcl
==================================================================
--- ext/fts5/test/fts5_common.tcl
+++ ext/fts5/test/fts5_common.tcl
@@ -13,12 +13,15 @@
 if {![info exists testdir]} {
   set testdir [file join [file dirname [info script]] .. .. .. test]
 }
 source $testdir/tester.tcl
 
-
-catch { sqlite3_fts5_may_be_corrupt 0 }
+catch { 
+  sqlite3_fts5_may_be_corrupt 0 
+  append G(perm:dbconfig) "; load_static_extension \$::dbhandle fts5"
+  reset_db
+}
 
 proc fts5_test_poslist {cmd} {
   set res [list]
   for {set i 0} {$i < [$cmd xInstCount]} {incr i} {
     lappend res [string map {{ } .} [$cmd xInst $i]]

Index: ext/fts5/test/fts5fault1.test
==================================================================
--- ext/fts5/test/fts5fault1.test
+++ ext/fts5/test/fts5fault1.test
@@ -277,11 +277,11 @@
 do_faultsim_test 7.0 -faults oom* -prep {
   catch { db close }
 } -body {
   sqlite3 db test.db
 } -test {
-  faultsim_test_result [list 0 {}] [list 1 {}]
+  faultsim_test_result [list 0 {}] {1 {}} {1 {initialization of fts5 failed: }}
 }
 
 #-------------------------------------------------------------------------
 # A prefix query against a large document set.
 #

Index: src/main.c
==================================================================
--- src/main.c
+++ src/main.c
@@ -17,13 +17,10 @@
 #include "sqliteInt.h"
 
 #ifdef SQLITE_ENABLE_FTS3
 # include "fts3.h"
 #endif
-#ifdef SQLITE_ENABLE_FTS5
-int sqlite3_fts5_init(sqlite3*, char**, const void*);
-#endif
 #ifdef SQLITE_ENABLE_RTREE
 # include "rtree.h"
 #endif
 #ifdef SQLITE_ENABLE_ICU
 # include "sqliteicu.h"
@@ -2868,16 +2865,10 @@
 
 #ifdef SQLITE_ENABLE_FTS3
   if( !db->mallocFailed && rc==SQLITE_OK ){
     rc = sqlite3Fts3Init(db);
   }
-#endif
-
-#ifdef SQLITE_ENABLE_FTS5
-  if( !db->mallocFailed && rc==SQLITE_OK ){
-    rc = sqlite3_fts5_init(db, 0, 0);
-  }
 #endif
 
 #ifdef SQLITE_ENABLE_ICU
   if( !db->mallocFailed && rc==SQLITE_OK ){
     rc = sqlite3IcuInit(db);

Index: src/test1.c
==================================================================
--- src/test1.c
+++ src/test1.c
@@ -6341,17 +6341,21 @@
   extern int sqlite3_percentile_init(sqlite3*,char**,const sqlite3_api_routines*);
   extern int sqlite3_regexp_init(sqlite3*,char**,const sqlite3_api_routines*);
   extern int sqlite3_spellfix_init(sqlite3*,char**,const sqlite3_api_routines*);
   extern int sqlite3_totype_init(sqlite3*,char**,const sqlite3_api_routines*);
   extern int sqlite3_wholenumber_init(sqlite3*,char**,const sqlite3_api_routines*);
+  extern int sqlite3_fts5_init(sqlite3*,char**,const sqlite3_api_routines*);
   static const struct {
     const char *zExtName;
     int (*pInit)(sqlite3*,char**,const sqlite3_api_routines*);
   } aExtension[] = {
     { "amatch",                sqlite3_amatch_init               },
     { "closure",               sqlite3_closure_init              },
     { "eval",                  sqlite3_eval_init                 },
+#ifdef SQLITE_ENABLE_FTS5
+    { "fts5",                  sqlite3_fts5_init                 },
+#endif
     { "fileio",                sqlite3_fileio_init               },
     { "fuzzer",                sqlite3_fuzzer_init               },
     { "ieee754",               sqlite3_ieee_init                 },
     { "nextchar",              sqlite3_nextchar_init             },
     { "percentile",            sqlite3_percentile_init           },