diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml
index 22644d1b2..087518fa9 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml
@@ -35,10 +35,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
 		</dependency>
-		<dependency>
-		    <groupId>com.fasterxml.jackson.datatype</groupId>
-		    <artifactId>jackson-datatype-joda</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>com.amazonaws</groupId>
 			<artifactId>aws-lambda-java-log4j</artifactId>
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java
index 99701a9ca..3c67693a0 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java
@@ -512,6 +512,7 @@ public class FunctionInvokerTests {
 		System.setProperty("MAIN_CLASS", KinesisConfiguration.class.getName());
 		System.setProperty("spring.cloud.function.definition", "inputKinesisEvent");
 		FunctionInvoker invoker = new FunctionInvoker() {
+			@Override
 			public void handleRequest(InputStream input, OutputStream output, Context context) throws IOException {
 				assertThat(context).isNotNull();
 				super.handleRequest(input, output, context);
@@ -701,7 +702,7 @@ public class FunctionInvokerTests {
 		invoker.handleRequest(targetStream, output, null);
 
 		String result = new String(output.toByteArray(), StandardCharsets.UTF_8);
-		assertThat(result).contains("s3SchemaVersion");
+		assertThat(result).contains("ObjectCreated:Put");
 	}
 
 	@Test
@@ -715,7 +716,7 @@ public class FunctionInvokerTests {
 		invoker.handleRequest(targetStream, output, null);
 
 		String result = new String(output.toByteArray(), StandardCharsets.UTF_8);
-		assertThat(result).contains("s3SchemaVersion");
+		assertThat(result).contains("ObjectCreated:Put");
 	}
 
 	@Test
@@ -812,6 +813,7 @@ public class FunctionInvokerTests {
 		System.setProperty("MAIN_CLASS", LBConfiguration.class.getName());
 		System.setProperty("spring.cloud.function.definition", "inputOutputLBEvent");
 		FunctionInvoker invoker = new FunctionInvoker() {
+			@Override
 			public void handleRequest(InputStream input, OutputStream output, Context context) throws IOException {
 				assertThat(context).isNotNull();
 				super.handleRequest(input, output, context);
@@ -899,6 +901,7 @@ public class FunctionInvokerTests {
 		System.setProperty("MAIN_CLASS", ApiGatewayConfiguration.class.getName());
 		System.setProperty("spring.cloud.function.definition", "inputApiEvent");
 		FunctionInvoker invoker = new FunctionInvoker() {
+			@Override
 			public void handleRequest(InputStream input, OutputStream output, Context context) throws IOException {
 				assertThat(context).isNotNull();
 				super.handleRequest(input, output, context);
@@ -1314,15 +1317,15 @@ public class FunctionInvokerTests {
 		public Function<S3Event, String> inputS3Event(JsonMapper jsonMapper) {
 			return v -> {
 				System.out.println("Received: " + v);
-				return jsonMapper.toString(v);
+				return v.getRecords().get(0).getEventName();
 			};
 		}
 
 		@Bean
 		public Function<Message<S3Event>, String> inputS3EventAsMessage(JsonMapper jsonMapper) {
-			return v -> {
-				System.out.println("Received: " + v);
-				return jsonMapper.toString(v);
+			return m -> {
+				System.out.println("Received: " + m);
+				return m.getPayload().getRecords().get(0).getEventName();
 			};
 		}