diff --git a/spring-integration-jdbc/src/main/resources/int-derby.properties b/spring-integration-jdbc/src/test/java/int-derby.properties
similarity index 70%
rename from spring-integration-jdbc/src/main/resources/int-derby.properties
rename to spring-integration-jdbc/src/test/java/int-derby.properties
index c971c9fe09..0ecac5970d 100644
--- a/spring-integration-jdbc/src/main/resources/int-derby.properties
+++ b/spring-integration-jdbc/src/test/java/int-derby.properties
@@ -1,3 +1,4 @@
 # Placeholders for Derby:
+int.drop.script=classpath:/org/springframework/integration/jdbc/schema-drop-derby.sql
 int.schema.script=classpath:/org/springframework/integration/jdbc/schema-derby.sql
 int.database.incrementer.class=org.springframework.jdbc.support.incrementer.DerbyMaxValueIncrementer
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelTests-context.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelTests-context.xml
index f7f4c8af7f..551e92cfb3 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelTests-context.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelTests-context.xml
@@ -8,9 +8,12 @@
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd">
 
-	<jdbc:embedded-database id="dataSource" type="DERBY">
+	<jdbc:embedded-database id="dataSource" type="DERBY"/>
+	
+	<jdbc:initialize-database data-source="dataSource" ignore-failures="DROPS">
+		<jdbc:script location="${int.drop.script}" />
 		<jdbc:script location="${int.schema.script}" />
-	</jdbc:embedded-database>
+	</jdbc:initialize-database>
 
 	<int-jdbc:message-store id="messageStore" data-source="dataSource" />
 
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests-context.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests-context.xml
index f154c7042f..a11f031e2e 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests-context.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests-context.xml
@@ -5,9 +5,12 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
 			http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	<jdbc:embedded-database id="dataSource" type="DERBY">
+	<jdbc:embedded-database id="dataSource" type="DERBY"/>
+	
+	<jdbc:initialize-database data-source="dataSource" ignore-failures="DROPS">
+		<jdbc:script location="${int.drop.script}" />
 		<jdbc:script location="${int.schema.script}" />
-	</jdbc:embedded-database>
+	</jdbc:initialize-database>
 
 	<bean id="placeholderProperties" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
 		<property name="location" value="classpath:int-${ENVIRONMENT:derby}.properties" />
diff --git a/spring-integration-parent/pom.xml b/spring-integration-parent/pom.xml
index 5db7c63b72..88a019ac99 100644
--- a/spring-integration-parent/pom.xml
+++ b/spring-integration-parent/pom.xml
@@ -27,6 +27,19 @@
 		<org.springframework.ws.version>1.5.8</org.springframework.ws.version>
 	</properties>
 	<profiles>
+		<profile>
+			<id>strict</id>
+			<properties>
+				<maven.test.failure.ignore>false</maven.test.failure.ignore>
+			</properties>
+		</profile>
+		<profile>
+			<id>fast</id>
+			<properties>
+				<maven.test.skip>true</maven.test.skip>
+				<maven.javadoc.skip>true</maven.javadoc.skip>
+			</properties>
+		</profile>
 		<profile>
 			<id>staging</id>
 			<distributionManagement>