diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index ccc85b570..6f3a6f00e 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -368,6 +368,27 @@ int TF2::id (const std::string& uuid)
   return 0;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+void TF2::clear ()
+{
+  _read_only       = false;
+  _dirty           = false;
+  _loaded_tasks    = false;
+  _loaded_lines    = false;
+  _loaded_contents = false;
+
+  _contents        = "";
+  _file._data      = "";
+
+  _tasks.clear ();
+  _added_tasks.clear ();
+  _modified_tasks.clear ();
+  _lines.clear ();
+  _added_lines.clear ();
+  _I2U.clear ();
+  _U2I.clear ();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // <label> <rw><dirty> <tasks> <lines> <contents>
 //
@@ -709,6 +730,19 @@ bool TDB2::verifyUniqueUUID (const std::string& uuid)
   return true;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+void TDB2::clear ()
+{
+  pending.clear ();
+  completed.clear ();
+  undo.clear ();
+  backlog.clear ();
+  synch_key.clear ();
+
+  _location = "";
+  _id = 1;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 void TDB2::dump ()
 {
diff --git a/src/TDB2.h b/src/TDB2.h
index db03dd23c..e63b1d21e 100644
--- a/src/TDB2.h
+++ b/src/TDB2.h
@@ -63,6 +63,7 @@ public:
   std::string uuid (int);
   int id (const std::string&);
 
+  void clear ();
   const std::string dump ();
 
 public:
@@ -104,6 +105,7 @@ public:
   bool get (const std::string&, Task&);
   const std::vector <Task> siblings (Task&);
 
+  void clear ();
   void dump ();
 
 private:
diff --git a/test/tdb2.t.cpp b/test/tdb2.t.cpp
index 20ec42f87..f24864648 100644
--- a/test/tdb2.t.cpp
+++ b/test/tdb2.t.cpp
@@ -97,6 +97,12 @@ int main (int argc, char** argv)
     t.is ((int) backlog.size (),   2, "TDB2 after add, 2 backlog task");
     t.is ((int) synch_key.size (), 0, "TDB2 after add, 0 synch_key");
 
+    context.tdb2.commit ();
+
+    // Reset for reuse.
+    context.tdb2.clear ();
+    context.tdb2.set_location (".");
+
     // TODO commit
     // TODO complete a task
     // TODO gc