diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
new file mode 100644
index 000000000000..cf74e1dc1342
--- /dev/null
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, buildPythonPackage, fetchPypi, jinja2, werkzeug, flask, requests, pytz
+, six, boto, httpretty, xmltodict, nose, sure, boto3, freezegun, dateutil }:
+
+buildPythonPackage rec {
+  pname = "moto";
+  version = "0.4.31";
+  name    = "moto-${version}";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "19s8hfz4mzzzdksa0ddlvrga5mxdaqahk89p5l29a5id8127shr8";
+  };
+
+  propagatedBuildInputs = [
+    boto
+    dateutil
+    flask
+    httpretty
+    jinja2
+    pytz
+    werkzeug
+    requests
+    six
+    xmltodict
+  ];
+
+  checkInputs = [ boto3 nose sure freezegun ];
+
+  checkPhase = "nosetests";
+
+  # TODO: make this true; I think lots of the tests want network access but we can probably run the others
+  doCheck = false;
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a53b873475f9..0d31dd793e2c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12338,27 +12338,7 @@ in {
 
   moretools = callPackage ../development/python-modules/moretools { };
 
-  moto = buildPythonPackage rec {
-    version = "0.4.25";
-    name    = "moto-${version}";
-    src = pkgs.fetchurl {
-      url    = "http://pypi.python.org/packages/df/9e/0b22ac0abf61711c86ae75a0548825e19cc123b522ff3508cbc43924969d/moto-0.4.25.tar.gz";
-      sha256 = "1gqm7h6bm5xkspd07bnjwdr2q6cvpxkayx0hkgk8fhkawbg0fqq7";
-    };
-
-    propagatedBuildInputs = with self; [
-      # Main dependencies
-      jinja2 werkzeug flask requests six boto httpretty xmltodict
-      # For tests
-      nose sure boto3 freezegun
-    ];
-
-    checkPhase = "nosetests";
-
-    # TODO: make this true; I think lots of the tests want network access but we can probably run the others
-    doCheck = false;
-  };
-
+  moto = callPackage ../development/python-modules/moto {};
 
   mox = buildPythonPackage rec {
     name = "mox-0.5.3";