diff --git a/libp2p.nimble b/libp2p.nimble
index 82a412c35..3ea3aa13f 100644
--- a/libp2p.nimble
+++ b/libp2p.nimble
@@ -18,4 +18,5 @@ task test, "Runs the test suite":
   exec "nim c -r tests/testmultiaddress"
   exec "nim c -r tests/testmultihash"
   exec "nim c -r tests/testmultibase"
+  exec "nim c -r tests/testcid"
   exec "nim c -r tests/testdaemon"
diff --git a/tests/testcid.nim b/tests/testcid.nim
new file mode 100644
index 000000000..70b89fd75
--- /dev/null
+++ b/tests/testcid.nim
@@ -0,0 +1,58 @@
+import unittest
+import ../libp2p/[cid, multihash, multicodec]
+
+suite "Content identifier CID test suite":
+
+  test "CIDv0 test vector":
+    var cid0Text = "QmdfTbBqBPQ7VNxZEYEj14VmRuZBkqFbiwReogJgS1zR1n"
+    var cid0 = Cid.init(cid0Text)
+    check:
+      $cid0 == cid0Text
+      cid0.version() == CIDv0
+      cid0.contentType() == multiCodec("dag-pb")
+      cid0.mhash().mcodec == multiCodec("sha2-256")
+    var res = 0
+    try:
+      var cidb0 = Cid.init("QmdfTbBqBPQ7VNxZEYEj14VmRuZBkqFbiwReogJgS1zIII")
+    except CidError:
+      res = 1
+    check res == 1
+
+  test "CIDv1 test vector":
+    var cid1Text = "zb2rhhFAEMepUBbGyP1k8tGfz7BSciKXP6GHuUeUsJBaK6cqG"
+    var chex = "015512209D8453505BDC6F269678E16B3E56" &
+               "C2A2948A41F2C792617CC9611ED363C95B63"
+    var cid1 = Cid.init(cid1Text)
+    check:
+      $cid1 == cid1Text
+      cid1.version() == CIDv1
+      cid1.contentType() == multiCodec("raw")
+      cid1.mhash().mcodec == multiCodec("sha2-256")
+      hex(cid1) == chex
+    
+  test "Comparison test":
+    var msg = "Hello World!"
+    var mmsg = "Hello World!Hello World!"
+    var bmsg = cast[seq[byte]](msg)
+    var bmmsg = cast[seq[byte]](mmsg)
+    var cid0 = Cid.init(CIDv0, multiCodec("dag-pb"),
+                        MultiHash.digest("sha2-256", bmsg))
+    var cid1 = Cid.init(CIDv1, multiCodec("dag-pb"),
+                        MultiHash.digest("sha2-256", bmsg))
+    var cid2 = cid1
+    var cid3 = cid0
+    var cid4 = Cid.init(CIDv1, multiCodec("dag-cbor"),
+                        MultiHash.digest("sha2-256", bmsg))
+    var cid5 = Cid.init(CIDv1, multiCodec("dag-pb"),
+                        MultiHash.digest("sha2-256", bmmsg))
+    var cid6 = Cid.init(CIDv1, multiCodec("dag-pb"),
+                        MultiHash.digest("keccak-256", bmsg))
+    check:
+      cid0 == cid1
+      cid1 == cid2
+      cid2 == cid3
+      cid3 == cid0
+      cid0 != cid4
+      cid1 != cid5
+      cid2 != cid4
+      cid3 != cid6