diff --git a/test/__init__.py b/test/__init__.py
index 1864663..62823ae 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -36,7 +36,7 @@ import unittest
 
 
 names = ['blob', 'commit', 'index', 'refs', 'repository', 'revwalk', 'tag',
-         'tree', 'signature', 'status']
+         'tree', 'signature', 'status', 'treebuilder']
 def test_suite():
     modules = ['test.test_%s' % n for n in names]
     return unittest.defaultTestLoader.loadTestsFromNames(modules)
diff --git a/test/test_treebuilder.py b/test/test_treebuilder.py
new file mode 100644
index 0000000..0ef6de3
--- /dev/null
+++ b/test/test_treebuilder.py
@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2012 Carlos Martín Nieto
+#
+# 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 Index files."""
+
+from __future__ import absolute_import
+from __future__ import unicode_literals
+from binascii import b2a_hex
+import os
+import unittest
+
+import pygit2
+from . import utils
+
+
+__author__ = 'carlos@cmartin.tk (Carlos Martín Nieto)'
+
+TREE_SHA = '967fce8df97cc71722d3c2a5930ef3e6f1d27b12'
+
+class TreeBuilderTest(utils.BareRepoTestCase):
+    def test_new_empty_treebuilder(self):
+        bld = pygit2.TreeBuilder()
+
+    def test_noop_treebuilder(self):
+        tree = self.repo[TREE_SHA]
+        bld = pygit2.TreeBuilder(tree)
+        result = bld.write(self.repo)
+        self.assertEqual(tree.oid, result)
+
+    def test_rebuild_treebuilder(self):
+        tree = self.repo[TREE_SHA]
+        bld = pygit2.TreeBuilder(tree)
+        for e in tree:
+            bld.insert(e)
+
+        result = bld.write(self.repo)
+        self.assertEqual(tree.oid, result)
+
+if __name__ == '__main__':
+    unittest.main()