diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java
index cc21ec86c0..e85357ada8 100644
--- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java
+++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java
@@ -201,8 +201,8 @@ public class JdbcMessageStore extends AbstractMessageGroupStore implements Messa
 	 * @param serializer the serializer to set
 	 */
 	@SuppressWarnings("unchecked")
-	public void setSerializer(Serializer/* <? super Message<?>> */serializer) {
-		this.serializer = new SerializingConverter(serializer);
+	public void setSerializer(Serializer<? super Message<?>> serializer) {
+		this.serializer = new SerializingConverter((Serializer<Object>) serializer);
 	}
 
 	/**
@@ -211,8 +211,8 @@ public class JdbcMessageStore extends AbstractMessageGroupStore implements Messa
 	 * @param deserializer the deserializer to set
 	 */
 	@SuppressWarnings("unchecked")
-	public void setDeserializer(Deserializer/* <? super Message<?>> */deserializer) {
-		this.deserializer = new DeserializingConverter(deserializer);
+	public void setDeserializer(Deserializer<? extends Message<?>> deserializer) {
+		this.deserializer = new DeserializingConverter((Deserializer<Object>) deserializer);
 	}
 
 	/**
@@ -394,9 +394,8 @@ public class JdbcMessageStore extends AbstractMessageGroupStore implements Messa
 	@Override
 	public Iterator<MessageGroup> iterator() {
 
-		@SuppressWarnings("unchecked")
 		final Iterator<String> iterator = jdbcTemplate.query(getQuery(LIST_GROUP_KEYS), new Object[] { region },
-				new SingleColumnRowMapper(String.class)).iterator();
+				new SingleColumnRowMapper<String>()).iterator();
 
 		return new Iterator<MessageGroup>() {
 
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests.java
index 91205ab69f..558513cc37 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests.java
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests.java
@@ -88,14 +88,14 @@ public class JdbcMessageStoreTests {
 	@Transactional
 	public void testSerializer() throws Exception {
 		// N.B. these serializers are not realistic (just for test purposes)
-		messageStore.setSerializer(new Serializer/*<Message<?>><Message<?>>*/() {
-			public void serialize(/*Message<?>*/ Object object, OutputStream outputStream) throws IOException {
+		messageStore.setSerializer(new Serializer<Message<?>>() {
+			public void serialize(Message<?> object, OutputStream outputStream) throws IOException {
 				outputStream.write(((Message<?>) object).getPayload().toString().getBytes());
 				outputStream.flush();
 			}
 		});
-		messageStore.setDeserializer(new Deserializer/*<Message<?>>*/() {
-			public Message<?> deserialize(InputStream inputStream) throws IOException {
+		messageStore.setDeserializer(new Deserializer<GenericMessage<String>>() {
+			public GenericMessage<String> deserialize(InputStream inputStream) throws IOException {
 				BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
 				return new GenericMessage<String>(reader.readLine());
 			}