diff --git a/test/.gitignore b/test/.gitignore
index e95f635..436831f 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -4,6 +4,7 @@ glx_glxgetprocaddress_nocontext
 glx_has_extension_nocontext
 glx_public_api
 glx_public_api_core
+glx_static
 headerguards
 miscdefines
 wgl_core_and_exts
diff --git a/test/Makefile.am b/test/Makefile.am
index 662e17f..4d78be6 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -72,6 +72,7 @@ GLX_TESTS = \
 	glx_public_api_core \
 	glx_glxgetprocaddress_nocontext \
 	glx_has_extension_nocontext \
+	glx_static \
 	$()
 
 GLX_LIBS = libglx_common.la
@@ -103,5 +104,8 @@ glx_glxgetprocaddress_nocontext_DEPENDENCIES = libglx_common.la
 glx_has_extension_nocontext_LDFLAGS = $(X11_LIBS) $(EPOXY) libglx_common.la
 glx_has_extension_nocontext_DEPENDENCIES = libglx_common.la
 
+glx_static_LDFLAGS = -ldl $(X11_LIBS) -static $(EPOXY) libglx_common.la
+glx_static_DEPENDENCIES = libglx_common.la
+
 wgl_core_and_exts_LDFLAGS = $(EPOXY) libwgl_common.la -lgdi32
 wgl_core_and_exts_DEPENDENCIES = libwgl_common.la
diff --git a/test/glx_static.c b/test/glx_static.c
new file mode 100644
index 0000000..d351a4f
--- /dev/null
+++ b/test/glx_static.c
@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2013 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+/**
+ * @file glx_static.c
+ *
+ * Simple touch-test of using epoxy when linked statically.  On Linux,
+ * the ifunc support we'd like to use has some significant behavior
+ * changes depending on whether it's a static build or shared library
+ * build.
+ *
+ * Note that if configured without --enable-static, this test will end
+ * up dynamically linked anyway, defeating the test.
+ */
+
+#include <stdio.h>
+#include <assert.h>
+#include "epoxy/gl.h"
+#include "epoxy/glx.h"
+#include <X11/Xlib.h>
+
+#include "glx_common.h"
+
+int
+main(int argc, char **argv)
+{
+    bool pass = true;
+    int val;
+
+    Display *dpy = get_display_or_skip();
+    make_glx_context_current_or_skip(dpy);
+
+    glEnable(GL_LIGHTING);
+    val = 0;
+    glGetIntegerv(GL_LIGHTING, &val);
+    if (!val) {
+        fprintf(stderr, "Enabling GL_LIGHTING didn't stick.\n");
+        pass = false;
+    }
+
+    return pass != true;
+}