diff --git a/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/lazy/LazyTest.java b/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/lazy/LazyTest.java
index b51c683e..b3b7cd1c 100644
--- a/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/lazy/LazyTest.java
+++ b/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/lazy/LazyTest.java
@@ -361,6 +361,21 @@ void lazyClearAfterSave(@Autowired final ObjectWithLazyRepository<SimpleObject>
 		);
 	}
 	
+	@Test
+	void lazyClearThroughLazyManagerBeforeSave()
+	{
+		LazyReferenceManager.get().stop();
+		this.configuration.getStorageInstance().start();
+		final ObjectWithLazy<SimpleObject> newLazy = new ObjectWithLazy<>();
+		final SimpleObject objectToStore = new SimpleObject(TestData.DUMMY_STRING);
+		newLazy.setLazy(SpringDataEclipseStoreLazy.build(objectToStore));
+		Assertions.assertTrue(newLazy.getLazy().isLoaded());
+		Assertions.assertFalse(newLazy.getLazy().isStored());
+		LazyReferenceManager.get().cleanUp();
+		Assertions.assertTrue(newLazy.getLazy().isLoaded());
+		Assertions.assertFalse(newLazy.getLazy().isStored());
+	}
+	
 	@Test
 	void lazyClearThroughLazyManagerAfterSave(@Autowired final ObjectWithLazyRepository<SimpleObject> repository)
 	{