diff --git a/var/spack/repos/builtin/packages/magma/package.py b/var/spack/repos/builtin/packages/magma/package.py
index a937c710ad9..b6579c77884 100644
--- a/var/spack/repos/builtin/packages/magma/package.py
+++ b/var/spack/repos/builtin/packages/magma/package.py
@@ -16,7 +16,7 @@ class Magma(CMakePackage, CudaPackage, ROCmPackage):
     homepage = "https://icl.utk.edu/magma/"
     git = "https://github.com/icl-utk-edu/magma"
     url = "https://icl.utk.edu/projectsfiles/magma/downloads/magma-2.2.0.tar.gz"
-    maintainers("stomov", "luszczek", "G-Ragghianti")
+    maintainers("luszczek", "G-Ragghianti")
 
     tags = ["e4s"]
 
@@ -53,24 +53,7 @@ class Magma(CMakePackage, CudaPackage, ROCmPackage):
     depends_on("cuda@8:", when="@2.5.1: +cuda")  # See PR #14471
     depends_on("hipblas", when="+rocm")
     depends_on("hipsparse", when="+rocm")
-    # This ensures that rocm-core matches the hip package version in the case that
-    # hip is an external package.
-    for ver in [
-        "5.5.0",
-        "5.5.1",
-        "5.6.0",
-        "5.6.1",
-        "5.7.0",
-        "5.7.1",
-        "6.0.0",
-        "6.0.2",
-        "6.1.0",
-        "6.1.1",
-        "6.1.2",
-        "6.2.0",
-        "6.2.1",
-    ]:
-        depends_on(f"rocm-core@{ver}", when=f"@2.8.0: +rocm ^hip@{ver}")
+    depends_on("rocm-core", when="@2.8.0: +rocm")
     depends_on("python", when="@master", type="build")
 
     conflicts("~cuda", when="~rocm", msg="magma: Either CUDA or HIP support must be enabled")
@@ -210,7 +193,9 @@ def test_c(self):
         with working_dir(test_dir):
             pkg_config_path = self.prefix.lib.pkgconfig
             with spack.util.environment.set_env(PKG_CONFIG_PATH=pkg_config_path):
-                make("c")
+                make = self.spec["gmake"].command
+                CC = "hipcc" if self.spec.satisfies("+rocm") else self.compiler.cc
+                make("c", f"CC={CC}")
                 tests = [
                     ("example_sparse", "sparse solver"),
                     ("example_sparse_operator", "sparse operator"),
@@ -234,6 +219,7 @@ def test_fortran(self):
         with working_dir(test_dir):
             pkg_config_path = self.prefix.lib.pkgconfig
             with spack.util.environment.set_env(PKG_CONFIG_PATH=pkg_config_path):
+                make = self.spec["gmake"].command
                 make("fortran")
                 example_f = which("example_f")
                 example_f()