diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix
new file mode 100644
index 000000000000..a556aebc47ed
--- /dev/null
+++ b/pkgs/development/python-modules/APScheduler/default.nix
@@ -0,0 +1,65 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools_scm
+, pytest
+, pytestcov
+, sqlalchemy
+, tornado
+, twisted
+, mock
+, trollius
+, gevent
+, six
+, pytz
+, tzlocal
+, funcsigs
+, futures
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  pname = "APScheduler";
+  version = "3.3.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "f68874dff1bdffcc6ce3adb7840c1e4d162c609a3e3f831351df30b75732767b";
+  };
+
+  buildInputs = [
+    setuptools_scm
+  ];
+
+  checkInputs = [
+    pytest
+    pytestcov
+    sqlalchemy
+    tornado
+    twisted
+    mock
+    trollius
+    gevent
+  ];
+
+  propagatedBuildInputs = [
+    six
+    pytz
+    tzlocal
+    funcsigs
+  ] ++ lib.optional (!isPy3k) futures;
+
+  checkPhase = ''
+    py.test
+  '';
+
+  # Somehow it cannot find pytestcov
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A Python library that lets you schedule your Python code to be executed";
+    homepage = http://pypi.python.org/pypi/APScheduler/;
+    license = licenses.mit;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 52034f890ef9..7a014a7fb548 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1247,39 +1247,7 @@ in {
     };
   };
 
-  apscheduler = buildPythonPackage rec {
-    name = "APScheduler-3.3.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/A/APScheduler/${name}.tar.gz";
-      sha256 = "f68874dff1bdffcc6ce3adb7840c1e4d162c609a3e3f831351df30b75732767b";
-    };
-
-    buildInputs = with self; [
-      pytest
-      sqlalchemy
-      tornado
-      twisted
-      mock
-      trollius
-      gevent
-      setuptools_scm
-    ];
-
-    propagatedBuildInputs = with self; [
-      six
-      pytz
-      tzlocal
-      futures
-      funcsigs
-    ];
-
-    meta = with pkgs.stdenv.lib; {
-      description = "A Python library that lets you schedule your Python code to be executed";
-      homepage = http://pypi.python.org/pypi/APScheduler/;
-      license = licenses.mit;
-    };
-  };
+  APScheduler = callPackage ../development/python-modules/APScheduler { };
 
   args = buildPythonPackage rec {
     name = "args-0.1.0";