diff --git a/test/storage/StorageTest.cpp b/test/storage/StorageTest.cpp
index b3fae8d37..3a8e3bdc1 100644
--- a/test/storage/StorageTest.cpp
+++ b/test/storage/StorageTest.cpp
@@ -195,3 +195,26 @@ TEST(StorageTest, MaxTest) {
         EXPECT_FALSE(storage.Get(key, res));
     }
 }
+
+TEST(StorageTest, NodeMoveOnGet) {
+    SimpleLRU storage(16);
+
+    storage.Put("KEY1", "val1");
+    storage.Put("KEY2", "val2");
+
+    std::string value;
+    storage.Get("KEY1", value);
+    storage.Put("KEY3", "val3");
+    EXPECT_TRUE(storage.Get("KEY1", value));
+    EXPECT_TRUE(value == "val1");
+}
+
+TEST(StorageTest, ProperCleanupOnSet) {
+    SimpleLRU storage(12);
+
+    storage.Put("KEY1", "val1");
+    storage.Put("KEY1", "longval1");
+    std::string value;
+    EXPECT_TRUE(storage.Get("KEY1", value));
+    EXPECT_TRUE(value == "longval1");
+}
\ No newline at end of file