diff --git a/tests/database-fixture.hpp b/tests/database-fixture.hpp
index d737582..598e304 100644
--- a/tests/database-fixture.hpp
+++ b/tests/database-fixture.hpp
@@ -41,7 +41,7 @@
   DatabaseFixture()
   {
     boost::filesystem::path parentDir{TMP_TESTS_PATH};
-    dbDir = parentDir / "test-home/.ndncert";
+    dbDir = parentDir / "test-home" / ".ndncert";
     if (!boost::filesystem::exists(dbDir)) {
       boost::filesystem::create_directory(dbDir);
     }
diff --git a/tests/unit-tests/crypto-helper.t.cpp b/tests/unit-tests/crypto-helper.t.cpp
index b9662b2..10e56cf 100644
--- a/tests/unit-tests/crypto-helper.t.cpp
+++ b/tests/unit-tests/crypto-helper.t.cpp
@@ -291,10 +291,10 @@
 
   uint8_t decrypted[256] = {0};
   size = aes_gcm_128_decrypt(ciphertext, size, aad, sizeof(aad), tag, key, iv, decrypted);
-  BOOST_CHECK(memcmp(decrypted, plaintext, sizeof(plaintext)) == 0);
+  BOOST_CHECK_EQUAL_COLLECTIONS(decrypted, decrypted + size,
+                                plaintext, plaintext + sizeof(plaintext));
 }
 
-
 BOOST_AUTO_TEST_CASE(BlockEncodingDecoding)
 {
   const uint8_t key[] = {0xbc, 0x22, 0xf3, 0xf0, 0x5c, 0xc4, 0x0d, 0xb9,