diff --git a/runtests b/runtests
new file mode 100755
index 0000000..6713756
--- /dev/null
+++ b/runtests
@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+import os
+import sys
+
+import django
+from django.conf import settings
+from django.test.utils import get_runner
+
+if __name__ == "__main__":
+    os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.test_settings'
+    django.setup()
+    TestRunner = get_runner(settings)
+    test_runner = TestRunner()
+
+    if len(sys.argv) == 1 or sys.argv[1] in ['-a', '--all']:
+        tests = [
+            'tests.queries',
+            'tests.registry',
+            'tests.data_validation',
+            'tests.limiting_attributes',
+            'tests.misc_models',
+            'tests.set_and_get'
+        ]
+    else:
+        tests = ['tests.{}'.format(arg) for arg in sys.argv[1:]]
+
+    result = test_runner.run_tests(tests)
+    sys.exit(bool(result))
diff --git a/runtests.py b/runtests.py
deleted file mode 100755
index d37ef63..0000000
--- a/runtests.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-import os
-import sys
-
-import django
-from django.conf import settings
-from django.test.utils import get_runner
-
-if __name__ == "__main__":
-    os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.test_settings'
-    django.setup()
-    TestRunner = get_runner(settings)
-    test_runner = TestRunner()
-    failures = test_runner.run_tests(['tests.queries',
-                                      'tests.registry',
-                                      'tests.data_validation',
-                                      'tests.limiting_attributes',
-                                      'tests.misc_models',
-                                      'tests.set_and_get'])
-    sys.exit(bool(failures))