diff --git a/pom.xml b/pom.xml
index a25c422e4..a943f2dc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@
 		<hsqldb.version>2.7.0</hsqldb.version>
 		<h2.version>2.1.214</h2.version>
 		<sqlite.version>3.39.2.0</sqlite.version>
-		<derby.version>10.14.2.0</derby.version> <!-- FIXME compilation failure when upgrading to 10.16.1.1 -->
+		<derby.version>10.16.1.1</derby.version>
 		<hana.version>2.13.9</hana.version>
 		<artemis.version>2.24.0</artemis.version>
 		<jaxb-core.version>4.0.0</jaxb-core.version>
diff --git a/spring-batch-core/pom.xml b/spring-batch-core/pom.xml
index 63fb0433d..f138264af 100644
--- a/spring-batch-core/pom.xml
+++ b/spring-batch-core/pom.xml
@@ -189,6 +189,12 @@
 			<version>${derby.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.derby</groupId>
+			<artifactId>derbytools</artifactId>
+			<version>${derby.version}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.sap.cloud.db.jdbc</groupId>
 			<artifactId>ngdbc</artifactId>
diff --git a/spring-batch-core/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java b/spring-batch-core/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java
deleted file mode 100644
index 3aaa60aaa..000000000
--- a/spring-batch-core/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2009-2018 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package test.jdbc.datasource;
-
-import java.io.File;
-
-import javax.sql.DataSource;
-
-import org.apache.derby.jdbc.EmbeddedDataSource;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-
-public class DerbyDataSourceFactoryBean extends AbstractFactoryBean<DataSource> {
-
-	private String dataDirectory = "target/derby-home";
-
-	public void setDataDirectory(String dataDirectory) {
-		this.dataDirectory = dataDirectory;
-	}
-
-	@Override
-	protected DataSource createInstance() throws Exception {
-		File directory = new File(dataDirectory);
-		System.setProperty("derby.system.home", directory.getCanonicalPath());
-		System.setProperty("derby.storage.fileSyncTransactionLog", "true");
-		System.setProperty("derby.storage.pageCacheSize", "100");
-
-		final EmbeddedDataSource ds = new EmbeddedDataSource();
-		ds.setDatabaseName("target/derbydb");
-		ds.setCreateDatabase("create");
-
-		return ds;
-	}
-
-	@Override
-	public Class<DataSource> getObjectType() {
-		return DataSource.class;
-	}
-
-}
diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml
index da996f81e..74b23e473 100644
--- a/spring-batch-infrastructure/pom.xml
+++ b/spring-batch-infrastructure/pom.xml
@@ -259,6 +259,12 @@
 			<version>${derby.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.derby</groupId>
+			<artifactId>derbytools</artifactId>
+			<version>${derby.version}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.thoughtworks.xstream</groupId>
 			<artifactId>xstream</artifactId>