diff --git a/core-java-8/src/test/java/com/baeldung/customannotations/JsonSerializerUnitTest.java b/core-java-8/src/test/java/com/baeldung/customannotations/JsonSerializerUnitTest.java
new file mode 100644
index 0000000000..a1f0f423e9
--- /dev/null
+++ b/core-java-8/src/test/java/com/baeldung/customannotations/JsonSerializerUnitTest.java
@@ -0,0 +1,27 @@
+package com.baeldung.customannotations;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+public class JsonSerializerUnitTest {
+
+    @Test
+    public void givenObjectNotSerializedThenExceptionThrown() throws JsonSerializationException {
+        Object object = new Object();
+        ObjectToJsonConverter serializer = new ObjectToJsonConverter();
+        serializer.convertToJson(object);
+        assertThrows(JsonSerializationException.class, () -> {
+            serializer.convertToJson(object);
+        });
+    }
+
+    @Test
+    public void givenObjectSerializedThenTrueReturned() throws JsonSerializationException {
+        Person person = new Person("soufiane", "cheouati", "34");
+        ObjectToJsonConverter serializer = new ObjectToJsonConverter();
+        String jsonString = serializer.convertToJson(person);
+        assertEquals("{\"personAge\":\"34\",\"firstName\":\"Soufiane\",\"lastName\":\"Cheouati\"}", jsonString);
+    }
+}