diff --git a/django/test/simple.py b/django/test/simple.py
index 200f150594..fed6237929 100644
--- a/django/test/simple.py
+++ b/django/test/simple.py
@@ -84,5 +84,5 @@ def run_tests(module_list, verbosity=1, extra_tests=[]):
     
     teardown_test_environment()
     
-    return len(result.failures)
+    return len(result.failures) + len(result.errors)
     
\ No newline at end of file
diff --git a/docs/testing.txt b/docs/testing.txt
index b9750efbdb..5b27ae6484 100644
--- a/docs/testing.txt
+++ b/docs/testing.txt
@@ -468,7 +468,8 @@ failed::
 
     FAILED (failures=1)
 
-The return code for the script will indicate the number of tests that failed.
+The return code for the script is the total number of failed and erroneous 
+tests. If all the tests pass, the return code is 0.
 
 Regardless of whether the tests pass or fail, the test database is destroyed when
 all the tests have been executed.