diff --git a/.cirrus.yml b/.cirrus.yml
index 5b0d9ee6c2..af6c640589 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -342,7 +342,7 @@ static_alt_build_task:
         - build
     # Community-maintained task, may fail on occasion.  If so, uncomment
     # the next line and file an issue with details about the failure.
-    allow_failures: $CI == $CI
+    # allow_failures: $CI == $CI
     gce_instance: *bigvm
     env:
         <<: *stdenvars
diff --git a/contrib/cirrus/pr-should-include-tests b/contrib/cirrus/pr-should-include-tests
index caf27cf836..a3b4847a7b 100755
--- a/contrib/cirrus/pr-should-include-tests
+++ b/contrib/cirrus/pr-should-include-tests
@@ -39,6 +39,7 @@ filtered_changes=$(git diff --name-status $base $head |
                        egrep -v  '^contrib/'          |
                        egrep -v  '^docs/'             |
                        egrep -v  '^hack/'             |
+                       egrep -v  '^nix/'              |
                        egrep -v  '^vendor/'           |
                        egrep -v  '^version/')
 if [[ -z "$filtered_changes" ]]; then
diff --git a/nix/default.nix b/nix/default.nix
index 13b4585ea1..7745d8b503 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -49,9 +49,11 @@ let
     buildPhase = ''
       patchShebangs .
       make bin/podman
+      make bin/podman-remote
     '';
     installPhase = ''
       install -Dm755 bin/podman $out/bin/podman
+      install -Dm755 bin/podman-remote $out/bin/podman-remote
     '';
   };
 in self