diff --git a/testing-modules/junit-4/src/test/java/com/baeldung/assume/ConditionallyIgnoreTestsUnitTest.java b/testing-modules/junit-4/src/test/java/com/baeldung/assume/ConditionallyIgnoreTestsUnitTest.java
index 0aa184f2e1..9f927310b3 100644
--- a/testing-modules/junit-4/src/test/java/com/baeldung/assume/ConditionallyIgnoreTestsUnitTest.java
+++ b/testing-modules/junit-4/src/test/java/com/baeldung/assume/ConditionallyIgnoreTestsUnitTest.java
@@ -5,37 +5,59 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeThat;
 import static org.junit.Assume.assumeTrue;
+import static org.junit.Assume.assumeNotNull;
+import static org.junit.Assume.assumeNoException;
+
 
 import org.junit.Test;
 
 public class ConditionallyIgnoreTestsUnitTest {
 
-
     @Test
-    public void whenAssumeThatCodeVersionIsNot2_thenIgnore() {
-        final int codeVersion = 1;
-        assumeThat(codeVersion, is(2));
-
-        assertEquals("hello", "HELLO".toLowerCase());
+    public void whenAssumeThatAndOSIsLinux_thenRunTest() {
+        assumeThat(getOsName(), is("Linux"));
+        assertEquals("run", "RUN".toLowerCase());
     }
 
     @Test
-    public void whenAssumeTrueOnCondition_thenIgnore() {
-        final int codeVersion = 1;
-        assumeTrue(isCodeVersion2(codeVersion));
-
-        assertEquals("hello", "HELLO".toLowerCase());
+    public void whenAssumeTrueAndOSIsLinux_thenRunTest() {
+        assumeTrue(isExpectedOS(getOsName()));
+        assertEquals("run", "RUN".toLowerCase());
     }
 
     @Test
-    public void whenAssumeFalseOnCondition_thenIgnore() {
-        final int codeVersion = 2;
-        assumeFalse(isCodeVersion2(codeVersion));
-
-        assertEquals("hello", "HELLO".toLowerCase());
+    public void whenAssumeFalseAndOSIsLinux_thenIgnore() {
+        assumeFalse(isExpectedOS(getOsName()));
+        assertEquals("run", "RUN".toLowerCase());
     }
 
-    private boolean isCodeVersion2(final int codeVersion) {
-        return codeVersion == 2;
+    @Test
+    public void whenAssumeNotNullAndNotNullOSVersion_thenRun() {
+        assumeNotNull(getOsName());
+        assertEquals("run", "RUN".toLowerCase());
     }
-}
+
+    /**
+     * Let's use a different example here.
+     */
+    @Test
+    public void whenAssumeNoExceptionAndExceptionThrown_thenIgnore() {
+        assertEquals("everything ok", "EVERYTHING OK".toLowerCase());
+        String t = null;
+        try {
+          t.charAt(0);
+        } catch (NullPointerException npe) {
+          assumeNoException(npe);
+        }
+        assertEquals("run", "RUN".toLowerCase());
+    }
+
+    private boolean isExpectedOS(final String osName) {
+        return "Linux".equals(osName);
+    }
+
+    // This should use System.getProperty("os.name") in a real test.
+    private String getOsName() {
+        return "Linux";
+    }
+}
\ No newline at end of file