diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index 9b42001cf18..6fc4b212904 100644
--- a/src/intel/isl/isl.c
+++ b/src/intel/isl/isl.c
@@ -2248,6 +2248,9 @@ isl_surf_get_hiz_surf(const struct isl_device *dev,
                       const struct isl_surf *surf,
                       struct isl_surf *hiz_surf)
 {
+   if (INTEL_DEBUG(DEBUG_NO_HIZ))
+      return false;
+
    /* HiZ support does not exist prior to Gfx5 */
    if (ISL_GFX_VER(dev) < 5)
       return false;
@@ -2366,6 +2369,9 @@ isl_surf_supports_ccs(const struct isl_device *dev,
                       const struct isl_surf *surf,
                       const struct isl_surf *hiz_or_mcs_surf)
 {
+   if (INTEL_DEBUG(DEBUG_NO_CCS))
+      return false;
+
    if (surf->usage & ISL_SURF_USAGE_DISABLE_AUX_BIT)
       return false;