@@ -345,10 +345,14 @@
     (let ((newval (conc (args:get-arg "-testpatt") "/" (args:get-arg "-itempatt"))))
       (debug:print 0 "WARNING: -itempatt has been deprecated, please use -testpatt testpatt/itempatt method, new testpatt is "newval)
       (hash-table-set! args:arg-hash "-testpatt" newval)
       (hash-table-delete! args:arg-hash "-itempatt")))
 
+(on-exit (lambda ()
+	   (if *megatest-db*
+	       (db:close-all *megatest-db*))))
+
 ;;======================================================================
 ;; Misc general calls
 ;;======================================================================
 
 (if (args:get-arg "-env2file")