diff --git a/Lib/test/test_email/__init__.py b/Lib/test/test_email/__init__.py
index 280afbd4478..d72b50e8071 100644
--- a/Lib/test/test_email/__init__.py
+++ b/Lib/test/test_email/__init__.py
@@ -5,6 +5,16 @@ import test.support
 import email
 from test.test_email import __file__ as landmark
 
+# Run all tests in package for '-m unittest test.test_email'
+def load_tests(loader, standard_tests, pattern):
+    this_dir = os.path.dirname(__file__)
+    if pattern is None:
+        pattern = "test*"
+    package_tests = loader.discover(start_dir=this_dir, pattern=pattern)
+    standard_tests.addTests(package_tests)
+    return standard_tests
+
+
 # used by regrtest and __main__.
 def test_main():
     here = os.path.dirname(__file__)
diff --git a/Misc/NEWS b/Misc/NEWS
index 88e5e8404f8..b0dab745235 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -83,6 +83,11 @@ Extension Modules
 - Issue #14259: The finditer() method of re objects did not take any
   keyword arguments, contrary to the documentation.
 
+Tests
+-----
+
+- Issue #8315: (partial fix) python -m unittest test.test_email now works.
+
 
 What's New in Python 3.3.0 Alpha 1?
 ===================================