diff --git a/core-java/src/test/java/com/baeldung/java8/Java8FindAnyFindFirstTest.java b/core-java/src/test/java/com/baeldung/java8/Java8FindAnyFindFirstTest.java
new file mode 100644
index 0000000000..598c81622e
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/java8/Java8FindAnyFindFirstTest.java
@@ -0,0 +1,37 @@
+package com.baeldung.java8;
+
+
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+public class Java8FindAnyFindFirstTest {
+
+    @Test
+    public void createStream_whenFindAnyResultIsPresent_thenCorrect() {
+
+        List<String> list = Arrays.asList("A","B","C","D");
+
+        Optional<String> result = list.stream().findAny();
+
+        if(result.isPresent()){
+            System.out.println(result.get());
+        }
+
+    }
+
+    @Test
+    public void createStream_whenFindFirstResultIsPresent_thenCorrect() {
+
+        List<String> list = Arrays.asList("A","B","C","D");
+
+        Optional<String> result = list.stream().findFirst();
+
+        if(result.isPresent()){
+            System.out.println(result.get());
+        }
+
+    }
+}