diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilderTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilderTests.java
index 540617f8a..c464231f0 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilderTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilderTests.java
@@ -21,9 +21,10 @@ import org.junit.Test;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.configuration.xml.DummyItemReader;
 import org.springframework.batch.core.configuration.xml.DummyItemWriter;
+import org.springframework.batch.core.configuration.xml.DummyJobRepository;
+import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
 
 public class FaultTolerantStepBuilderTests {
 
@@ -37,6 +38,7 @@ public class FaultTolerantStepBuilderTests {
 	public void testAnnotationBasedStepExecutionListenerRegistration() {
 		// given
 		FaultTolerantStepBuilder<Object, Object> faultTolerantStepBuilder = new StepBuilder("myStep")
+				.repository(new DummyJobRepository()).transactionManager(new ResourcelessTransactionManager())
 				.<Object, Object>chunk(5).reader(new DummyItemReader()).writer(new DummyItemWriter()).faultTolerant()
 				.listener(new StepBuilderTests.AnnotationBasedStepExecutionListener());
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/DefaultMailErrorHandlerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/DefaultMailErrorHandlerTests.java
index d00d99599..27d84e1b1 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/DefaultMailErrorHandlerTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/DefaultMailErrorHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2021 the original author or authors.
+ * Copyright 2006-2022 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.
@@ -48,7 +48,7 @@ public class DefaultMailErrorHandlerTests {
 		}
 		catch (MailException e) {
 			String msg = e.getMessage();
-			assertTrue("Wrong message: " + msg, msg.matches(".*SimpleMailMessage: f;.*"));
+			assertTrue("Wrong message: " + msg, msg.matches(".*SimpleMailMessage: f.*"));
 		}
 	}