diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabase.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabase.java
index f480cb1c5c2..9feb54adf81 100644
--- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabase.java
+++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabase.java
@@ -15,6 +15,7 @@
  */
 package org.springframework.jdbc.datasource.embedded;
 
+import javax.annotation.PreDestroy;
 import javax.sql.DataSource;
 
 /**
@@ -27,7 +28,7 @@ public interface EmbeddedDatabase extends DataSource {
 	
 	/**
 	 * Shutdown this embedded database.
-	 * TODO - annotate with @PreDestroy for invocation by Spring container?
 	 */
+	@PreDestroy
 	void shutdown();
 }
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
index 608928954fd..b499a7c3c56 100644
--- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
+++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
@@ -102,7 +102,7 @@ public class EmbeddedDatabaseFactory {
 	 * @param populator the database populator 
 	 */
 	public void setDatabasePopulator(DatabasePopulator populator) {
-		Assert.notNull(populator, "The TestDatabasePopulator is required");
+		Assert.notNull(populator, "The DatabasePopulator is required");
 		databasePopulator = populator;
 	}