diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix
new file mode 100644
index 00000000000..d58b31ffc04
--- /dev/null
+++ b/pkgs/development/python-modules/paho-mqtt/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
+, pytestrunner, pytest, mock }:
+
+buildPythonPackage rec {
+  pname = "paho-mqtt";
+  version = "1.4.0";
+
+  # No tests in PyPI tarball
+  src = fetchFromGitHub {
+    owner = "eclipse";
+    repo = "paho.mqtt.python";
+    rev = "v${version}";
+    sha256 = "1xg9ppz2lqacd9prsrx93q2wfkjjyla03xlfw74aj1alz9ki5hrs";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py --replace "pylama" ""
+    substituteInPlace setup.cfg --replace "--pylama" ""
+  '';
+
+  checkInputs = [ pytestrunner pytest ] ++ lib.optional (!isPy3k) mock;
+
+  meta = with lib; {
+    homepage = https://eclipse.org/paho;
+    description = "MQTT version 3.1.1 client class";
+    license = licenses.epl10;
+    maintainers = with maintainers; [ mog dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 67b209a6047..fe0589c5734 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8730,24 +8730,7 @@ in {
 
   bottleneck = callPackage ../development/python-modules/bottleneck { };
 
-  paho-mqtt = buildPythonPackage rec {
-    name = "paho-mqtt-${version}";
-    version = "1.1";
-
-    disabled = isPyPy;
-
-    src = pkgs.fetchurl {
-        url = "mirror://pypi/p/paho-mqtt/${name}.tar.gz";
-        sha256 = "07i6k9mw66kgbvjgsrcsd2sjji9ckym50dcxnmhjqfkfzsg64yhg";
-    };
-
-    meta = {
-      homepage = "https://eclipse.org/paho/";
-      description = "mqtt library for machine to machine and internet of things";
-      license = licenses.epl10;
-      maintainers = with maintainers; [ mog ];
-    };
-  };
+  paho-mqtt = callPackage ../development/python-modules/paho-mqtt { };
 
   pamqp = buildPythonPackage rec {
     version = "1.6.1";