diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix
index 0d0c1159332..1f6975ff255 100644
--- a/pkgs/development/python-modules/ldaptor/default.nix
+++ b/pkgs/development/python-modules/ldaptor/default.nix
@@ -3,17 +3,18 @@
 , fetchPypi
 , twisted
 , passlib
-, pyopenssl
 , pyparsing
 , service-identity
+, six
 , zope_interface
-, isPy3k
+, pythonOlder
 , python
 }:
 
 buildPythonPackage rec {
   pname = "ldaptor";
   version = "21.2.0";
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
@@ -21,18 +22,27 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    twisted passlib pyopenssl pyparsing service-identity zope_interface
-  ];
+    passlib
+    pyparsing
+    six
+    twisted
+    zope_interface
+  ] ++ twisted.extras-require.tls;
 
-  disabled = !isPy3k;
+  checkInputs = [
+    twisted
+  ];
 
   checkPhase = ''
-    ${python.interpreter} -m twisted.trial ldaptor
+    trial -j$NIX_BUILD_CORES ldaptor
   '';
 
-  meta = {
+  meta = with lib; {
     description = "A Pure-Python Twisted library for LDAP";
     homepage = "https://github.com/twisted/ldaptor";
-    license = lib.licenses.mit;
+    license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+    # tests hang or fail with "no space left on device"
+    broken = true;
   };
 }