diff --git a/CMakeLists.txt b/CMakeLists.txt
index c508d6493..f6433a857 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,9 +226,14 @@ if(BUILD_GL_TESTS)
     elseif(CORRADE_TARGET_APPLE)
         set(WITH_WINDOWLESSCGLAPPLICATION ON)
         set(GL_TEST_LIBRARIES Magnum MagnumWindowlessCglApplication)
-    elseif(CORRADE_TARGET_UNIX AND (NOT MAGNUM_TARGET_GLES OR MAGNUM_TARGET_DESKTOP_GLES))
-        set(WITH_WINDOWLESSGLXAPPLICATION ON)
-        set(GL_TEST_LIBRARIES Magnum MagnumWindowlessGlxApplication)
+    elseif(CORRADE_TARGET_UNIX)
+        if(MAGNUM_TARGET_GLES AND NOT MAGNUM_TARGET_DESKTOP_GLES)
+            set(WITH_WINDOWLESSEGLAPPLICATION ON)
+            set(GL_TEST_LIBRARIES Magnum MagnumWindowlessEglApplication)
+        else()
+            set(WITH_WINDOWLESSGLXAPPLICATION ON)
+            set(GL_TEST_LIBRARIES Magnum MagnumWindowlessGlxApplication)
+        endif()
     elseif(CORRADE_TARGET_WINDOWS)
         if(NOT MAGNUM_TARGET_GLES OR MAGNUM_TARGET_DESKTOP_GLES)
             set(WITH_WINDOWLESSWGLAPPLICATION ON)
diff --git a/src/Magnum/Platform/magnum-info.cpp b/src/Magnum/Platform/magnum-info.cpp
index c6efab471..17bcc8cf9 100644
--- a/src/Magnum/Platform/magnum-info.cpp
+++ b/src/Magnum/Platform/magnum-info.cpp
@@ -66,7 +66,11 @@
 #elif defined(CORRADE_TARGET_APPLE)
 #include "Magnum/Platform/WindowlessCglApplication.h"
 #elif defined(CORRADE_TARGET_UNIX)
+#if defined(MAGNUM_TARGET_GLES) && !defined(MAGNUM_TARGET_DESKTOP_GLES)
+#include "Magnum/Platform/WindowlessEglApplication.h"
+#else
 #include "Magnum/Platform/WindowlessGlxApplication.h"
+#endif
 #elif defined(CORRADE_TARGET_WINDOWS)
 #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_DESKTOP_GLES)
 #include "Magnum/Platform/WindowlessWglApplication.h"
diff --git a/src/Magnum/Test/AbstractOpenGLTester.h b/src/Magnum/Test/AbstractOpenGLTester.h
index e159cd1ae..ef84d20bd 100644
--- a/src/Magnum/Test/AbstractOpenGLTester.h
+++ b/src/Magnum/Test/AbstractOpenGLTester.h
@@ -38,8 +38,12 @@
 #include "Magnum/Platform/WindowlessIosApplication.h"
 #elif defined(CORRADE_TARGET_APPLE)
 #include "Magnum/Platform/WindowlessCglApplication.h"
-#elif defined(CORRADE_TARGET_UNIX) && (!defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_DESKTOP_GLES))
+#elif defined(CORRADE_TARGET_UNIX)
+#if defined(MAGNUM_TARGET_GLES) && !defined(MAGNUM_TARGET_DESKTOP_GLES)
+#include "Magnum/Platform/WindowlessEglApplication.h"
+#else
 #include "Magnum/Platform/WindowlessGlxApplication.h"
+#endif
 #elif defined(CORRADE_TARGET_WINDOWS)
 #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_DESKTOP_GLES)
 #include "Magnum/Platform/WindowlessWglApplication.h"
diff --git a/src/Magnum/Text/fontconverter.cpp b/src/Magnum/Text/fontconverter.cpp
index 29f8bbc50..cfb866eec 100644
--- a/src/Magnum/Text/fontconverter.cpp
+++ b/src/Magnum/Text/fontconverter.cpp
@@ -37,7 +37,11 @@
 #elif defined(CORRADE_TARGET_APPLE)
 #include "Magnum/Platform/WindowlessCglApplication.h"
 #elif defined(CORRADE_TARGET_UNIX)
+#if defined(MAGNUM_TARGET_GLES) && !defined(MAGNUM_TARGET_DESKTOP_GLES)
+#include "Magnum/Platform/WindowlessEglApplication.h"
+#else
 #include "Magnum/Platform/WindowlessGlxApplication.h"
+#endif
 #elif defined(CORRADE_TARGET_WINDOWS)
 #include "Magnum/Platform/WindowlessWglApplication.h"
 #else
diff --git a/src/Magnum/TextureTools/distancefieldconverter.cpp b/src/Magnum/TextureTools/distancefieldconverter.cpp
index c06831f36..e64d0b52d 100644
--- a/src/Magnum/TextureTools/distancefieldconverter.cpp
+++ b/src/Magnum/TextureTools/distancefieldconverter.cpp
@@ -43,7 +43,11 @@
 #elif defined(CORRADE_TARGET_APPLE)
 #include "Magnum/Platform/WindowlessCglApplication.h"
 #elif defined(CORRADE_TARGET_UNIX)
+#if defined(MAGNUM_TARGET_GLES) && !defined(MAGNUM_TARGET_DESKTOP_GLES)
+#include "Magnum/Platform/WindowlessEglApplication.h"
+#else
 #include "Magnum/Platform/WindowlessGlxApplication.h"
+#endif
 #elif defined(CORRADE_TARGET_WINDOWS)
 #include "Magnum/Platform/WindowlessWglApplication.h"
 #else