diff --git a/java/buildconf/manager-test-includes b/java/buildconf/manager-test-includes
index 371cbfbfd861..846239ec89d1 100644
--- a/java/buildconf/manager-test-includes
+++ b/java/buildconf/manager-test-includes
@@ -1 +1 @@
-**/test/*Test.class
+**/test/ClientCertificateDigesterTest.class
diff --git a/java/buildconf/test/log4j2.properties b/java/buildconf/test/log4j2.properties
index 269e2d793e24..b29384dedda2 100644
--- a/java/buildconf/test/log4j2.properties
+++ b/java/buildconf/test/log4j2.properties
@@ -4,3 +4,13 @@ log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
 log4j.appender.CONSOLE.Target=System.out
 log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
 log4j.appender.CONSOLE.layout.conversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p - %m%n
+# Log SQL and parameters passed to the database
+hibernate.show_sql=true
+hibernate.format_sql=true
+
+# Detailed logging for Hibernate operations
+log4j.logger.org.hibernate.engine=TRACE
+log4j.logger.org.hibernate.SQL=TRACE
+log4j.logger.org.hibernate.type=TRACE
+log4j.logger.org.hibernate.orm.mapping.model=TRACE
+log4j.logger.org.hibernate.metamodel.mapping=TRACE
diff --git a/java/buildconf/test/rhn.conf.postgresql-example b/java/buildconf/test/rhn.conf.postgresql-example
index 867122d05d10..ec26b280b338 100644
--- a/java/buildconf/test/rhn.conf.postgresql-example
+++ b/java/buildconf/test/rhn.conf.postgresql-example
@@ -21,11 +21,13 @@ hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect
 hibernate.connection.driver_class = org.postgresql.Driver
 hibernate.connection.driver_proto = jdbc:postgresql
 # Uncomment to log all SQL statements issued by Hibernate
-# hibernate.show_sql = true
+hibernate.show_sql = true
+hibernate.format_sql = true
 hibernate.use_outer_join = true
 hibernate.jdbc.batch_size = 0
 hibernate.cache.use_query_cache=false
 hibernate.cache.use_second_level_cache=false
+hibernate.boot.allow_jdbc_metadata_access=false
 hibernate.bytecode.use_reflection_optimizer = false
 hibernate.id.new_generator_mappings = false
 
@@ -34,7 +36,7 @@ reporting.hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect
 reporting.hibernate.connection.driver_class = org.postgresql.Driver
 reporting.hibernate.connection.driver_proto = jdbc:postgresql
 # Uncomment to log all SQL statements issued by Hibernate
-# reporting.hibernate.show_sql = true
+reporting.hibernate.show_sql = true
 reporting.hibernate.use_outer_join = true
 reporting.hibernate.jdbc.batch_size = 0
 reporting.hibernate.cache.use_query_cache=false
diff --git a/java/code/src/log4j2.xml b/java/code/src/log4j2.xml
index 542f2ee27e0a..f4c6863fe598 100644
--- a/java/code/src/log4j2.xml
+++ b/java/code/src/log4j2.xml
@@ -30,11 +30,9 @@
             <DefaultRolloverStrategy max="30" />
         </RollingFile>
         <!-- Uncomment for hibernate logging -->
-        <!--
         <File name="hibernateAppender" fileName="/var/log/rhn/rhn_web_hibernate.log">
             <PatternLayout pattern="[%d] %-5p - %m%n" />
         </File>
-        -->
         <FailOver name="xmlRpcFailOverAppender" primary="apiLogFileAppender">
             <FailOvers>
                 <AppenderRef ref="rootAppender" />
@@ -52,10 +50,8 @@
         -->
 
         <!-- General debug for everything. Very noisy -->
-        <!--
         <Logger name="com.redhat.rhn" level="debug" />
         <Logger name="com.suse" level="debug" />
-        -->
 
         <!-- Logging for login-attempts -->
         <Logger name="com.suse.manager.webui.controllers.login.LoginController" level="info" />
@@ -90,24 +86,20 @@
         </Logger>
 
         <!-- Hibernate logging -->
-        <!--
-        <Logger name="org.hibernate" level="debug" additivity="false">
+        <Logger name="org.hibernate" level="trace" additivity="false">
             <AppenderRef ref="hibernateAppender" />
         </Logger>
 
         <Logger name="org.hibernate.type" level="trace" />
-        -->
+        <Logger name="org.hibernate.orm.mapping.model" level="trace" />
+        <Logger name="org.hibernate.metamodel.mapping" level="trace" />
 
         <!-- log SQL statements -->
-        <!--
-        <Logger name="org.hibernate.SQL" level="debug" />
-        -->
+        <Logger name="org.hibernate.SQL" level="trace" />
 
-        <!--
-        <Logger name="net.rkbloom.logdriver" level="debug" additivity="false">
+        <Logger name="net.rkbloom.logdriver" level="trace" additivity="false">
             <AppenderRef ref="hibernateAppender" />
         </Logger>
-        -->
 
         <Root level="warn"><AppenderRef ref="rootAppender" /></Root>
     </Loggers>
diff --git a/java/conf/default/rhn_hibernate.conf b/java/conf/default/rhn_hibernate.conf
index ac91e5cbde76..9219683d8afe 100644
--- a/java/conf/default/rhn_hibernate.conf
+++ b/java/conf/default/rhn_hibernate.conf
@@ -31,6 +31,7 @@ hibernate.c3p0.preferredTestQuery=select 'c3p0 ping' from dual
 
 hibernate.cache.use_query_cache=false
 hibernate.cache.use_second_level_cache=false
+hibernate.boot.allow_jdbc_metadata_access=false
 hibernate.bytecode.use_reflection_optimizer=false
 hibernate.jdbc.batch_size=0
 hibernate.id.new_generator_mappings = true
diff --git a/java/conf/default/rhn_reporting_hibernate.conf b/java/conf/default/rhn_reporting_hibernate.conf
index 629ec95fb6d4..71ccc2cae745 100644
--- a/java/conf/default/rhn_reporting_hibernate.conf
+++ b/java/conf/default/rhn_reporting_hibernate.conf
@@ -31,6 +31,7 @@ reporting.hibernate.c3p0.preferredTestQuery=select 'c3p0 ping' from dual
 
 hibernate.cache.use_query_cache=false
 hibernate.cache.use_second_level_cache=false
+hibernate.boot.allow_jdbc_metadata_access=false
 reporting.hibernate.bytecode.use_reflection_optimizer=false
 reporting.hibernate.jdbc.batch_size=0
 reporting.hibernate.id.new_generator_mappings = false
diff --git a/java/manager-build.xml b/java/manager-build.xml
index ab4e4f9184b3..51749404a641 100644
--- a/java/manager-build.xml
+++ b/java/manager-build.xml
@@ -482,7 +482,7 @@
                     <sysproperty key="log4j.threshold" value="warn"/>
                     <sysproperty key="rhn.config.dir" value="${tests.configuration.path}"/>
                     <jvmarg value="-ea"/>
-                    <!-- <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005" /> -->
+                    <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005" />
                     <jvmarg value="${jacocoagent}"/>
                 </fork>
                 <zipfileset src="${build.dir}/rhn.jar" includesfile="${tests.includes}"