diff --git a/fabfile.py b/fabfile.py
index c5da1e9538..ecb0c65770 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -14,6 +14,13 @@ def pep8():
         " apps", capture=False)
 
 
-def test():
-    local("python manage.py test --noinput --logging-clear-handlers",
-          capture=False)
+def test(module=None, pdb=False):
+    cmd = "python manage.py test"
+    if module:
+        cmd += " %s" % module
+
+    cmd += " --noinput --logging-clear-handlers"
+    if pdb:
+        cmd += ' --pdb --pdb-failures'
+
+    local(cmd, capture=False)