diff --git a/build.gradle b/build.gradle
index 3f0d0e39f9..98e4fc3dd7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -415,8 +415,10 @@ project('spring-integration-mail') {
 	dependencies {
 		compile project(":spring-integration-core")
 		compile "org.springframework:spring-context-support:$springVersion"
-		compile("javax.mail:mail:$javaxMailVersion", provided)
+		compile("javax.mail:javax.mail-api:$javaxMailVersion", provided)
+		compile("com.sun.mail:imap:$javaxMailVersion", provided)
 		compile("javax.activation:activation:$javaxActivationVersion", optional)
+		testRuntime "com.sun.mail:mailapi:$javaxMailVersion"
 	}
 
 	// suppress javax.activation path warnings
@@ -572,7 +574,8 @@ project('spring-integration-ws') {
 		testCompile "javax.jms:jms-api:$jmsApiVersion"
 		testCompile "org.igniterealtime.smack:smack:$smackVersion"
 		testCompile "org.igniterealtime.smack:smackx:$smackVersion"
-		testCompile "javax.mail:mail:$javaxMailVersion"
+		testCompile "javax.mail:javax.mail-api:$javaxMailVersion"
+		testRuntime "com.sun.mail:mailapi:$javaxMailVersion"
 	}
 
 	// suppress saaj path warnings