diff --git a/gaphor/tests/test_action.py b/gaphor/tests/test_action.py
new file mode 100644
index 000000000..e100b6968
--- /dev/null
+++ b/gaphor/tests/test_action.py
@@ -0,0 +1,12 @@
+
+import doctest
+from gaphor import action
+
+def test_suite():
+    return doctest.DocTestSuite(action)
+
+if __name__ == '__main__':
+    import unittest
+    unittest.main(defaultTest='test_suite')
+
+# vim:sw=4:et:ai
diff --git a/setup.py b/setup.py
index 894b47b65..3ae05ae20 100644
--- a/setup.py
+++ b/setup.py
@@ -90,15 +90,23 @@ setup(
             'mainwindow = gaphor.ui.mainwindow:MainWindow',
             'consolewindow = gaphor.ui.consolewindow:ConsoleWindow',
         ],
+        'distutils.commands': [
+            'nosetests = nose.commands:nosetests',
+        ],
     },
 
     cmdclass = {
               'build_uml': build_uml,
               'build_mo': build_mo,
               'build_pot': build_pot,
-	      'install_lib': install_lib,
+              'install_lib': install_lib,
               'run': run,
     },
+
+    setup_requires = 'nose >= 0.9.2',
+
+    test_suite = 'nose.collector',
+
     options = dict(
         py2app = dict(
             includes=['atk', 'pango', 'cairo', 'pangocairo'],
@@ -113,4 +121,5 @@ setup(
         ),
     )
 )
-      
+ 
+# vim:se=4:et:ai