diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/integration/SpatialDialectFactory.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/integration/SpatialDialectFactory.java
index cb4674520b..82e63c77d4 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/integration/SpatialDialectFactory.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/integration/SpatialDialectFactory.java
@@ -1,11 +1,11 @@
 package org.hibernate.spatial.integration;
 
-import java.sql.Connection;
 import java.util.Map;
 
 import org.hibernate.HibernateException;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.jdbc.dialect.internal.DialectFactoryImpl;
+import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfoSource;
 import org.hibernate.spatial.HibernateSpatialConfiguration;
 import org.hibernate.spatial.dialect.oracle.OracleSpatial10gDialect;
 
@@ -32,8 +32,8 @@ public class SpatialDialectFactory extends DialectFactoryImpl {
 	}
 
 	@Override
-	public Dialect buildDialect(Map configValues, Connection connection) throws HibernateException {
-		final Dialect dialect = super.buildDialect( configValues, connection );
+	public Dialect buildDialect(Map configValues, DialectResolutionInfoSource resolutionInfoSource) throws HibernateException {
+		final Dialect dialect = super.buildDialect( configValues, resolutionInfoSource );
 		if (dialect instanceof OracleSpatial10gDialect) {
 			return new OracleSpatial10gDialect( configuration );
 		}
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialFunctionalTestCase.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialFunctionalTestCase.java
index cca4136dc5..c470db97c8 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialFunctionalTestCase.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialFunctionalTestCase.java
@@ -109,8 +109,8 @@ public abstract class SpatialFunctionalTestCase extends BaseCoreFunctionalTestCa
 	 *
 	 * @return
 	 */
-	public void afterMetadataBuilt(MetadataImplementor metadataImplementor) {
-		super.afterMetadataBuilt( metadataImplementor );
+	protected void afterMetadataBuilt(MetadataImplementor metadataImplementor) {
+		super.afterConstructAndConfigureMetadata( metadataImplementor );
 		initializeSpatialTestSupport( metadataImplementor );
 	}
 
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/TestSupport.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/TestSupport.java
index 5dd448afb2..649a09c288 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/TestSupport.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/TestSupport.java
@@ -51,18 +51,18 @@ public abstract class TestSupport {
 	public abstract SQLExpressionTemplate getSQLExpressionTemplate();
 
 	protected String driver() {
-		return configurationService.getSetting( AvailableSettings.DRIVER );
+		return configurationService.getSetting( AvailableSettings.DRIVER, String.class, "" );
 	}
 
 	protected String url() {
-		return configurationService.getSetting( AvailableSettings.URL );
+		return configurationService.getSetting( AvailableSettings.URL, String.class, "" );
 	}
 
 	protected String user() {
-		return configurationService.getSetting( AvailableSettings.USER );
+		return configurationService.getSetting( AvailableSettings.USER, String.class, "" );
 	}
 
 	protected String passwd() {
-		return configurationService.getSetting( AvailableSettings.PASS );
+		return configurationService.getSetting( AvailableSettings.PASS, String.class, "" );
 	}
 }
\ No newline at end of file