diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java
index 20539986c3..e0009b2453 100644
--- a/core/src/main/java/hudson/Util.java
+++ b/core/src/main/java/hudson/Util.java
@@ -905,10 +905,10 @@ public class Util {
                 }
 
                 byte[] bytes = new String(new int[] { codePoint }, 0, 1).getBytes(StandardCharsets.UTF_8);
-                for(int j=0;j<bytes.length;j++) {
+                for (byte aByte : bytes) {
                     out.append('%');
-                    out.append(toDigit((bytes[j] >> 4) & 0xF));
-                    out.append(toDigit(bytes[j] & 0xF));
+                    out.append(toDigit((aByte >> 4) & 0xF));
+                    out.append(toDigit(aByte & 0xF));
                 }
 
                 if(Character.charCount(codePoint) > 1) {
diff --git a/core/src/main/java/jenkins/util/AntClassLoader.java b/core/src/main/java/jenkins/util/AntClassLoader.java
index 854e3d0099..7579ce7e0f 100644
--- a/core/src/main/java/jenkins/util/AntClassLoader.java
+++ b/core/src/main/java/jenkins/util/AntClassLoader.java
@@ -365,9 +365,9 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
         if (classpath != null) {
             Path actualClasspath = classpath.concatSystemClasspath("ignore");
             String[] pathElements = actualClasspath.list();
-            for (int i = 0; i < pathElements.length; ++i) {
+            for (String pathElement : pathElements) {
                 try {
-                    addPathElement(pathElements[i]);
+                    addPathElement(pathElement);
                 } catch (BuildException e) {
                     // ignore path elements which are invalid
                     // relative to the project