diff --git a/tests/TestKeePass2Writer.cpp b/tests/TestKeePass2Writer.cpp
index 049c3e66e..30d0cbf5a 100644
--- a/tests/TestKeePass2Writer.cpp
+++ b/tests/TestKeePass2Writer.cpp
@@ -65,12 +65,15 @@ void TestKeePass2Writer::initTestCase()
     buffer.open(QBuffer::ReadWrite);
 
     KeePass2Writer writer;
-    writer.writeDatabase(&buffer, m_dbOrg);
+    bool writeSuccess = writer.writeDatabase(&buffer, m_dbOrg);
+    QVERIFY(writeSuccess);
     QVERIFY(!writer.hasError());
     buffer.seek(0);
     KeePass2Reader reader;
     m_dbTest = reader.readDatabase(&buffer, key);
-    QVERIFY(!reader.hasError());
+    if (reader.hasError()) {
+        QFAIL(reader.errorString().toUtf8().constData());
+    }
     QVERIFY(m_dbTest);
 }
 
diff --git a/tests/TestKeys.cpp b/tests/TestKeys.cpp
index 990878e2d..a97287f39 100644
--- a/tests/TestKeys.cpp
+++ b/tests/TestKeys.cpp
@@ -153,12 +153,19 @@ void TestKeys::testCreateAndOpenFileKey()
 
     KeePass2Writer writer;
     writer.writeDatabase(&dbBuffer, dbOrg.data());
+    bool writeSuccess = writer.writeDatabase(&dbBuffer, dbOrg.data());
+    if (writer.hasError()) {
+        QFAIL(writer.errorString().toUtf8().constData());
+    }
+    QVERIFY(writeSuccess);
     dbBuffer.reset();
 
     KeePass2Reader reader;
     QScopedPointer<Database> dbRead(reader.readDatabase(&dbBuffer, compositeKey));
+    if (reader.hasError()) {
+        QFAIL(reader.errorString().toUtf8().constData());
+    }
     QVERIFY(dbRead);
-    QVERIFY(!reader.hasError());
     QCOMPARE(dbRead->metadata()->name(), dbName);
 }