Index: test/test_kv2.c
==================================================================
--- test/test_kv2.c
+++ test/test_kv2.c
@@ -289,12 +289,25 @@
     Tcl_WrongNumArgs(interp, 2, objv, "");
     return TCL_ERROR;
   }
 
   if( kvwg.xFactory==0 ){
-    sqlite4_env_config(0, SQLITE4_ENVCONFIG_KVSTORE_GET, "main", &kvwg.xFactory);
-    sqlite4_env_config(0, SQLITE4_ENVCONFIG_KVSTORE_PUSH, "main",newFileStorage);
+    sqlite4_env_config(0, SQLITE4_ENVCONFIG_KVSTORE_GET,"main", &kvwg.xFactory);
+    sqlite4_env_config(0, SQLITE4_ENVCONFIG_KVSTORE_PUSH,"main",newFileStorage);
+  }
+  return TCL_OK;
+}
+
+static int kvwrap_uninstall_cmd(Tcl_Interp *interp, int objc, Tcl_Obj **objv){
+  if( objc!=2 ){
+    Tcl_WrongNumArgs(interp, 2, objv, "");
+    return TCL_ERROR;
+  }
+
+  if( kvwg.xFactory ){
+    sqlite4_env_config(0, SQLITE4_ENVCONFIG_KVSTORE_POP,"main", &kvwg.xFactory);
+    kvwg.xFactory = 0;
   }
   return TCL_OK;
 }
 
 static int kvwrap_seek_cmd(Tcl_Interp *interp, int objc, Tcl_Obj **objv){
@@ -342,14 +355,15 @@
 ){
   struct Subcmd {
     const char *zCmd;
     int (*xCmd)(Tcl_Interp *, int, Tcl_Obj **);
   } aSub[] = {
-    { "install", kvwrap_install_cmd },
-    { "step",    kvwrap_step_cmd },
-    { "seek",    kvwrap_seek_cmd },
-    { "reset",   kvwrap_reset_cmd },
+    { "install",   kvwrap_install_cmd },
+    { "step",      kvwrap_step_cmd },
+    { "seek",      kvwrap_seek_cmd },
+    { "reset",     kvwrap_reset_cmd },
+    { "uninstall", kvwrap_uninstall_cmd },
   };
   int iSub;
   int rc;
 
   rc = Tcl_GetIndexFromObjStruct(

Index: test/tester.tcl
==================================================================
--- test/tester.tcl
+++ test/tester.tcl
@@ -760,10 +760,11 @@
     puts "******************************************************************"
   }
   if {$::cmdlinearg(binarylog)} {
     vfslog finalize binarylog
   }
+  kvwrap uninstall
   if {[lindex [sqlite4_env_status SQLITE4_ENVSTATUS_MALLOC_COUNT 0] 1]>0 ||
               [sqlite4_memory_used]>0} {
     puts "Unfreed memory: [sqlite4_memory_used] bytes in\
          [lindex [sqlite4_env_status SQLITE4_ENVSTATUS_MALLOC_COUNT 0] 1] allocations"
     incr nErr