diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix
index 0efd110d1ded..eedbed250a12 100644
--- a/pkgs/development/python-modules/joblib/default.nix
+++ b/pkgs/development/python-modules/joblib/default.nix
@@ -6,6 +6,7 @@
 , numpydoc
 , isPy3k
 , stdenv
+, pytest
 }:
 
 
@@ -18,14 +19,10 @@ buildPythonPackage rec {
     sha256 = "7b8fd56df36d9731a83729395ccb85a3b401f62a96255deb1a77220c00ed4085";
   };
 
-  checkInputs = [ nose sphinx numpydoc ];
+  checkInputs = [ sphinx numpydoc pytest ];
 
-  # Failing test on Python 3.x and Darwin
-  postPatch = '''' + lib.optionalString (isPy3k || stdenv.isDarwin) ''
-    sed -i -e '70,84d' joblib/test/test_format_stack.py
-    # test_nested_parallel_warnings: ValueError: Non-zero return code: -9.
-    # Not sure why but it's nix-specific. Try removing for new joblib releases.
-    rm joblib/test/test_parallel.py
+  checkPhase = ''
+    py.test -k 'not test_disk_used and not test_nested_parallel_warnings' joblib/test
   '';
 
   meta = {
@@ -33,4 +30,4 @@ buildPythonPackage rec {
     homepage = http://pythonhosted.org/joblib/;
     license = lib.licenses.bsd3;
   };
-}
\ No newline at end of file
+}