diff --git a/gradle.properties b/gradle.properties
index e58aa48641..a3c250e045 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 version=5.5.0-SNAPSHOT
-org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xms512m -Xmx4g -XX:MaxPermSize=1024m -XX:MaxMetaspaceSize=1g -Dkotlin.daemon.jvm.options="-Xmx1g" -Dfile.encoding=UTF-8
 org.gradle.caching=true
 org.gradle.parallel=true
 kotlin.stdlib.default.dependency=false
diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaOutboundAdapterParserTests.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaOutboundAdapterParserTests.java
index ab79d1de7d..7e097c0635 100644
--- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaOutboundAdapterParserTests.java
+++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaOutboundAdapterParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -101,7 +101,7 @@ class KafkaOutboundAdapterParserTests {
 	@Test
 	void testSyncMode() {
 		MockProducer<Integer, String> mockProducer =
-				new MockProducer<Integer, String>(false, new IntegerSerializer(), new StringSerializer()) {
+				new MockProducer<>(false, new IntegerSerializer(), new StringSerializer()) {
 
 					@Override
 					public void close(Duration timeout) {
@@ -121,7 +121,7 @@ class KafkaOutboundAdapterParserTests {
 		handler.afterPropertiesSet();
 
 		handler.setSync(true);
-		handler.setSendTimeout(10);
+		handler.setSendTimeout(10_000);
 		handler.setTimeoutBuffer(200);
 		handler.setTopicExpression(new LiteralExpression("foo"));