diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/ast/SqlScriptParser.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/ast/SqlScriptParser.java
index 7089b7257e..3655fdb3cb 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/ast/SqlScriptParser.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/ast/SqlScriptParser.java
@@ -150,7 +150,7 @@ public class SqlScriptParser extends GeneratedSqlScriptParser {
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// trace logging hooks
 
-	private final int depthIndent = 2;
+	private static final int depthIndent = 2;
 	private int traceDepth;
 
 	@Override
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseNonConfigCoreFunctionalTestCase.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseNonConfigCoreFunctionalTestCase.java
index 961c008846..7473d8b60f 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseNonConfigCoreFunctionalTestCase.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseNonConfigCoreFunctionalTestCase.java
@@ -510,7 +510,7 @@ public class BaseNonConfigCoreFunctionalTestCase extends BaseUnitTestCase {
 		session = null;
 	}
 
-	public class RollbackWork implements Work {
+	public static class RollbackWork implements Work {
 
 		@Override
 		public void execute(Connection connection) throws SQLException {