diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix
index 79f6666474e6..8a6eb47a46c7 100644
--- a/pkgs/development/python-modules/pyrsistent/default.nix
+++ b/pkgs/development/python-modules/pyrsistent/default.nix
@@ -3,9 +3,8 @@
 , fetchPypi
 , isPy27
 , six
-, pytest_4
-, hypothesis_4
-, pytestrunner
+, pytestCheckHook
+, hypothesis
 }:
 
 buildPythonPackage rec {
@@ -21,12 +20,16 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six ];
 
-  checkInputs = [ pytestrunner pytest_4 hypothesis_4 ];
+  checkInputs = [ pytestCheckHook hypothesis ];
 
   postPatch = ''
-    substituteInPlace setup.py --replace 'pytest<5' 'pytest'
+    substituteInPlace setup.py \
+      --replace 'pytest<5' 'pytest' \
+      --replace 'hypothesis<5' 'hypothesis'
   '';
 
+  pythonImportsCheck = [ "pyrsistent" ];
+
   meta = with lib; {
     homepage = "https://github.com/tobgu/pyrsistent/";
     description = "Persistent/Functional/Immutable data structures";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7e8624e496da..f4cac7833423 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3362,9 +3362,6 @@ in {
 
   hyperopt = callPackage ../development/python-modules/hyperopt { };
 
-  # File name is called 2.nix because this one will need to remain for Python 2.
-  hypothesis_4 = callPackage ../development/python-modules/hypothesis/2.nix { };
-
   hypothesis-auto = callPackage ../development/python-modules/hypothesis-auto { };
 
   hypothesis = callPackage ../development/python-modules/hypothesis { };
diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix
index 7e430a065814..2a1fd9417b58 100644
--- a/pkgs/top-level/python2-packages.nix
+++ b/pkgs/top-level/python2-packages.nix
@@ -168,7 +168,7 @@ with self; with super; {
 
   http_signature = callPackage ../development/python-modules/http_signature { };
 
-  hypothesis = super.hypothesis_4;
+  hypothesis = callPackage ../development/python-modules/hypothesis/2.nix { };
 
   idna = callPackage ../development/python-modules/idna/2.nix { };