diff --git a/logging/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/ConsoleAppenderUsingPatternLayoutWithColorsTest.java b/logging/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/ConsoleAppenderUsingPatternLayoutWithColorsTest.java
index 635e05c841..1e16ba7d0b 100644
--- a/logging/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/ConsoleAppenderUsingPatternLayoutWithColorsTest.java
+++ b/logging/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/ConsoleAppenderUsingPatternLayoutWithColorsTest.java
@@ -3,6 +3,7 @@ package com.baeldung.logging.log4j2.tests;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.MarkerManager;
+import org.apache.logging.log4j.ThreadContext;
 import org.apache.logging.log4j.junit.LoggerContextRule;
 import org.junit.Rule;
 import org.junit.Test;
@@ -35,4 +36,14 @@ public class ConsoleAppenderUsingPatternLayoutWithColorsTest {
         Marker connectionTrace = MarkerManager.getMarker("CONN_TRACE");
         logger.trace(connectionTrace, "This is a marker message at TRACE level.");
     }
+
+    @Test
+    public void givenLoggerWithConsoleConfig_shouldFilterByThreadContext() throws Exception {
+        Logger logger = contextRule.getLogger("UserAudit");
+        ThreadContext.put("userId", "1000");
+        logger.info("This is a log-visible user login. Maybe from an admin account?");
+        ThreadContext.put("userId", "1001");
+        logger.info("This is a log-invisible user login.");
+        boolean b = true;
+    }
 }
diff --git a/logging/log4j2/src/test/resources/log4j2-console-appender_pattern-layout.xml b/logging/log4j2/src/test/resources/log4j2-console-appender_pattern-layout.xml
index 9cd3ccea50..d6621f9166 100644
--- a/logging/log4j2/src/test/resources/log4j2-console-appender_pattern-layout.xml
+++ b/logging/log4j2/src/test/resources/log4j2-console-appender_pattern-layout.xml
@@ -6,11 +6,20 @@
             <PatternLayout pattern="%style{%message}{red}%n"/>
             <MarkerFilter marker="CONN_TRACE"/>
         </Console>
+        <Console name="ConsoleGreenAppender" target="SYSTEM_OUT">
+            <PatternLayout pattern="%style{userId=%X{userId}:}{white} %style{%message}{green}%n"/>
+        </Console>
     </Appenders>
     <Loggers>
         <Logger name="ConnTrace" level="TRACE" additivity="false">
             <AppenderRef ref="ConsoleRedAppender"/>
         </Logger>
+        <Logger name="UserAudit" level="INFO" additivity="false">
+            <AppenderRef ref="ConsoleGreenAppender"/>
+            <ThreadContextMapFilter>
+                <KeyValuePair key="userId" value="1000"/>
+            </ThreadContextMapFilter>
+        </Logger>
         <Root level="DEBUG">
             <AppenderRef ref="ConsoleAppender"/>
         </Root>