diff --git a/test/__init__.py b/test/__init__.py
index 44bc24b..e81179b 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -37,7 +37,7 @@ import unittest
 
 names = ['blob', 'commit', 'config', 'diff', 'index', 'refs', 'remote',
          'repository', 'revwalk', 'signature', 'status', 'tag', 'tree',
-         'treebuilder']
+         'treebuilder', 'note']
 
 def test_suite():
     # Sometimes importing pygit2 fails, we try this first to get an
diff --git a/test/test_note.py b/test/test_note.py
new file mode 100644
index 0000000..b0439e6
--- /dev/null
+++ b/test/test_note.py
@@ -0,0 +1,78 @@
+# -*- coding: UTF-8 -*-
+#
+# Copyright 2010-2013 The pygit2 contributors
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2,
+# as published by the Free Software Foundation.
+#
+# In addition to the permissions in the GNU General Public License,
+# the authors give you unlimited permission to link the compiled
+# version of this file into combinations with other programs,
+# and to distribute those combinations without any restriction
+# coming from the use of this file.  (The General Public License
+# restrictions do apply in other respects; for example, they cover
+# modification of the file, and distribution when not linked into
+# a combined executable.)
+#
+# This file is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; see the file COPYING.  If not, write to
+# the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+
+"""Tests for note objects."""
+
+from __future__ import absolute_import
+from __future__ import unicode_literals
+import unittest
+
+from pygit2 import Signature
+from . import utils
+
+NOTE = ('6c8980ba963cad8b25a9bcaf68d4023ee57370d8', 'note message')
+
+NOTES = [
+  ('ab533997b80705767be3dae8cbb06a0740809f79', 'First Note - HEAD\n',
+    '784855caf26449a1914d2cf62d12b9374d76ae78'),
+  ('d879714d880671ed84f8aaed8b27fca23ba01f27', 'Second Note - HEAD~1\n',
+    'f5e5aa4e36ab0fe62ee1ccc6eb8f79b866863b87')
+]
+
+class NotesTest(utils.BareRepoTestCase):
+    
+    def test_create_note(self):
+        annotated_id = self.repo.revparse_single('HEAD~3').hex
+        author = committer = Signature('Foo bar', 'foo@bar.com', 12346, 0)
+        note_id = self.repo.create_note(NOTE[1], author, committer, annotated_id)
+        self.assertEqual(NOTE[0], utils.oid_to_hex(note_id))
+
+        # check the note blob
+        self.assertEqual(NOTE[1].encode(), self.repo[note_id].data)
+
+    def test_lookup_note(self):
+        annotated_id = self.repo.head.hex
+        note = self.repo.lookup_note(annotated_id)
+        self.assertEqual(NOTES[0][0], note.oid)
+        self.assertEqual(NOTES[0][1], note.message)
+
+    def test_remove_note(self):
+        note = self.repo.lookup_note(self.repo.head.hex)
+        author = committer = Signature('Foo bar', 'foo@bar.com', 12346, 0)
+        note.remove(author, committer)
+        self.assertRaises(KeyError, lambda: self.repo.lookup_note(self.repo.head.hex))
+
+    def test_iterate_notes(self):
+        for i, note in enumerate(self.repo.notes()):
+            entry = (note.oid, note.message, note.annotated_id)
+            self.assertEqual(NOTES[i],entry) 
+
+    def test_iterate_non_existing_ref(self):
+        self.assertRaises(KeyError, lambda: self.repo.notes("refs/notes/bad_ref"))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/test/test_remote.py b/test/test_remote.py
index 9b2c8c8..be00b71 100644
--- a/test/test_remote.py
+++ b/test/test_remote.py
@@ -35,8 +35,8 @@ REMOTE_NAME = 'origin'
 REMOTE_URL = 'git://github.com/libgit2/pygit2.git'
 REMOTE_FETCHSPEC_SRC = 'refs/heads/*'
 REMOTE_FETCHSPEC_DST = 'refs/remotes/origin/*'
-REMOTE_REPO_OBJECTS = 24
-REMOTE_REPO_BYTES = 2253
+REMOTE_REPO_OBJECTS = 30
+REMOTE_REPO_BYTES = 2758
 
 class RepositoryTest(utils.RepoTestCase):
     def test_remote_create(self):