diff --git a/include/pybind11/eigen/matrix.h b/include/pybind11/eigen/matrix.h
index 5f5ad3867..c30dac241 100644
--- a/include/pybind11/eigen/matrix.h
+++ b/include/pybind11/eigen/matrix.h
@@ -11,7 +11,6 @@
 
 #include "../numpy.h"
 
-// Similar to comments & pragma block in eigen_tensor.h. PLEASE KEEP IN SYNC.
 /* HINT: To suppress warnings originating from the Eigen headers, use -isystem.
    See also:
        https://stackoverflow.com/questions/2579576/i-dir-vs-isystem-dir
diff --git a/tests/test_eigen_tensor.py b/tests/test_eigen_tensor.py
index 5ee5fa01b..653c9f288 100644
--- a/tests/test_eigen_tensor.py
+++ b/tests/test_eigen_tensor.py
@@ -9,8 +9,16 @@ try:
     from pybind11_tests import eigen_tensor_avoid_stl_array as avoid
 
     submodules += [avoid.c_style, avoid.f_style]
-except ImportError:
-    pass
+except ImportError as e:
+    # Ensure config, build, toolchain, etc. issues are not masked here:
+    raise RuntimeError(
+        "import pybind11_tests.eigen_tensor_avoid_stl_array FAILED, while "
+        "import pybind11_tests.eigen_tensor succeeded. "
+        "Please ensure that "
+        "test_eigen_tensor.cpp & "
+        "test_eigen_tensor_avoid_stl_array.cpp "
+        "are built together (or both are not built if Eigen is not available)."
+    ) from e
 
 tensor_ref = np.empty((3, 5, 2), dtype=np.int64)