diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c
index c96430d41bd..dc3e5dda14f 100644
--- a/src/mesa/drivers/dri/intel/intel_fbo.c
+++ b/src/mesa/drivers/dri/intel/intel_fbo.c
@@ -669,7 +669,7 @@ intel_alloc_renderbuffer_storage(struct gl_context * ctx, struct gl_renderbuffer
 	 return false;
 
    } else if (irb->Base.Format == MESA_FORMAT_S8_Z24
-	      && intel->must_use_separate_stencil) {
+	      && intel->has_separate_stencil) {
 
       bool ok = true;
       struct gl_renderbuffer *depth_rb;
diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
index f875edb9730..f8ef2625df3 100644
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -119,7 +119,7 @@ intel_miptree_create_internal(struct intel_context *intel,
    brw_miptree_layout(intel, mt);
 #endif
 
-   if (intel->must_use_separate_stencil &&
+   if (intel->has_separate_stencil &&
        _mesa_is_depthstencil_format(_mesa_get_format_base_format(format))) {
       mt->stencil_mt = intel_miptree_create(intel,
                                             mt->target,