diff --git a/stacks/pinot-noir/definitions_cuda.yaml b/stacks/pinot-noir/definitions_cuda.yaml
index 6cbc7ee9dcaeb80ecd6d4fb06c89d96445573276..eac7dc986e0c591190e45c29c150af55afe9544a 100644
--- a/stacks/pinot-noir/definitions_cuda.yaml
+++ b/stacks/pinot-noir/definitions_cuda.yaml
@@ -5,6 +5,7 @@ definitions:
       - cuda
       - cudnn
       - nccl
+      - nccl-tests
 
   - cuda_mpi_codes:
       - nvshmem
diff --git a/stacks/pinot-noir/packages_kuma-h100.yaml b/stacks/pinot-noir/packages_kuma-h100.yaml
index 262d066a58624b4338a848bd28435bbdb06cd1ad..b02e6413c27193bc3fa7d129e9ea49f805a98095 100644
--- a/stacks/pinot-noir/packages_kuma-h100.yaml
+++ b/stacks/pinot-noir/packages_kuma-h100.yaml
@@ -18,6 +18,8 @@ packages:
       when: "%gcc"
     - spec: "%gcc@12.3.0 target=zen4"
       when: "%gcc"
+    require:
+    - '@12.4.0'
 
   hypre:
     require:
@@ -38,7 +40,7 @@ packages:
       - spec: '+cuda cuda_arch=90'
 
   papi:
-    require: ['+nvml', '+infiniband']
+    require: ['+nvml', '+infiniband', '+cuda']
 
   petsc:
     require:
diff --git a/stacks/pinot-noir/packages_stack.yaml b/stacks/pinot-noir/packages_stack.yaml
index 7b758073168010d23072b6ba739a84e17d7b84fd..48a4adc2bc714b8d725567e39d117cdfc4d22fa6 100644
--- a/stacks/pinot-noir/packages_stack.yaml
+++ b/stacks/pinot-noir/packages_stack.yaml
@@ -34,7 +34,6 @@ packages:
 
   cuda:
     require:
-    - spec: '@12.4.0'
     - spec: '+allow-unsupported-compilers'
       when: '%oneapi'