diff --git a/src/test/java/io/spring/application/article/ArticleQueryServiceTest.java b/src/test/java/io/spring/application/article/ArticleQueryServiceTest.java
index 96229376c..bb70a64fa 100644
--- a/src/test/java/io/spring/application/article/ArticleQueryServiceTest.java
+++ b/src/test/java/io/spring/application/article/ArticleQueryServiceTest.java
@@ -28,6 +28,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Import;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
 @Import({
   ArticleQueryService.class,
   MyBatisUserRepository.class,
@@ -180,6 +182,15 @@ public void should_query_article_by_favorite() {
     Assertions.assertTrue(articleData.isFavorited());
   }
 
+  @Test
+  public void shouldReturnEmpstyOptionalWhenFindBySlugIsCalledWithNonExistingSlug() {
+    User user = new User("test@test.com", "test", "123", "", "");
+
+    Optional<ArticleData> result = queryService.findBySlug("non-existing-slug", user);
+
+    assertFalse(result.isPresent());
+  }
+
   @Test
   public void should_query_article_by_tag() {
     Article anotherArticle =