diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-default-and-anonymous-datasource.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-default-and-anonymous-datasource.xml
index 06f7c122bc5..7d57bd8e892 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-default-and-anonymous-datasource.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-default-and-anonymous-datasource.xml
@@ -5,8 +5,8 @@
 		http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-4.2.xsd">
 
 	<jdbc:embedded-database>
-		<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql" />
-		<jdbc:script location="classpath:org/springframework/jdbc/config/db-test-data.sql" />
+		<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql"/>
+		<jdbc:script location="classpath:org/springframework/jdbc/config/db-test-data.sql"/>
 	</jdbc:embedded-database>
 
 </beans>
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-explicit.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-explicit.xml
index e378d39625c..748af6467ec 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-explicit.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-explicit.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns:beans="http://www.springframework.org/schema/beans" xmlns="http://www.springframework.org/schema/jdbc"
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:jdbc="http://www.springframework.org/schema/jdbc"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-4.2.xsd">
 
-	<embedded-database id="dataSource" database-name="customDbName">
-		<script location="classpath:org/springframework/jdbc/config/db-schema.sql" />
-		<script location="classpath:org/springframework/jdbc/config/db-test-data.sql" />
-	</embedded-database>
+	<jdbc:embedded-database id="dataSource" database-name="customDbName">
+		<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql"/>
+		<jdbc:script location="classpath:org/springframework/jdbc/config/db-test-data.sql"/>
+	</jdbc:embedded-database>
 
-</beans:beans>
+</beans>
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-generated.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-generated.xml
index e618bc983a4..1a9297d7d36 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-generated.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-generated.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns:beans="http://www.springframework.org/schema/beans" xmlns="http://www.springframework.org/schema/jdbc"
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:jdbc="http://www.springframework.org/schema/jdbc"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-4.2.xsd">
 
-	<embedded-database id="dataSource" database-name="shouldBeOverriddenByGeneratedName" generate-name="true">
-		<script location="classpath:org/springframework/jdbc/config/db-schema.sql" />
-		<script location="classpath:org/springframework/jdbc/config/db-test-data.sql" />
-	</embedded-database>
+	<jdbc:embedded-database id="dataSource" database-name="shouldBeOverriddenByGeneratedName" generate-name="true">
+		<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql"/>
+		<jdbc:script location="classpath:org/springframework/jdbc/config/db-test-data.sql"/>
+	</jdbc:embedded-database>
 
-</beans:beans>
+</beans>
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-implicit.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-implicit.xml
index d65b504fcef..7ece8db1b07 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-implicit.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-implicit.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns:beans="http://www.springframework.org/schema/beans" xmlns="http://www.springframework.org/schema/jdbc"
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:jdbc="http://www.springframework.org/schema/jdbc"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-4.2.xsd">
 
-	<embedded-database id="dataSource">
-		<script location="classpath:org/springframework/jdbc/config/db-schema.sql" />
-		<script location="classpath:org/springframework/jdbc/config/db-test-data.sql" />
-	</embedded-database>
+	<jdbc:embedded-database id="dataSource">
+		<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql"/>
+		<jdbc:script location="classpath:org/springframework/jdbc/config/db-test-data.sql"/>
+	</jdbc:embedded-database>
 
-</beans:beans>
+</beans>
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-multiple-datasources.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-multiple-datasources.xml
index 729f8c2098c..a9359e32ca2 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-multiple-datasources.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-multiple-datasources.xml
@@ -5,7 +5,8 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd
 		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-	<jdbc:embedded-database id="firstDataSource" />
-	<jdbc:embedded-database id="secondDataSource" />
+	<jdbc:embedded-database id="firstDataSource"/>
+
+	<jdbc:embedded-database id="secondDataSource"/>
 
 </beans>
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config.xml
index cf945cd4e62..5315ddcb0ec 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config.xml
@@ -5,18 +5,18 @@
 		http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-4.2.xsd">
 
 	<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/db-test-data.sql" />
+		<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql"/>
+		<jdbc:script location="classpath:org/springframework/jdbc/config/db-test-data.sql"/>
 	</jdbc:embedded-database>
 
 	<jdbc:embedded-database id="h2DataSource" type="H2">
-		<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql" />
-		<jdbc:script location="classpath:org/springframework/jdbc/config/db-test-data.sql" />
+		<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql"/>
+		<jdbc:script location="classpath:org/springframework/jdbc/config/db-test-data.sql"/>
 	</jdbc:embedded-database>
 
 	<jdbc:embedded-database id="derbyDataSource" type="DERBY">
-		<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema-derby.sql" />
-		<jdbc:script location="classpath:org/springframework/jdbc/config/db-test-data.sql" />
+		<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema-derby.sql"/>
+		<jdbc:script location="classpath:org/springframework/jdbc/config/db-test-data.sql"/>
 	</jdbc:embedded-database>
 
 </beans>
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-expression-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-expression-config.xml
index 37ed6ebae0b..669233a57ee 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-expression-config.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-expression-config.xml
@@ -5,11 +5,11 @@
 		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-3.1.xsd">
 
-	<jdbc:embedded-database id="dataSource" type="HSQL" />
+	<jdbc:embedded-database id="dataSource" type="HSQL"/>
 
 	<jdbc:initialize-database data-source="dataSource" enabled="#{properties['data.source.init']}">
-		<jdbc:script location="#{properties['schema.scripts']}" />
-		<jdbc:script location="#{properties['insert.scripts']}" />
+		<jdbc:script location="#{properties['schema.scripts']}"/>
+		<jdbc:script location="#{properties['insert.scripts']}"/>
 	</jdbc:initialize-database>
 
 	<util:properties id="properties">
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-placeholder-config.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-placeholder-config.xml
index 92c305a4187..7990e3fa9e1 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-placeholder-config.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-placeholder-config.xml
@@ -4,15 +4,14 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
 
-	<jdbc:embedded-database id="dataSource" type="HSQL" />
+	<jdbc:embedded-database id="dataSource" type="HSQL"/>
 
 	<jdbc:initialize-database data-source="dataSource" enabled="${data.source.init}">
-		<jdbc:script location="${schema.scripts}" />
-		<jdbc:script location="${insert.scripts}" />
+		<jdbc:script location="${schema.scripts}"/>
+		<jdbc:script location="${insert.scripts}"/>
 	</jdbc:initialize-database>
 
-	<bean
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
 		<property name="properties">
 			<value>
 				schema.scripts=classpath:org/springframework/jdbc/config/db-schema.sql