diff --git a/pkgs/applications/version-management/git-remote-codecommit/default.nix b/pkgs/applications/version-management/git-remote-codecommit/default.nix
index 1b0310de1e76..210607e6f151 100644
--- a/pkgs/applications/version-management/git-remote-codecommit/default.nix
+++ b/pkgs/applications/version-management/git-remote-codecommit/default.nix
@@ -5,12 +5,10 @@
   awscli,
 }:
 
-with python3Packages;
-
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "git-remote-codecommit";
-  version = "1.15.1";
-  disabled = !isPy3k;
+  version = "1.17";
+  disabled = !python3Packages.isPy3k;
 
   # The check dependency awscli has some overrides
   # which yield a different botocore.
@@ -21,24 +19,23 @@ buildPythonApplication rec {
 
   src = fetchFromGitHub {
     owner = "aws";
-    repo = pname;
-    rev = version;
-    sha256 = "1vvp7i8ghmq72v57f6smh441h35xnr5ar628q2mr40bzvcifwymw";
+    repo = "git-remote-codecommit";
+    tag = version;
+    hash = "sha256-8heI0Oyfhuvshedw+Eqmwd+e9cOHdDt4O588dplqv/k=";
   };
 
-  propagatedBuildInputs = [ botocore ];
+  dependencies = with python3Packages; [ botocore ];
 
-  nativeCheckInputs = [
-    pytest
-    mock
-    flake8
-    tox
-    awscli
-  ];
-
-  checkPhase = ''
-    pytest
-  '';
+  nativeCheckInputs =
+    [
+      awscli
+    ]
+    ++ (with python3Packages; [
+      pytestCheckHook
+      mock
+      flake8
+      tox
+    ]);
 
   meta = {
     description = "Git remote prefix to simplify pushing to and pulling from CodeCommit";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a6867e25b744..7442e6d59412 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1240,7 +1240,7 @@ with pkgs;
     util-linux = if stdenv.hostPlatform.isLinux then util-linuxMinimal else util-linux;
   };
 
-  git-remote-codecommit = python3Packages.callPackage ../applications/version-management/git-remote-codecommit { };
+  git-remote-codecommit = callPackage ../applications/version-management/git-remote-codecommit { };
 
   gitRepo = git-repo;
   git-repo-updater = python3Packages.callPackage ../applications/version-management/git-repo-updater { };