diff --git a/stf.build/include/top.xml b/stf.build/include/top.xml
index 3009042..43ce102 100644
--- a/stf.build/include/top.xml
+++ b/stf.build/include/top.xml
@@ -332,13 +332,9 @@ limitations under the License.
 	-->
 
 	<target name="configure-tools-jar" depends="setup-java-properties" unless="${tools_jar_correct}">
-		<property name="tools_jar_origin" value="${java.home}/../lib"/>
+		<property name="tools_jar_origin" value="${java.home}/../lib/tools.jar"/>
 		<echo message="configure-tools-jar: Copying ${tools_jar_origin} to ${tools_jar_dir}"/>
-		<copy todir="${tools_jar_dir}">
-			<fileset dir="${tools_jar_origin}">
-				<include name="tools.jar"/>
-			</fileset>
-    	</copy>
+        <copy file="${tools_jar_origin}" todir="${tools_jar_dir}"/>
 		<property name="tools_jar" value="${tools_jar_dir}/${tools_jar_file}"/>
 		<available file="${tools_jar_dir}/${tools_jar_file}" property="tools_jar_correct"/>
 	</target>
diff --git a/stf.core/src/stf.core/net/adoptopenjdk/stf/environment/FileRef.java b/stf.core/src/stf.core/net/adoptopenjdk/stf/environment/FileRef.java
index fc9a965..3a3fb82 100644
--- a/stf.core/src/stf.core/net/adoptopenjdk/stf/environment/FileRef.java
+++ b/stf.core/src/stf.core/net/adoptopenjdk/stf/environment/FileRef.java
@@ -116,7 +116,7 @@ public String toString() {
 	 * @return              A DirectoryRef for the root of the file we were trying to find.
 	 * @throws StfException In case we cannot find the file, or if we found it in more than one test root.
 	 */
-	public static DirectoryRef findFileRoot(String fileRef, ArrayList<DirectoryRef> testRootRefs) throws StfException, IOException {
+	public static DirectoryRef findFileRoot(String fileRef, ArrayList<DirectoryRef> testRootRefs) throws StfException {
 		int count = 0;
 		DirectoryRef fileRoot = new DirectoryRef("./ignore");
 		for (int i = 0 ; i < testRootRefs.size() ; ++i ) {