diff --git a/pom.xml b/pom.xml
index 65bb44f930e..3ae4b02caa9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,6 +194,9 @@
 					<excludes>
 						<exclude>**/Abstract*.java</exclude>
 					</excludes>
+                    <systemPropertyVariables>
+                      <java.security.egd>file:/dev/./urandom</java.security.egd>
+                    </systemPropertyVariables>
 				</configuration>
 			</plugin>
 			<plugin>
diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/DataSourceAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/DataSourceAutoConfiguration.java
index 0d6955af0dc..574abe9e039 100644
--- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/DataSourceAutoConfiguration.java
+++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/DataSourceAutoConfiguration.java
@@ -61,8 +61,6 @@ import org.springframework.util.StringUtils;
 @ConditionalOnMissingBean(DataSource.class)
 public class DataSourceAutoConfiguration {
 
-	// FIXME see above
-
 	private static Log logger = LogFactory.getLog(DataSourceAutoConfiguration.class);
 
 	@Autowired(required = false)
@@ -108,7 +106,6 @@ public class DataSourceAutoConfiguration {
 
 	}
 
-	// FIXME: DB platform
 	@Value("${spring.database.schema:classpath*:schema-${spring.database.platform:all}.sql}")
 	private String schemaLocations = "";