diff --git a/core-java-9/src/test/java/com/baeldung/java9/Java9OptionalsStreamTest.java b/core-java-9/src/test/java/com/baeldung/java9/Java9OptionalsStreamTest.java
new file mode 100644
index 0000000000..336e803985
--- /dev/null
+++ b/core-java-9/src/test/java/com/baeldung/java9/Java9OptionalsStreamTest.java
@@ -0,0 +1,63 @@
+package com.baeldung.java8;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class Java9OptionalsStreamTest {
+
+    private List<Optional<String>> listOfOptionals;
+
+    @Before
+    public void populateStream() {
+        listOfOptionals = Arrays.asList(Optional.empty(), Optional.of("foo"), Optional.empty(), Optional.of("bar"));
+    }
+    
+    @Test
+    public void filterOutPresentOptionalsWithFilter() {
+        assertEquals(4, listOfOptionals.size());
+        //@format:off
+        List<String> filteredList = listOfOptionals.stream()
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .collect(Collectors.toList());
+        //@format:on
+        assertEquals(2, filteredList.size());
+        assertEquals("foo", filteredList.get(0));
+        assertEquals("bar", filteredList.get(1));
+    }
+    
+    @Test
+    public void filterOutPresentOptionalsWithFlatMap() {
+        assertEquals(4, listOfOptionals.size());
+        //@format:off
+        List<String> filteredList = listOfOptionals.stream()
+                .flatMap(o -> o.isPresent() ? Stream.of(o.get()) : Stream.empty())
+                .collect(Collectors.toList());
+        //@format:on
+        assertEquals(2, filteredList.size());
+        assertEquals("foo", filteredList.get(0));
+        assertEquals("bar", filteredList.get(1));
+    }
+
+    @Test
+    public void filterOutPresentOptionalsWithJava9() {
+        assertEquals(4, listOfOptionals.size());
+        //@format:off
+        List<String> filteredList = listOfOptionals.stream()
+                .flatMap(Optional::stream)
+                .collect(Collectors.toList());
+        //@format:on
+        assertEquals(2, filteredList.size());
+        assertEquals("foo", filteredList.get(0));
+        assertEquals("bar", filteredList.get(1));
+    }
+
+}