diff --git a/core/api/src/test/java/org/onlab/onos/net/ConnectPointTest.java b/core/api/src/test/java/org/onlab/onos/net/ConnectPointTest.java
new file mode 100644
index 0000000..ebb5217
--- /dev/null
+++ b/core/api/src/test/java/org/onlab/onos/net/ConnectPointTest.java
@@ -0,0 +1,37 @@
+package org.onlab.onos.net;
+
+import com.google.common.testing.EqualsTester;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+import static org.onlab.onos.net.Device.Type.SWITCH;
+import static org.onlab.onos.net.DeviceId.deviceId;
+import static org.onlab.onos.net.PortNumber.portNumber;
+
+/**
+ * Test of the connetion point entity.
+ */
+public class ConnectPointTest {
+
+    public static final DeviceId DID1 = deviceId("1");
+    public static final DeviceId DID2 = deviceId("2");
+    public static final PortNumber P1 = portNumber(1);
+    public static final PortNumber P2 = portNumber(2);
+
+    @Test
+    public void basics() {
+        ConnectPoint p = new ConnectPoint(DID1, P2);
+        assertEquals("incorrect element id", DID1, p.deviceId());
+        assertEquals("incorrect element id", P2, p.port());
+    }
+
+
+    @Test
+    public void testEquality() {
+        new EqualsTester()
+                .addEqualityGroup(new ConnectPoint(DID1, P1), new ConnectPoint(DID1, P1))
+                .addEqualityGroup(new ConnectPoint(DID1, P2), new ConnectPoint(DID1, P2))
+                .addEqualityGroup(new ConnectPoint(DID2, P1), new ConnectPoint(DID2, P1))
+                .testEquals();
+    }
+}
\ No newline at end of file