diff --git a/.buildkite/distributed/pipeline.yml b/.buildkite/distributed/pipeline.yml
index 3af0ef8c9a3..cfb326827ca 100644
--- a/.buildkite/distributed/pipeline.yml
+++ b/.buildkite/distributed/pipeline.yml
@@ -97,6 +97,7 @@ steps:
       TEST_ARCHITECTURE: "CPU"
     commands:
       - "srun julia -O0 --color=yes --project -e 'using Pkg; Pkg.test()'"
+    timeout_in_minutes: 1440
     agents:
       slurm_mem: 50G
       slurm_ntasks: 4
@@ -112,8 +113,9 @@ steps:
       TEST_ARCHITECTURE: "GPU"
     commands:
       - "srun julia -O0 --color=yes --project -e 'using Pkg; Pkg.test()'"
+    timeout_in_minutes: 1440
     agents:
-      slurm_mem: 80G # Apparently the GPU tests require more memory
+      slurm_mem: 100G # Apparently the GPU tests require more memory
       slurm_ntasks: 4
       slurm_gpus_per_task: 1
     retry:
diff --git a/test/test_distributed_hydrostatic_model.jl b/test/test_distributed_hydrostatic_model.jl
index 933bd8be002..bf9d4a43662 100644
--- a/test/test_distributed_hydrostatic_model.jl
+++ b/test/test_distributed_hydrostatic_model.jl
@@ -153,6 +153,10 @@ for arch in archs
             arch    = synchronized(arch)
             closure = CATKEVerticalDiffusivity()
 
+            if arch.local_rank == 0
+                @info "  Testing CATKE with $(ranks(arch)) ranks"
+            end
+
             # "s" for "serial" computation, "p" for parallel
             ms = rotation_with_shear_test(global_underlying_grid, closure)
             mp = rotation_with_shear_test(underlying_grid, closure)
@@ -188,4 +192,3 @@ for arch in archs
         end
     end
 end
-