diff --git a/utils/misc/src/main/java/org/onlab/packet/IpAddress.java b/utils/misc/src/main/java/org/onlab/packet/IpAddress.java
index f208fe6520..4f4701ae72 100644
--- a/utils/misc/src/main/java/org/onlab/packet/IpAddress.java
+++ b/utils/misc/src/main/java/org/onlab/packet/IpAddress.java
@@ -335,7 +335,7 @@ public class IpAddress implements Comparable<IpAddress> {
      * @return true if this address is self-assigned
      */
     public boolean isSelfAssigned() {
-        return isIp4() && octets[0] == (byte) 169;
+        return isIp4() && octets[0] == (byte) 169 && octets[1] == (byte) 254;
     }
 
     /**
diff --git a/utils/misc/src/test/java/org/onlab/packet/IpAddressTest.java b/utils/misc/src/test/java/org/onlab/packet/IpAddressTest.java
index f96f5b44f6..c063f7afcf 100644
--- a/utils/misc/src/test/java/org/onlab/packet/IpAddressTest.java
+++ b/utils/misc/src/test/java/org/onlab/packet/IpAddressTest.java
@@ -763,7 +763,7 @@ public class IpAddressTest {
     @Test
     public void testIsSelfAssignedIpv4() {
         IpAddress normalIP = IpAddress.valueOf("10.0.0.1");
-        IpAddress selfAssignedIP = IpAddress.valueOf("169.1.2.3");
+        IpAddress selfAssignedIP = IpAddress.valueOf("169.254.2.3");
         assertFalse(normalIP.isSelfAssigned());
         assertTrue(selfAssignedIP.isSelfAssigned());
     }