diff --git a/src/java.naming/share/classes/javax/naming/directory/BasicAttribute.java b/src/java.naming/share/classes/javax/naming/directory/BasicAttribute.java
index b2ab3c22accc6..a0b33b76ae776 100644
--- a/src/java.naming/share/classes/javax/naming/directory/BasicAttribute.java
+++ b/src/java.naming/share/classes/javax/naming/directory/BasicAttribute.java
@@ -215,10 +215,10 @@ public String toString() {
             answer.append("No values");
         } else {
             boolean start = true;
-            for (Enumeration<Object> e = values.elements(); e.hasMoreElements(); ) {
+            for (Object value : values) {
                 if (!start)
                     answer.append(", ");
-                answer.append(e.nextElement());
+                answer.append(value);
                 start = false;
             }
         }
diff --git a/src/java.naming/share/classes/javax/naming/directory/BasicAttributes.java b/src/java.naming/share/classes/javax/naming/directory/BasicAttributes.java
index 0e1dc83a521a7..fcfa09c9d3845 100644
--- a/src/java.naming/share/classes/javax/naming/directory/BasicAttributes.java
+++ b/src/java.naming/share/classes/javax/naming/directory/BasicAttributes.java
@@ -294,9 +294,8 @@ private void writeObject(java.io.ObjectOutputStream s)
         // Overridden to avoid exposing implementation details
         s.defaultWriteObject(); // write out the ignoreCase flag
         s.writeInt(attrs.size());
-        Enumeration<Attribute> attrEnum = attrs.elements();
-        while (attrEnum.hasMoreElements()) {
-            s.writeObject(attrEnum.nextElement());
+        for (Attribute attribute : attrs.values()) {
+            s.writeObject(attribute);
         }
     }