diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py
index fb2ca3f23ca14baea861a63306bbb6ac290b07a5..0567286891bd6f37c70a79bd5987db05dd43c509 100644
--- a/var/spack/repos/builtin/packages/kokkos/package.py
+++ b/var/spack/repos/builtin/packages/kokkos/package.py
@@ -123,10 +123,9 @@ class Kokkos(Package):
     # conflicts on kokkos version and cuda enabled
     # see kokkos issue #1296
     # https://github.com/kokkos/kokkos/issues/1296
-    conflicts('+cuda', when='@2.5.00:develop',
-        msg='Kokkos build system has issue when CUDA enabled'
-        ' in version 2.5.00 through 2.7.00, and develop until '
-        'issue #1296 is resolved.')
+    conflicts('+cuda', when='@2.5.00:2.7.00',
+        msg='Kokkos build system has issue (#1296) when CUDA enabled'
+        ' in version 2.5.00 through 2.7.00.')
 
     # Specify that v1.x is required as v2.x has API changes
     depends_on('hwloc@:1')