diff --git a/test/TwDocumentTest.vala b/test/TwDocumentTest.vala
index e15ec8d499e3d22db7576db50dbb929edb104d16..32d3c77cd95b2a509f3ae7a3cb48d54382b8c2be 100644
--- a/test/TwDocumentTest.vala
+++ b/test/TwDocumentTest.vala
@@ -27,6 +27,9 @@ using GXml;
 class TwDocumentTest : GXmlTest {
 	public static void add_tests () {
 		Test.add_func ("/gxml/tw-document/root", () => {
+			try {
+				var f = GLib.File.new_for_path (GXmlTestConfig.TEST_SAVE_DIR+"/tw-test.xml");
+				if (f.query_exists ()) f.delete ();
 				var d = new TwDocument (GXmlTestConfig.TEST_SAVE_DIR+"/tw-test.xml");
 				var e = d.create_element ("root");
 				d.childs.add (e);
@@ -34,16 +37,39 @@ class TwDocumentTest : GXmlTest {
 				assert (d.root != null);
 				assert (d.root.name == "root");
 				assert (d.root.value == null);
+			}
+			catch (GLib.Error e) {
+#if DEBUG
+				GLib.message (@"ERROR: $(e.message)");
+#endif
+				assert_not_reached ();
+			}
 			});
 		Test.add_func ("/gxml/tw-document/save/root", () => {
-				var d = new TwDocument (GXmlTestConfig.TEST_SAVE_DIR+"/tw-test.xml");
-				var e = d.create_element ("root");
-				d.childs.add (e);
-				assert (d.childs.size == 1);
-				assert (d.root != null);
-				assert (d.root.name == "root");
-				assert (d.root.value == null);
-				d.save ();
+				try {
+					var f = GLib.File.new_for_path (GXmlTestConfig.TEST_SAVE_DIR+"/tw-test.xml");
+					if (f.query_exists ()) f.delete ();
+					var d = new TwDocument (GXmlTestConfig.TEST_SAVE_DIR+"/tw-test.xml");
+					var e = d.create_element ("root");
+					d.childs.add (e);
+					assert (d.childs.size == 1);
+					assert (d.root != null);
+					assert (d.root.name == "root");
+					assert (d.root.value == null);
+					d.save ();
+					var istream = f.read ();
+					uint8[] buffer = new uint8[2048];
+					istream.read_all (buffer, null);
+					istream.close ();
+					assert ("<?xml version=\"1.0\"?>" in ((string)buffer));
+					assert ("<root/>" in ((string)buffer));
+				}
+				catch (GLib.Error e) {
+#if DEBUG
+					GLib.message (@"ERROR: $(e.message)");
+#endif
+					assert_not_reached ();
+				}
 			});
 	}
 }