diff --git a/testsuite/model/pom.xml b/testsuite/model/pom.xml
index eaf0d13616d..112bb5658ae 100644
--- a/testsuite/model/pom.xml
+++ b/testsuite/model/pom.xml
@@ -23,7 +23,6 @@
         <jdbc.mvn.groupId>com.h2database</jdbc.mvn.groupId>
         <jdbc.mvn.artifactId>h2</jdbc.mvn.artifactId>
         <jdbc.mvn.version>${h2.version}</jdbc.mvn.version>
-        <log4j.configuration>file:${project.build.directory}/dependency/log4j.properties</log4j.configuration>
         <jacoco.skip>true</jacoco.skip>
     </properties>
     
@@ -45,17 +44,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>org.jboss.logmanager</groupId>
+            <artifactId>jboss-logmanager</artifactId>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-reload4j</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-services</artifactId>
@@ -178,9 +173,7 @@
                         <keycloak.connectionsJpa.default.user>${keycloak.connectionsJpa.user}</keycloak.connectionsJpa.default.user>
                         <keycloak.connectionsJpa.default.password>${keycloak.connectionsJpa.password}</keycloak.connectionsJpa.default.password>
                         <keycloak.connectionsJpa.default.url>${keycloak.connectionsJpa.url}</keycloak.connectionsJpa.default.url>
-                        <log4j.configuration>file:${project.build.directory}/test-classes/log4j.properties</log4j.configuration> <!-- for the logging to properly work with tests in the 'other' module -->
                         <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                        <org.jboss.logging.provider>log4j</org.jboss.logging.provider>
                         <infinispan.version>${infinispan.version}</infinispan.version>
                         <project.version>${project.version}</project.version>
                     </systemPropertyVariables>
