diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/pkgs/development/python-modules/gplaycli/default.nix
index 11ff2d6fc1e6..769670edf433 100644
--- a/pkgs/development/python-modules/gplaycli/default.nix
+++ b/pkgs/development/python-modules/gplaycli/default.nix
@@ -1,25 +1,76 @@
-{ buildPythonPackage, lib, libffi, isPy3k, pyasn1, clint, ndg-httpsclient
-, protobuf, requests, args, matlink-gpapi, pyaxmlparser, setuptools, fetchFromGitHub
+{ lib
+, args
+, buildPythonPackage
+, clint
+, fetchFromGitHub
+, libffi
+, matlink-gpapi
+, ndg-httpsclient
+, protobuf
+, pyasn1
+, pyaxmlparser
+, pytestCheckHook
+, pythonOlder
+, requests
+, setuptools
 }:
 
 buildPythonPackage rec {
   pname = "gplaycli";
   version = "3.29";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "matlink";
     repo = "gplaycli";
-    rev = version;
-    sha256 = "10gc1wr259z5hxyk834wyyggvyh82agfq0zp711s4jf334inp45r";
+    rev = "refs/tags/${version}";
+    hash = "sha256-uZBrIxnDSaJDOPcD7J4SCPr9nvecDDR9h+WnIjIP7IE=";
   };
 
-  disabled = !isPy3k;
+  propagatedBuildInputs = [
+    libffi
+    pyasn1
+    clint
+    ndg-httpsclient
+    protobuf
+    requests
+    args
+    matlink-gpapi
+    pyaxmlparser
+    setuptools
+  ];
 
-  propagatedBuildInputs = [ libffi pyasn1 clint ndg-httpsclient protobuf requests args matlink-gpapi pyaxmlparser setuptools ];
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "gplaycli"
+  ];
+
+  preCheck = ''
+    export PATH="$PATH:$out/bin";
+  '';
+
+  disabledTests = [
+    "test_alter_token"
+    "test_another_device"
+    "test_connection_credentials"
+    "test_connection_token"
+    "test_download_additional_files"
+    "test_download_focus"
+    "test_download_version"
+    "test_download"
+    "test_search"
+    "test_update"
+  ];
 
   meta = with lib; {
-    homepage = "https://github.com/matlink/gplaycli";
     description = "Google Play Downloader via Command line";
+    homepage = "https://github.com/matlink/gplaycli";
+    changelog = "https://github.com/matlink/gplaycli/releases/tag/${version}";
     license = licenses.agpl3Plus;
     maintainers = with maintainers; [ ];
   };