diff --git a/src/update_engine/simple_key_value_store_unittest.cc b/src/update_engine/simple_key_value_store_unittest.cc
index 345bbda..2987537 100644
--- a/src/update_engine/simple_key_value_store_unittest.cc
+++ b/src/update_engine/simple_key_value_store_unittest.cc
@@ -18,7 +18,7 @@ namespace chromeos_update_engine {
 class SimpleKeyValueStoreTest : public ::testing::Test {};
 
 TEST(SimpleKeyValueStoreTest, SimpleTest) {
-  string blob = "A=B\nC=\n=\nFOO=BAR=BAZ\nALIAS='my alias'\nTEST=\"this is a test\"\nBAR=BAX\nMISSING=NEWLINE";
+  string blob = "A=B\nC=\n=\nFOO=BAR=BAZ\nALIAS='my alias'\nEMPTY=''\nD=\"\"\nTEST=\"this is a test\"\nBAR=BAX\nMISSING=NEWLINE";
   map<string, string> parts = simple_key_value_store::ParseString(blob);
   string combined = simple_key_value_store::AssembleString(parts);
   map<string, string> combined_parts =
@@ -26,7 +26,7 @@ TEST(SimpleKeyValueStoreTest, SimpleTest) {
   map<string, string>* maps[] = { &parts, &combined_parts };
   for (size_t i = 0; i < arraysize(maps); i++) {
     map<string, string>* test_map = maps[i];
-    EXPECT_EQ(8, test_map->size()) << "i = " << i;
+    EXPECT_EQ(10, test_map->size()) << "i = " << i;
     EXPECT_EQ("B", (*test_map)["A"]) << "i = " << i;
     EXPECT_EQ("", (*test_map)["C"]) << "i = " << i;
     EXPECT_EQ("", (*test_map)[""]) << "i = " << i;
@@ -35,6 +35,8 @@ TEST(SimpleKeyValueStoreTest, SimpleTest) {
     EXPECT_EQ("NEWLINE", (*test_map)["MISSING"]) << "i = " << i;
     EXPECT_EQ("my alias", (*test_map)["ALIAS"]) << "i = " << i;
     EXPECT_EQ("this is a test", (*test_map)["TEST"]) << "i = " << i;
+    EXPECT_EQ("", (*test_map)["EMPTY"]) << "i = " << i;
+    EXPECT_EQ("", (*test_map)["D"]) << "i = " << i;
   }
 }