diff --git a/testsuite/model/src/test/resources/log4j.properties b/testsuite/model/src/test/resources/log4j.properties
deleted file mode 100644
index dbbf4539b43..00000000000
--- a/testsuite/model/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Copyright 2016 Red Hat, Inc. and/or its affiliates
-# and other contributors as indicated by the @author tags.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-log4j.rootLogger=info, keycloak
-
-log4j.appender.keycloak=org.apache.log4j.ConsoleAppender
-log4j.appender.keycloak.layout=org.apache.log4j.EnhancedPatternLayout
-keycloak.testsuite.logging.pattern=%d{HH:mm:ss,SSS} %-5p [%c] (%t) %m%n
-log4j.appender.keycloak.layout.ConversionPattern=${keycloak.testsuite.logging.pattern}
-
-# Logging with "info" when running test from IDE, but disabled when running test with "mvn" . Both cases can be overriden by use system property "keycloak.logging.level" (eg. -Dkeycloak.logging.level=debug )
-log4j.logger.org.keycloak=${keycloak.logging.level:info}
-
-keycloak.testsuite.logging.level=debug
-log4j.logger.org.keycloak.testsuite=${keycloak.testsuite.logging.level}
-
-# Logging with "info" when running test from IDE, but disabled when running test with "mvn" . Both cases can be overriden by use system property "keycloak.logging.level" (eg. -Dkeycloak.logging.level=debug )
-# log4j.logger.org.hibernate=debug
-
-# Enable to view loaded SPI and Providers
- log4j.logger.org.keycloak.services.DefaultKeycloakSessionFactory=debug
- log4j.logger.org.keycloak.provider.ProviderManager=debug
-# log4j.logger.org.keycloak.provider.FileSystemProviderLoaderFactory=debug
-
-# Liquibase updates logged with "info" by default. Logging level can be changed by system property "keycloak.liquibase.logging.level"
-keycloak.liquibase.logging.level=info
-log4j.logger.org.keycloak.connections.jpa.updater.liquibase=${keycloak.liquibase.logging.level}
-log4j.logger.org.keycloak.connections.jpa.DefaultJpaConnectionProviderFactory=debug
-
-# Enable to log short stack traces for log entries enabled with StackUtil.getShortStackTrace() calls
-#log4j.logger.org.keycloak.STACK_TRACE=trace
-
-#log4j.logger.org.keycloak.models.sessions.infinispan=trace
-keycloak.infinispan.logging.level=info
-log4j.logger.org.keycloak.cluster.infinispan=${keycloak.infinispan.logging.level}
-log4j.logger.org.keycloak.connections.infinispan=${keycloak.infinispan.logging.level}
-log4j.logger.org.keycloak.keys.infinispan=${keycloak.infinispan.logging.level}
-log4j.logger.org.keycloak.models.cache.infinispan=${keycloak.infinispan.logging.level}
-log4j.logger.org.keycloak.models.sessions.infinispan=${keycloak.infinispan.logging.level}
-
-log4j.logger.org.infinispan.CLUSTER=warn
-log4j.logger.org.infinispan.server.hotrod=info
-log4j.logger.org.infinispan.client.hotrod.impl=info
-log4j.logger.org.infinispan.client.hotrod.event.impl=info
-
-log4j.logger.org.infinispan.client.hotrod.impl.query.RemoteQuery=error
-
-# avoid logging INFO-message "ignoring the message MessageType : UNBIND_REQUEST" very often
-log4j.logger.org.apache.directory.server.ldap.handlers.LdapRequestHandler=warn
-
-log4j.logger.org.keycloak.executors=info
-
-#log4j.logger.org.infinispan.expiration.impl.ClusterExpirationManager=trace
-
-## Enable SQL debugging
-# Enable logs the SQL statements
-#log4j.logger.org.hibernate.SQL=debug
-
-# Enable logs the JDBC parameters passed to a query
-#log4j.logger.org.hibernate.orm.jdbc.bind=trace
-
diff --git a/testsuite/model/src/test/resources/logging.properties b/testsuite/model/src/test/resources/logging.properties
new file mode 100644
index 00000000000..1d9604e1dda
--- /dev/null
+++ b/testsuite/model/src/test/resources/logging.properties
@@ -0,0 +1,81 @@
+loggers=\
+  org.keycloak,\
+  org.keycloak.testsuite,\
+  org.keycloak.services.DefaultKeycloakSessionFactory,\
+  org.keycloak.provider.ProviderManager,\
+  org.keycloak.connections.jpa.updater.liquibase,\
+  org.keycloak.connections.jpa.DefaultJpaConnectionProviderFactory,\
+  org.keycloak.cluster.infinispan,\
+  org.keycloak.connections.infinispan,\
+  org.keycloak.keys.infinispan,\
+  org.keycloak.models.cache.infinispan,\
+  org.keycloak.models.sessions.infinispan,\
+  org.infinispan.CLUSTER,\
+  org.infinispan.server.hotrod,\
+  org.infinispan.client.hotrod.impl,\
+  org.infinispan.client.hotrod.event.impl,\
+  org.infinispan.client.hotrod.impl.query.RemoteQuery,\
+  org.apache.directory.server.ldap.handlers.LdapRequestHandler,\
+  org.keycloak.executors
+
+logger.level=INFO
+
+logger.handlers=CONSOLE
+
+# Logging with "info" when running test from IDE, but disabled when running test with "mvn" . Both cases can be overriden by use system property "keycloak.logging.level" (eg. -Dkeycloak.logging.level=debug )
+logger.org.keycloak.level=${keycloak.logging.level:INFO}
+
+keycloak.testsuite.logging.level=debug
+logger.org.keycloak.testsuite.level=${keycloak.testsuite.logging.level:DEBUG}
+
+# logger.org.hibernate.level=DEBUG
+
+# Enable to view loaded SPI and Providers
+logger.org.keycloak.services.DefaultKeycloakSessionFactory.level=DEBUG
+logger.org.keycloak.provider.ProviderManager.level=DEBUG
+# logger.org.keycloak.provider.FileSystemProviderLoaderFactory.level=DEBUG
+
+# Liquibase updates logged with "info" by default. Logging level can be changed by system property "keycloak.liquibase.logging.level"
+logger.org.keycloak.connections.jpa.updater.liquibase.level=${keycloak.liquibase.logging.level:INFO}
+logger.org.keycloak.connections.jpa.DefaultJpaConnectionProviderFactory.level=DEBUG
+
+# Enable to log short stack traces for log entries enabled with StackUtil.getShortStackTrace() calls
+# logger.org.keycloak.STACK_TRACE.level=TRACE
+
+# logger.org.keycloak.models.sessions.infinispan=TRACE
+logger.org.keycloak.cluster.infinispan.level=${keycloak.infinispan.logging.level:INFO}
+logger.org.keycloak.connections.infinispan.level=${keycloak.infinispan.logging.level:INFO}
+logger.org.keycloak.keys.infinispan.level=${keycloak.infinispan.logging.level:INFO}
+logger.org.keycloak.models.cache.infinispan.level=${keycloak.infinispan.logging.level:INFO}
+logger.org.keycloak.models.sessions.infinispan.level=${keycloak.infinispan.logging.level:INFO}
+
+logger.org.infinispan.CLUSTER.level=WARN
+logger.org.infinispan.server.hotrod.level=INFO
+logger.org.infinispan.client.hotrod.impl.level=INFO
+logger.org.infinispan.client.hotrod.event.impl.level=INFO
+
+logger.org.infinispan.client.hotrod.impl.query.RemoteQuery.level=ERROR
+
+# avoid logging INFO-message "ignoring the message MessageType : UNBIND_REQUEST" very often
+logger.org.apache.directory.server.ldap.handlers.LdapRequestHandler.level=WARN
+
+logger.org.keycloak.executors.level=INFO
+
+# logger.org.infinispan.expiration.impl.ClusterExpirationManager.level=TRACE
+
+# Enable SQL debugging (logs SQL statements)
+# logger.org.hibernate.SQL.level=DEBUG
+
+# Enable logs the JDBC parameters passed to a query
+# logger.org.hibernate.orm.jdbc.bind.level=TRACE
+
+handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
+handler.CONSOLE.properties=autoFlush
+handler.CONSOLE.level=DEBUG
+handler.CONSOLE.autoFlush=true
+handler.CONSOLE.formatter=PATTERN
+
+# The log format pattern for both logs
+formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
+formatter.PATTERN.properties=pattern
+formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p %t [%c] %m%n
\ No newline at end of file