2 files changed, 12 insertions, 2 deletions
diff --git a/functional_tests/doc_tests/test_restricted_plugin_options/restricted_plugin_options.rst b/functional_tests/doc_tests/test_restricted_plugin_options/restricted_plugin_options.rst
index 9513fdf..6a08eaf 100644
--- a/functional_tests/doc_tests/test_restricted_plugin_options/restricted_plugin_options.rst
+++ b/functional_tests/doc_tests/test_restricted_plugin_options/restricted_plugin_options.rst
@@ -50,7 +50,7 @@ plugins implementing `startTest`, an exception is raised and nose exits.
     >>> run(argv=argv, plugins=restricted) #doctest: +REPORT_NDIFF +ELLIPSIS
     Traceback (most recent call last):
     ...
-    SystemExit: ...
+    SystemExit: 2
 
 Errors are only raised when options defined by excluded plugins are used.
 
@@ -86,4 +86,4 @@ error is raised.
     >>> run(argv=argv, plugins=restricted) # doctest: +ELLIPSIS
     Traceback (most recent call last):
     ...
-    ConfigError: Error reading config file '...bad.cfg': no such option 'with-meltedcheese'
+    SystemExit: 2
diff --git a/functional_tests/test_multiprocessing/test_concurrent_shared.py b/functional_tests/test_multiprocessing/test_concurrent_shared.py
index 629493e..200c461 100644
--- a/functional_tests/test_multiprocessing/test_concurrent_shared.py
+++ b/functional_tests/test_multiprocessing/test_concurrent_shared.py
@@ -1,12 +1,22 @@
 import os
+import sys
+import unittest
 
 from test_multiprocessing import MPTestBase
 
+
+is_pypy = '__pypy__' in sys.builtin_module_names
+
+
 class TestConcurrentShared(MPTestBase):
     processes = 2
     suitepath = os.path.join(os.path.dirname(__file__), 'support',
                              'concurrent_shared')
 
+    def setUp(self):
+        if is_pypy:
+            raise unittest.SkipTest('pypy warm-up is too slow; skipping')
+
     def runTest(self):
         assert 'Ran 2 tests in 1.' in self.output, "make sure two tests use 1.x seconds (no more than 2 seconsd)"
         assert str(self.output).strip().endswith('OK')