Index: ext/fts3/fts3.c
==================================================================
--- ext/fts3/fts3.c
+++ ext/fts3/fts3.c
@@ -575,18 +575,10 @@
   int nName;
 
   const char *zTokenizer = 0;               /* Name of tokenizer to use */
   sqlite3_tokenizer *pTokenizer = 0;        /* Tokenizer for this table */
 
-#ifdef SQLITE_TEST
-  const char *zTestParam = 0;
-  if( strncmp(argv[argc-1], "test:", 5)==0 ){
-    zTestParam = argv[argc-1];
-    argc--;
-  }
-#endif
-
   nDb = (int)strlen(argv[1]) + 1;
   nName = (int)strlen(argv[2]) + 1;
   for(i=3; i<argc; i++){
     char const *z = argv[i];
     rc = sqlite3Fts3InitTokenizer(pHash, z, &pTokenizer, &zTokenizer, pzErr);
@@ -670,15 +662,10 @@
   }
 
   rc = fts3DeclareVtab(p);
   if( rc!=SQLITE_OK ) goto fts3_init_out;
 
-#ifdef SQLITE_TEST
-  if( zTestParam ){
-    p->nNodeSize = atoi(&zTestParam[5]);
-  }
-#endif
   *ppVTab = &p->base;
 
 fts3_init_out:
   assert( p || (pTokenizer && rc!=SQLITE_OK) );
   if( rc!=SQLITE_OK ){
@@ -2279,16 +2266,10 @@
     ){
       rc = SQLITE_NOMEM;
     }
   }
 
-#ifdef SQLITE_TEST
-  if( rc==SQLITE_OK ){
-    rc = sqlite3Fts3ExprInitTestInterface(db);
-  }
-#endif
-
   /* Create the virtual table wrapper around the hash-table and overload 
   ** the two scalar functions. If this is successful, register the
   ** module with sqlite.
   */
   if( SQLITE_OK==rc 

Index: ext/fts3/fts3_write.c
==================================================================
--- ext/fts3/fts3_write.c
+++ ext/fts3/fts3_write.c
@@ -2215,10 +2215,15 @@
     rc = fts3SegmentMerge(p, -1);
     if( rc==SQLITE_DONE || rc==SQLITE_OK ){
       rc = SQLITE_OK;
       sqlite3Fts3PendingTermsClear(p);
     }
+#ifdef SQLITE_TEST
+  }else if( nVal>9 && 0==sqlite3_strnicmp(zVal, "nodesize=", 9) ){
+    p->nNodeSize = atoi(&zVal[9]);
+    rc = SQLITE_OK;
+#endif
   }else{
     rc = SQLITE_ERROR;
   }
 
   return rc;

Index: main.mk
==================================================================
--- main.mk
+++ main.mk
@@ -260,11 +260,11 @@
   $(TOP)/src/printf.c $(TOP)/src/random.c $(TOP)/src/pcache.c                  \
   $(TOP)/src/pcache1.c $(TOP)/src/select.c $(TOP)/src/tokenize.c               \
   $(TOP)/src/utf.c $(TOP)/src/util.c $(TOP)/src/vdbeapi.c $(TOP)/src/vdbeaux.c \
   $(TOP)/src/vdbe.c $(TOP)/src/vdbemem.c $(TOP)/src/where.c parse.c            \
   $(TOP)/ext/fts3/fts3.c $(TOP)/ext/fts3/fts3_expr.c                           \
-  $(TOP)/ext/fts3/fts3_tokenizer.c                                             \
+  $(TOP)/ext/fts3/fts3_tokenizer.c $(TOP)/ext/fts3/fts3_write.c                \
   $(TOP)/ext/async/sqlite3async.c
 
 # Header files used by all library source files.
 #
 HDR = \

Index: test/fts3rnd.test
==================================================================
--- test/fts3rnd.test
+++ test/fts3rnd.test
@@ -212,11 +212,12 @@
 
   # Create the FTS3 table. Populate it (and the Tcl array) with 100 rows.
   #
   db transaction {
     catchsql { DROP TABLE t1 }
-    execsql "CREATE VIRTUAL TABLE t1 USING fts3(a, b, c, test:$nodesize)"
+    execsql "CREATE VIRTUAL TABLE t1 USING fts3(a, b, c)"
+    execsql "INSERT INTO t1(t1) VALUES('nodesize=$nodesize')"
     for {set i 0} {$i < 100} {incr i} { insert_row $i }
   }
   
   for {set iTest 0} {$iTest <= 100} {incr iTest} {
     catchsql COMMIT