diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix
index 0da11909de9..61d406edafc 100644
--- a/pkgs/development/python-modules/subliminal/default.nix
+++ b/pkgs/development/python-modules/subliminal/default.nix
@@ -1,6 +1,7 @@
-{ stdenv
+{ lib
 , fetchPypi
-, buildPythonApplication
+, buildPythonPackage
+, isPy3k
 , guessit
 , babelfish
 , enzyme
@@ -16,9 +17,16 @@
 , rarfile
 , pytz
 , futures
+, sympy
+, vcrpy
+, pytest
+, pytestpep8
+, pytest-flakes
+, pytestcov
+, pytestrunner
 }:
 
-buildPythonApplication rec {
+buildPythonPackage rec {
   pname = "subliminal";
   version = "2.0.5";
 
@@ -27,13 +35,21 @@ buildPythonApplication rec {
     sha256 = "1dzv5csjcwgz69aimarx2c6606ckm2gbn4x2mzydcqnyai7sayhl";
   };
 
-  # Too many test dependencies
-  doCheck = false;
-  propagatedBuildInputs = [ guessit babelfish enzyme beautifulsoup4 requests
-                            click dogpile_cache stevedore chardet pysrt six
-                            appdirs rarfile pytz futures ];
+  propagatedBuildInputs = [
+    guessit babelfish enzyme beautifulsoup4 requests
+    click dogpile_cache stevedore chardet pysrt six
+    appdirs rarfile pytz
+  ] ++ lib.optional (!isPy3k) futures;
 
-  meta = with stdenv.lib; {
+  checkInputs = [
+    sympy vcrpy pytest pytestpep8 pytest-flakes
+    pytestcov pytestrunner
+  ];
+
+  # https://github.com/Diaoul/subliminal/pull/963
+  doCheck = false;
+
+  meta = with lib; {
     homepage = https://github.com/Diaoul/subliminal;
     description = "Python library to search and download subtitles";
     license = licenses.mit;