diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index d36a786ab44..3477f797d77 100644
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -126,7 +126,8 @@ egl_HEADERS = \
 	$(top_srcdir)/include/EGL/eglmesaext.h \
 	$(top_srcdir)/include/EGL/eglplatform.h
 
-TESTS = egl-symbols-check
+TESTS = egl-symbols-check \
+	egl-entrypoint-check
 
 EXTRA_DIST = \
 	$(TESTS) \
diff --git a/src/egl/egl-entrypoint-check b/src/egl/egl-entrypoint-check
new file mode 100755
index 00000000000..ec33d8e97f8
--- /dev/null
+++ b/src/egl/egl-entrypoint-check
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+entrypoints=$(grep EGL_ENTRYPOINT "$srcdir"/main/eglentrypoint.h)
+sorted=$(sort <<< "$entrypoints")
+test "$entrypoints" = "$sorted"