diff --git a/core/src/main/java/org/jenkins/ui/icon/Icon.java b/core/src/main/java/org/jenkins/ui/icon/Icon.java
index 27db6fe247..974dcc0295 100644
--- a/core/src/main/java/org/jenkins/ui/icon/Icon.java
+++ b/core/src/main/java/org/jenkins/ui/icon/Icon.java
@@ -219,8 +219,8 @@ public class Icon {
         List<String> classNameTokL = new ArrayList<String>();
 
         // Trim all tokens first
-        for (int i = 0; i < classNameTokA.length; i++) {
-            String trimmedToken = classNameTokA[i].trim();
+        for (String classNameTok : classNameTokA) {
+            String trimmedToken = classNameTok.trim();
             if (trimmedToken.length() > 0) {
                 classNameTokL.add(trimmedToken);
             }
@@ -235,8 +235,8 @@ public class Icon {
 
         // Build the compound name
         StringBuilder stringBuilder = new StringBuilder();
-        for (int i = 0; i < classNameTokA.length; i++) {
-            stringBuilder.append(".").append(classNameTokA[i]);
+        for (String classNameTok : classNameTokA) {
+            stringBuilder.append(".").append(classNameTok);
         }
 
         return stringBuilder.toString();
diff --git a/test/src/test/java/hudson/model/NodeTest.java b/test/src/test/java/hudson/model/NodeTest.java
index c98690f43a..f5ec5d2170 100644
--- a/test/src/test/java/hudson/model/NodeTest.java
+++ b/test/src/test/java/hudson/model/NodeTest.java
@@ -167,8 +167,7 @@ public class NodeTest {
         project.setAssignedLabel(label);
         label.reset(); // Make sure cached value is not used
         TagCloud<LabelAtom> cloud = node.getLabelCloud();
-        for(int i =0; i< cloud.size(); i ++){
-            TagCloud.Entry e = cloud.get(i);
+        for (TagCloud.Entry e : cloud) {
             if(e.item.equals(label)){
                 assertEquals("Label label1 should have one tied project.", 1, e.weight, 0);
             }