diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/JobLauncherApplicationRunnerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/JobLauncherApplicationRunnerTests.java
index 40eb1f831c..4cc83d59b5 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/JobLauncherApplicationRunnerTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/JobLauncherApplicationRunnerTests.java
@@ -99,8 +99,7 @@ class JobLauncherApplicationRunnerTests {
 			PlatformTransactionManager transactionManager = context.getBean(PlatformTransactionManager.class);
 			JobLauncherApplicationRunnerContext jobLauncherContext = new JobLauncherApplicationRunnerContext(context);
 			Job job = jobLauncherContext.jobBuilder()
-					.start(jobLauncherContext.stepBuilder().tasklet(throwingTasklet())
-							.transactionManager(transactionManager).build())
+					.start(jobLauncherContext.stepBuilder().tasklet(throwingTasklet(), transactionManager).build())
 					.incrementer(new RunIdIncrementer()).build();
 			jobLauncherContext.runner.execute(job, new JobParameters());
 			jobLauncherContext.runner.execute(job, new JobParametersBuilder().addLong("run.id", 1L).toJobParameters());
@@ -113,8 +112,9 @@ class JobLauncherApplicationRunnerTests {
 		this.contextRunner.run((context) -> {
 			PlatformTransactionManager transactionManager = context.getBean(PlatformTransactionManager.class);
 			JobLauncherApplicationRunnerContext jobLauncherContext = new JobLauncherApplicationRunnerContext(context);
-			Job job = jobLauncherContext.jobBuilder().start(jobLauncherContext.stepBuilder().tasklet(throwingTasklet())
-					.transactionManager(transactionManager).build()).build();
+			Job job = jobLauncherContext.jobBuilder()
+					.start(jobLauncherContext.stepBuilder().tasklet(throwingTasklet(), transactionManager).build())
+					.build();
 			// start a job instance
 			JobParameters jobParameters = new JobParametersBuilder().addString("name", "foo").toJobParameters();
 			jobLauncherContext.runner.execute(job, jobParameters);
@@ -132,8 +132,7 @@ class JobLauncherApplicationRunnerTests {
 			PlatformTransactionManager transactionManager = context.getBean(PlatformTransactionManager.class);
 			JobLauncherApplicationRunnerContext jobLauncherContext = new JobLauncherApplicationRunnerContext(context);
 			Job job = jobLauncherContext.jobBuilder().preventRestart()
-					.start(jobLauncherContext.stepBuilder().tasklet(throwingTasklet())
-							.transactionManager(transactionManager).build())
+					.start(jobLauncherContext.stepBuilder().tasklet(throwingTasklet(), transactionManager).build())
 					.incrementer(new RunIdIncrementer()).build();
 			jobLauncherContext.runner.execute(job, new JobParameters());
 			jobLauncherContext.runner.execute(job, new JobParameters());
@@ -155,8 +154,7 @@ class JobLauncherApplicationRunnerTests {
 			PlatformTransactionManager transactionManager = context.getBean(PlatformTransactionManager.class);
 			JobLauncherApplicationRunnerContext jobLauncherContext = new JobLauncherApplicationRunnerContext(context);
 			Job job = jobLauncherContext.jobBuilder()
-					.start(jobLauncherContext.stepBuilder().tasklet(throwingTasklet())
-							.transactionManager(transactionManager).build())
+					.start(jobLauncherContext.stepBuilder().tasklet(throwingTasklet(), transactionManager).build())
 					.incrementer(new RunIdIncrementer()).build();
 			JobParameters jobParameters = new JobParametersBuilder().addLong("id", 1L, false).addLong("foo", 2L, false)
 					.toJobParameters();
@@ -193,10 +191,9 @@ class JobLauncherApplicationRunnerTests {
 			JobLauncher jobLauncher = context.getBean(JobLauncher.class);
 			JobRepository jobRepository = context.getBean(JobRepository.class);
 			PlatformTransactionManager transactionManager = context.getBean(PlatformTransactionManager.class);
-			this.stepBuilder = new StepBuilder("step").repository(jobRepository);
-			this.step = this.stepBuilder.tasklet((contribution, chunkContext) -> null)
-					.transactionManager(transactionManager).build();
-			this.jobBuilder = new JobBuilder("job").repository(jobRepository);
+			this.stepBuilder = new StepBuilder("step", jobRepository);
+			this.step = this.stepBuilder.tasklet((contribution, chunkContext) -> null, transactionManager).build();
+			this.jobBuilder = new JobBuilder("job", jobRepository);
 			this.job = this.jobBuilder.start(this.step).build();
 			this.jobExplorer = context.getBean(JobExplorer.class);
 			this.runner = new JobLauncherApplicationRunner(jobLauncher, this.jobExplorer, jobRepository);
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-batch/src/main/java/smoketest/batch/SampleBatchApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-batch/src/main/java/smoketest/batch/SampleBatchApplication.java
index 71ae9992e8..c6a123db8c 100644
--- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-batch/src/main/java/smoketest/batch/SampleBatchApplication.java
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-batch/src/main/java/smoketest/batch/SampleBatchApplication.java
@@ -40,13 +40,12 @@ public class SampleBatchApplication {
 
 	@Bean
 	Job job(JobRepository jobRepository, Step step) {
-		return new JobBuilder("job").repository(jobRepository).start(step).build();
+		return new JobBuilder("job", jobRepository).start(step).build();
 	}
 
 	@Bean
 	Step step1(JobRepository jobRepository, Tasklet tasklet, PlatformTransactionManager transactionManager) {
-		return new StepBuilder("step1").repository(jobRepository).tasklet(tasklet)
-				.transactionManager(transactionManager).build();
+		return new StepBuilder("step1", jobRepository).tasklet(tasklet, transactionManager).build();
 	}
 
 	public static void main(String[] args) {