diff --git a/testsuite/src/test/java/org/hibernate/test/schemaupdate/1_Version.hbm.xml b/testsuite/src/test/java/org/hibernate/test/schemaupdate/1_Version.hbm.xml
index 92676b6dbc..4917f514d2 100644
--- a/testsuite/src/test/java/org/hibernate/test/schemaupdate/1_Version.hbm.xml
+++ b/testsuite/src/test/java/org/hibernate/test/schemaupdate/1_Version.hbm.xml
@@ -14,6 +14,6 @@
 		</id>
 		<property name="description"/>	
 	</class>
-	
+
 </hibernate-mapping>
 
diff --git a/testsuite/src/test/java/org/hibernate/test/schemaupdate/2_Version.hbm.xml b/testsuite/src/test/java/org/hibernate/test/schemaupdate/2_Version.hbm.xml
index a2e5901f38..5c0ba4d7d6 100644
--- a/testsuite/src/test/java/org/hibernate/test/schemaupdate/2_Version.hbm.xml
+++ b/testsuite/src/test/java/org/hibernate/test/schemaupdate/2_Version.hbm.xml
@@ -5,11 +5,10 @@
 
 <hibernate-mapping package="org.hibernate.test.schemaupdate">
 
-	<class name="Version" schema="PUBLIC">
+	<class name="Version">
 		<id name="id">
 			<generator class="org.hibernate.id.TableHiLoGenerator">
                 <param name="table">uid_table</param>
-<!--                 <param name="schema">PUBLIC</param>                -->
                 <param name="column">next_hi_value_column</param>
         	</generator>
 		</id>
diff --git a/testsuite/src/test/resources/hibernate.properties b/testsuite/src/test/resources/hibernate.properties
index b6eeb1a820..9cf4fbc816 100644
--- a/testsuite/src/test/resources/hibernate.properties
+++ b/testsuite/src/test/resources/hibernate.properties
@@ -1,31 +1,18 @@
-################################################################################
-# Copyright (c) 2007, Red Hat Middleware, LLC. All rights reserved.            #
-#                                                                              #
-# This copyrighted material is made available to anyone wishing to use, modify,#
-# copy, or redistribute it subject to the terms and conditions of the GNU      #
-# Lesser General Public License, v. 2.1. This program is distributed in the    #
-# hope that it will be useful, but WITHOUT A WARRANTY; without even the implied#
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU #
-# Lesser General Public License for more details. You should have received a   #
-# copy of the GNU Lesser General Public License, v.2.1 along with this         #
-# distribution; if not, write to the Free Software Foundation, Inc.,           #
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.                 #
-#                                                                              #
-# Red Hat Author(s): Steve Ebersole                                            #
-################################################################################
-hibernate.dialect ${db.dialect}
-hibernate.connection.driver_class ${jdbc.driver}
-hibernate.connection.url ${jdbc.url}
-hibernate.connection.username ${jdbc.user}
-hibernate.connection.password ${jdbc.pass}
-hibernate.connection.isolation ${jdbc.isolation}
+## Database specific
+hibernate.dialect org.hibernate.dialect.Oracle10gDialect
+hibernate.connection.driver_class oracle.jdbc.driver.OracleDriver
+hibernate.connection.url jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01
+hibernate.connection.username hibernate
+hibernate.connection.password hibernate
+hibernate.default_schema hibernate
 
-hibernate.connection.pool_size 5
+## Extra options from original hibernate.properties
+hibernate.jdbc.batch_versioned_data false 
+hibernate.jdbc.use_streams_for_binary true 
 
-hibernate.show_sql true
-hibernate.format_sql true
-
-hibernate.max_fetch_depth 5
-
-hibernate.cache.region_prefix hibernate.test
-hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider
+## options for cleandb
+driver=oracle.jdbc.driver.OracleDriver
+url=jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01
+username=hibernate
+password=hibernate
+schema=HIBERNATE
diff --git a/testsuite/src/test/resources/log4j.properties b/testsuite/src/test/resources/log4j.properties
index ef5e69d6f3..16abcfee99 100644
--- a/testsuite/src/test/resources/log4j.properties
+++ b/testsuite/src/test/resources/log4j.properties
@@ -1,10 +1,54 @@
+### direct log messages to stdout ###
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.Target=System.out
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
 
+### direct messages to file hibernate.log ###
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.File=hibernate.log
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
 
-log4j.rootLogger=info, stdout
+### direct messages to socket - chainsaw ###
+log4j.appender.socket=org.apache.log4j.net.SocketAppender
+log4j.appender.socket.remoteHost=localhost
+log4j.appender.socket.port=4560
+log4j.appender.socket.locationInfo=true
 
-log4j.logger.org.hibernate.test=info
+### set log levels - for more verbose logging change 'info' to 'debug' ###
+
+log4j.rootLogger=warn, stdout
+
+log4j.logger.org.hibernate=debug
+#log4j.logger.org.hibernate=debug
+
+log4j.logger.org.hibernate.ejb=debug
+log4j.logger.org.hibernate.ejb.packaging=debug
+log4j.logger.org.hibernate.reflection=debug
+
+#log4j.logger.org.hibernate.engine.Cascades=debug
+#log4j.logger.org.hibernate.hql=debug
+
+### log just the SQL
+log4j.logger.org.hibernate.SQL=debug
+
+### log JDBC bind parameters ###
+#log4j.logger.org.hibernate.type=info
+log4j.logger.org.hibernate.type=debug
+
+### log schema export/update ###
 log4j.logger.org.hibernate.tool.hbm2ddl=debug
+
+### log HQL parse trees
+#log4j.logger.org.hibernate.hql=debug
+
+### log cache activity ###
+#log4j.logger.org.hibernate.cache=debug
+
+### log JDBC resource acquisition
+#log4j.logger.org.hibernate.jdbc=debug
+
+### enable the following line if you want to track down connection ###
+### leakages when using DriverManagerConnectionProvider ###
+#log4j.logger.org.hibernate.connection.DriverManagerConnectionProvider=trace