diff --git a/src/glx/glx_pbuffer.c b/src/glx/glx_pbuffer.c
index 9bf99be204f..6b7e6693f42 100644
--- a/src/glx/glx_pbuffer.c
+++ b/src/glx/glx_pbuffer.c
@@ -296,14 +296,13 @@ __glXGetDrawableAttribute(Display * dpy, GLXDrawable drawable,
 
    if (pdraw) {
       if (attribute == GLX_SWAP_INTERVAL_EXT) {
-         *value = pdraw->psc->driScreen.getSwapInterval(pdraw);
+         *value = abs(pdraw->psc->driScreen.getSwapInterval(pdraw));
          return 1;
       } else if (attribute == GLX_MAX_SWAP_INTERVAL_EXT) {
          *value = pdraw->psc->driScreen.maxSwapInterval;
          return 1;
       } else if (attribute == GLX_LATE_SWAPS_TEAR_EXT) {
-         *value = __glXExtensionBitIsEnabled(pdraw->psc,
-                                             EXT_swap_control_tear_bit);
+         *value = pdraw->psc->driScreen.getSwapInterval(pdraw) < 0;
          return 1;
       }
    }