diff --git a/core-java-8/src/main/java/com/baeldung/stream/conditional/StreamForEachIfElseLogic.java b/core-java-8/src/main/java/com/baeldung/stream/conditional/StreamForEachIfElseLogic.java
deleted file mode 100644
index b8ef521b41..0000000000
--- a/core-java-8/src/main/java/com/baeldung/stream/conditional/StreamForEachIfElseLogic.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.baeldung.stream.conditional;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Stream;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class StreamForEachIfElseLogic {
-
-    private static final Logger LOG = LoggerFactory.getLogger(StreamForEachIfElseLogic.class);
-
-    public static void main(String[] args) {
-
-        ifElseLogic();
-
-    }
-
-    private static void ifElseLogic() {
-
-        List<Integer> ints = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-
-        ints.stream()
-            .forEach(i -> {
-                if (i.intValue() % 2 == 0) {
-                    LOG.info("{} is even", i);
-                } else {
-                    LOG.info("{} is odd", i);
-                }
-            });
-
-        Stream<Integer> evenIntegers = ints.stream()
-            .filter(i -> i.intValue() % 2 == 0);
-        Stream<Integer> oddIntegers = ints.stream()
-            .filter(i -> i.intValue() % 2 != 0);
-
-        evenIntegers.forEach(i -> LOG.info("{} is even", i));
-        oddIntegers.forEach(i -> LOG.info("{} is odd", i));
-
-    }
-}
diff --git a/core-java-8/src/test/java/com/baeldung/stream/conditional/StreamForEachIfElseUnitTest.java b/core-java-8/src/test/java/com/baeldung/stream/conditional/StreamForEachIfElseUnitTest.java
new file mode 100644
index 0000000000..b5d26eb6a8
--- /dev/null
+++ b/core-java-8/src/test/java/com/baeldung/stream/conditional/StreamForEachIfElseUnitTest.java
@@ -0,0 +1,41 @@
+package com.baeldung.stream.conditional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class StreamForEachIfElseUnitTest {
+
+    @Test
+    public final void givenIntegerStream_whenCheckingIntegerParityWithIfElse_thenEnsureCorrectParity() {
+        List<Integer> ints = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+
+        ints.stream()
+            .forEach(i -> {
+                if (i.intValue() % 2 == 0) {
+                    Assert.assertTrue(i.intValue() + " is not even", i.intValue() % 2 == 0);
+                } else {
+                    Assert.assertTrue(i.intValue() + " is not odd", i.intValue() % 2 != 0);
+                }
+            });
+
+    }
+
+    @Test
+    public final void givenIntegerStream_whenCheckingIntegerParityWithStreamFilter_thenEnsureCorrectParity() {
+        List<Integer> ints = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+
+        Stream<Integer> evenIntegers = ints.stream()
+            .filter(i -> i.intValue() % 2 == 0);
+        Stream<Integer> oddIntegers = ints.stream()
+            .filter(i -> i.intValue() % 2 != 0);
+
+        evenIntegers.forEach(i -> Assert.assertTrue(i.intValue() + " is not even", i.intValue() % 2 == 0));
+        oddIntegers.forEach(i -> Assert.assertTrue(i.intValue() + " is not odd", i.intValue() % 2 != 0));
+
+    }
+
+}