diff --git a/var/spack/repos/builtin/packages/mpitrampoline/package.py b/var/spack/repos/builtin/packages/mpitrampoline/package.py
index 5dcfc1c7285..e5dfaf9550f 100644
--- a/var/spack/repos/builtin/packages/mpitrampoline/package.py
+++ b/var/spack/repos/builtin/packages/mpitrampoline/package.py
@@ -71,7 +71,7 @@ def cmake_args(self):
 
     @property
     def headers(self):
-        return find_headers("mpi.h", self.prefix)
+        return find_headers("mpi", self.prefix)
 
     @property
     def libs(self):
diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py
index 2482d961000..9aef20ae64f 100644
--- a/var/spack/repos/builtin/packages/openmpi/package.py
+++ b/var/spack/repos/builtin/packages/openmpi/package.py
@@ -841,7 +841,7 @@ def url_for_version(self, version):
 
     @property
     def headers(self):
-        return find_headers("mpi.h", self.prefix)
+        return find_headers("mpi", self.prefix)
 
     @property
     def libs(self):