diff --git a/test/__init__.py b/test/__init__.py
index febb37b..8d007ff 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -36,7 +36,7 @@ import unittest
 
 
 def test_suite():
-    names = ['repository']
+    names = ['commit', 'repository']
     modules = ['test.test_%s' % n for n in names]
     return unittest.defaultTestLoader.loadTestsFromNames(modules)
 
diff --git a/test/test_commit.py b/test/test_commit.py
new file mode 100644
index 0000000..07e1fab
--- /dev/null
+++ b/test/test_commit.py
@@ -0,0 +1,94 @@
+#!/usr/bin/env python
+#
+# Copyright 2010 Google, Inc.
+#
+# 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 Commit objects."""
+
+__author__ = 'dborowitz@google.com (Dave Borowitz)'
+
+import unittest
+
+import pygit2
+import utils
+
+COMMIT_SHA = '5fe808e8953c12735680c257f56600cb0de44b10'
+
+
+class CommitTest(utils.TestRepoTestCase):
+
+    def test_read_commit(self):
+        commit = self.repo[COMMIT_SHA]
+        self.assertEqual('Second test data commit.', commit.message_short)
+        self.assertEqual(('Second test data commit.\n\n'
+                          'This commit has some additional text.\n'),
+                         commit.message)
+        commit_time = 1288481576
+        self.assertEqual(commit_time, commit.commit_time)
+        self.assertEqual(('Dave Borowitz', 'dborowitz@google.com', commit_time),
+                         commit.committer)
+        self.assertEqual(('Dave Borowitz', 'dborowitz@google.com', 1288477363),
+                         commit.author)
+
+    def test_new_commit(self):
+        message = 'New commit.\n\nMessage.\n'
+        committer = ('John Doe', 'jdoe@example.com', 12346)
+        author = ('Jane Doe', 'jdoe2@example.com', 12345)
+
+        commit = pygit2.Commit(self.repo)
+        commit.message = message
+        commit.committer = committer
+        commit.author = author
+
+        self.assertEqual(pygit2.GIT_OBJ_COMMIT, commit.type)
+        self.assertEqual(message, commit.message)
+        # TODO: Uncomment when git_commit_set_message updates message_short.
+        #self.assertEqual('New commit.', commit.message_short)
+        # TODO: Uncomment when git_commit_set_committer updates commit_time.
+        #self.assertEqual(12346, commit.commit_time)
+        self.assertEqual(committer, commit.committer)
+        self.assertEqual(author, commit.author)
+
+    def test_modify_commit(self):
+        message = 'New commit.\n\nMessage.\n'
+        committer = ('John Doe', 'jdoe@example.com', 12346)
+        author = ('Jane Doe', 'jdoe2@example.com', 12345)
+
+        commit = self.repo[COMMIT_SHA]
+        commit.message = message
+        commit.committer = committer
+        commit.author = author
+
+        self.assertEqual(message, commit.message)
+        # TODO: Uncomment when libgit2 supports changing message_short.
+        #self.assertEqual('New commit.', commit.message_short)
+        # TODO: Uncomment when libgit2 supports changing commit_time.
+        #self.assertEqual(12346, commit.commit_time)
+        self.assertEqual(committer, commit.committer)
+        self.assertEqual(author, commit.author)
+
+
+if __name__ == '__main__':
+  unittest.main()