diff --git a/src/dispatch_common.c b/src/dispatch_common.c
index d0d73dc..9d17878 100644
--- a/src/dispatch_common.c
+++ b/src/dispatch_common.c
@@ -600,16 +600,14 @@ epoxy_get_proc_address(const char *name)
         return glXGetProcAddressARB((const GLubyte *)name);
     } else {
 #if PLATFORM_HAS_EGL
-        if (api.glx_handle && glXGetCurrentContext()) {
-            GLenum egl_api = epoxy_egl_get_current_gl_context_api();
-
-            switch (egl_api) {
-            case EGL_OPENGL_API:
-            case EGL_OPENGL_ES_API:
-                return eglGetProcAddress(name);
-            case EGL_NONE:
-                break;
-            }
+        GLenum egl_api = epoxy_egl_get_current_gl_context_api();
+
+        switch (egl_api) {
+        case EGL_OPENGL_API:
+        case EGL_OPENGL_ES_API:
+            return eglGetProcAddress(name);
+        case EGL_NONE:
+            break;
         }
 #endif
     }
diff --git a/test/Makefile.am b/test/Makefile.am
index a647b8e..b1dcc18 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -63,7 +63,6 @@ TESTS = \
 check_BINARIES = $(EGL_AND_GLX_BIN)
 
 XFAIL_TESTS = \
-        egl_gl \
         egl_and_glx_different_pointers_egl_glx \
 	$()