diff --git a/test/__init__.py b/test/__init__.py
index cebf864..ac53525 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -36,7 +36,7 @@ import unittest
 
 
 names = ['blob', 'commit', 'index', 'refs', 'repository', 'revwalk', 'tag',
-         'tree']
+         'tree', 'status']
 def test_suite():
     modules = ['test.test_%s' % n for n in names]
     return unittest.defaultTestLoader.loadTestsFromNames(modules)
diff --git a/test/test_status.py b/test/test_status.py
new file mode 100644
index 0000000..41dc4db
--- /dev/null
+++ b/test/test_status.py
@@ -0,0 +1,79 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+#
+# Copyright 2011 Julien Miotte
+#
+# 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 revision walk."""
+
+__author__ = 'mike.perdide@gmail.com (Julien Miotte)'
+
+import unittest
+
+import pygit2
+import utils
+
+EXPECTED = {
+ "current_file":                    pygit2.GIT_STATUS_CURRENT,
+ "file_deleted":                    pygit2.GIT_STATUS_WT_DELETED,
+ "modified_file":                   pygit2.GIT_STATUS_WT_MODIFIED,
+ "new_file":                        pygit2.GIT_STATUS_WT_NEW,
+
+ "staged_changes":                  pygit2.GIT_STATUS_INDEX_MODIFIED,
+ "staged_changes_file_deleted":     pygit2.GIT_STATUS_INDEX_MODIFIED |
+                                    pygit2.GIT_STATUS_WT_DELETED,
+ "staged_changes_file_modified":    pygit2.GIT_STATUS_INDEX_MODIFIED |
+                                    pygit2.GIT_STATUS_WT_MODIFIED,
+
+ "staged_delete":                   pygit2.GIT_STATUS_INDEX_DELETED,
+ "staged_delete_file_modified":     pygit2.GIT_STATUS_INDEX_DELETED |
+                                    pygit2.GIT_STATUS_WT_NEW,
+ "staged_new":                      pygit2.GIT_STATUS_INDEX_NEW,
+
+ "staged_new_file_deleted":         pygit2.GIT_STATUS_INDEX_NEW |
+                                    pygit2.GIT_STATUS_WT_DELETED,
+ "staged_new_file_modified":        pygit2.GIT_STATUS_INDEX_NEW |
+                                    pygit2.GIT_STATUS_WT_MODIFIED,
+
+ "subdir/current_file":             pygit2.GIT_STATUS_CURRENT,
+ "subdir/deleted_file":             pygit2.GIT_STATUS_WT_DELETED,
+ "subdir/modified_file":            pygit2.GIT_STATUS_WT_MODIFIED,
+ "subdir/new_file":                 pygit2.GIT_STATUS_WT_NEW,
+}
+
+class StatusTest(utils.DirtyRepoTestCase):
+
+    def test_status(self):
+        """
+            For every file in the status, check that the flags are correct.
+        """
+        git_status = self.repo.status()
+        for filepath, status in git_status.items():
+            self.assertTrue(filepath in git_status)
+            self.assertEqual(status, git_status[filepath])
+
+
+if __name__ == '__main__':
+    unittest.main()