diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/config/JdbcNamespaceIntegrationTest.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/config/JdbcNamespaceIntegrationTest.java
index f7fbffb32e4..d3a9e026188 100644
--- a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/config/JdbcNamespaceIntegrationTest.java
+++ b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/config/JdbcNamespaceIntegrationTest.java
@@ -14,18 +14,24 @@ public class JdbcNamespaceIntegrationTest {
 	public void testCreateEmbeddedDatabase() throws Exception {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
 				"org/springframework/jdbc/config/jdbc-config.xml");
-		assertCorrectSetup(context.getBean("dataSource", DataSource.class));
-		assertCorrectSetup(context.getBean("h2DataSource", DataSource.class));
-		assertCorrectSetup(context.getBean("derbyDataSource", DataSource.class));
-		context.close();
+		try {
+			assertCorrectSetup(context.getBean("dataSource", DataSource.class));
+			assertCorrectSetup(context.getBean("h2DataSource", DataSource.class));
+			assertCorrectSetup(context.getBean("derbyDataSource", DataSource.class));
+		} finally {
+			context.close();
+		}
 	}
 
 	@Test
 	public void testCreateWithResourcePattern() throws Exception {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
 				"org/springframework/jdbc/config/jdbc-config-pattern.xml");
-		assertCorrectSetup(context.getBean("dataSource", DataSource.class));
-		context.close();
+		try {
+			assertCorrectSetup(context.getBean("dataSource", DataSource.class));
+		} finally {
+			context.close();
+		}
 	}
 
 	private void assertCorrectSetup(DataSource dataSource) {
diff --git a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-pattern.xml b/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-pattern.xml
index 876334b1e90..c8e43922ad7 100644
--- a/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-pattern.xml
+++ b/org.springframework.jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-pattern.xml
@@ -5,9 +5,9 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
 
-	<jdbc:embedded-database id="dataSource">
+	<jdbc:embedded-database id="dataSource" type="HSQL">
 		<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql"/>
-		<jdbc:script location="classpath:org/springframework/jdbc/config/*-data.sql"/>
+		<jdbc:script location="classpath*:org/springframework/jdbc/config/*-data.sql"/>
 	</jdbc:embedded-database>
 		
 </beans>