diff --git a/src/Magnum/GL/Implementation/driverSpecific.cpp b/src/Magnum/GL/Implementation/driverSpecific.cpp
index 929b9c935..c290893f1 100644
--- a/src/Magnum/GL/Implementation/driverSpecific.cpp
+++ b/src/Magnum/GL/Implementation/driverSpecific.cpp
@@ -430,7 +430,7 @@ auto Context::detectedDriver() -> DetectedDrivers {
 
     _detectedDrivers = DetectedDrivers{};
 
-    #ifndef CORRADE_TARGET_APPLE
+    #if !defined(CORRADE_TARGET_APPLE) || defined(MAGNUM_TARGET_GLES)
     const Containers::StringView renderer =
         #ifndef MAGNUM_TARGET_WEBGL
         rendererString()
@@ -439,7 +439,7 @@ auto Context::detectedDriver() -> DetectedDrivers {
         #endif
         ;
     #endif
-    #if !defined(CORRADE_TARGET_APPLE) || defined(MAGNUM_TARGET_GLES)
+    #ifndef CORRADE_TARGET_APPLE
     const Containers::StringView vendor =
         #ifndef MAGNUM_TARGET_WEBGL
         vendorString()
diff --git a/src/Magnum/GL/Test/AbstractShaderProgramGLTest.cpp b/src/Magnum/GL/Test/AbstractShaderProgramGLTest.cpp
index d8490ec7f..57b4f38f7 100644
--- a/src/Magnum/GL/Test/AbstractShaderProgramGLTest.cpp
+++ b/src/Magnum/GL/Test/AbstractShaderProgramGLTest.cpp
@@ -248,7 +248,7 @@ void AbstractShaderProgramGLTest::create() {
     MAGNUM_VERIFY_NO_GL_ERROR();
     CORRADE_VERIFY(linked);
     {
-        #ifdef CORRADE_TARGET_APPLE
+        #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
         CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
         #endif
         CORRADE_VERIFY(valid);
@@ -429,7 +429,7 @@ void AbstractShaderProgramGLTest::uniformNotFound() {
         , Shader::Type::Fragment);
     vert.addSource("void main() { gl_Position = vec4(0.0); }");
     frag.addSource(
-        #ifndef CORRADE_TARGET_APPLE
+        #if !defined(CORRADE_TARGET_APPLE) || defined(MAGNUM_TARGET_GLES)
         "void main() { gl_FragColor = vec4(1.0); }"
         #else
         "out vec4 color;\n"
@@ -694,7 +694,7 @@ void AbstractShaderProgramGLTest::createUniformBlocks() {
     MAGNUM_VERIFY_NO_GL_ERROR();
     CORRADE_VERIFY(linked);
     {
-        #ifdef CORRADE_TARGET_APPLE
+        #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
         CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
         #endif
         CORRADE_VERIFY(valid);
diff --git a/src/Magnum/GL/Test/BufferTextureGLTest.cpp b/src/Magnum/GL/Test/BufferTextureGLTest.cpp
index cd7ba20d3..17f3b454f 100644
--- a/src/Magnum/GL/Test/BufferTextureGLTest.cpp
+++ b/src/Magnum/GL/Test/BufferTextureGLTest.cpp
@@ -34,7 +34,7 @@
 #include "Magnum/GL/ImageFormat.h"
 #include "Magnum/GL/OpenGLTester.h"
 
-#if defined(CORRADE_TARGET_APPLE) && !defined(CORRADE_TARGET_IOS)
+#if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
 #include "Magnum/GL/Texture.h"
 #include "Magnum/GL/TextureFormat.h"
 #endif
@@ -57,7 +57,7 @@ struct BufferTextureGLTest: OpenGLTester {
 
     void resetBuffer();
 
-    #if defined(CORRADE_TARGET_APPLE) && !defined(CORRADE_TARGET_IOS)
+    #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
     void appleSetBufferSubData();
     void appleSetUnrelatedBufferData();
     void appleSetBufferQueryData();
@@ -81,7 +81,7 @@ BufferTextureGLTest::BufferTextureGLTest() {
 
               &BufferTextureGLTest::resetBuffer,
 
-              #if defined(CORRADE_TARGET_APPLE) && !defined(CORRADE_TARGET_IOS)
+              #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
               &BufferTextureGLTest::appleSetBufferSubData,
               &BufferTextureGLTest::appleSetUnrelatedBufferData,
               &BufferTextureGLTest::appleSetBufferQueryData,
@@ -348,7 +348,7 @@ void BufferTextureGLTest::resetBuffer() {
     MAGNUM_VERIFY_NO_GL_ERROR();
 }
 
-#if defined(CORRADE_TARGET_APPLE) && !defined(CORRADE_TARGET_IOS)
+#if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
 void BufferTextureGLTest::appleSetBufferSubData() {
     if(!Context::current().isExtensionSupported<Extensions::ARB::texture_buffer_object>())
         CORRADE_SKIP(Extensions::ARB::texture_buffer_object::string() << "is not supported.");
diff --git a/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp b/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp
index 70ecf2053..31153b5ba 100644
--- a/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp
+++ b/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp
@@ -357,7 +357,7 @@ template<UnsignedInt dimensions> void DistanceFieldVectorGLTest::construct() {
     CORRADE_COMPARE(shader.flags(), data.flags);
     CORRADE_VERIFY(shader.id());
     {
-        #ifdef CORRADE_TARGET_APPLE
+        #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
         CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
         #endif
         CORRADE_VERIFY(shader.validate().first);
@@ -397,7 +397,7 @@ template<UnsignedInt dimensions> void DistanceFieldVectorGLTest::constructUnifor
     CORRADE_COMPARE(shader.drawCount(), data.drawCount);
     CORRADE_VERIFY(shader.id());
     {
-        #ifdef CORRADE_TARGET_APPLE
+        #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
         CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
         #endif
         CORRADE_VERIFY(shader.validate().first);
diff --git a/src/Magnum/Shaders/Test/FlatGLTest.cpp b/src/Magnum/Shaders/Test/FlatGLTest.cpp
index b5a8beedc..bbf472b54 100644
--- a/src/Magnum/Shaders/Test/FlatGLTest.cpp
+++ b/src/Magnum/Shaders/Test/FlatGLTest.cpp
@@ -685,7 +685,7 @@ template<UnsignedInt dimensions> void FlatGLTest::construct() {
     CORRADE_COMPARE(shader.flags(), data.flags);
     CORRADE_VERIFY(shader.id());
     {
-        #ifdef CORRADE_TARGET_APPLE
+        #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
         CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
         #endif
         CORRADE_VERIFY(shader.validate().first);
@@ -729,7 +729,7 @@ template<UnsignedInt dimensions> void FlatGLTest::constructUniformBuffers() {
     CORRADE_COMPARE(shader.drawCount(), data.drawCount);
     CORRADE_VERIFY(shader.id());
     {
-        #ifdef CORRADE_TARGET_APPLE
+        #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
         CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
         #endif
         CORRADE_VERIFY(shader.validate().first);
diff --git a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp
index 7cd2f44d0..3e0476aa1 100644
--- a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp
+++ b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp
@@ -983,7 +983,7 @@ void MeshVisualizerGLTest::construct2D() {
     CORRADE_COMPARE(shader.flags(), data.flags);
     CORRADE_VERIFY(shader.id());
     {
-        #ifdef CORRADE_TARGET_APPLE
+        #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
         CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
         #endif
         CORRADE_VERIFY(shader.validate().first);
@@ -1061,7 +1061,7 @@ void MeshVisualizerGLTest::constructUniformBuffers2D() {
     CORRADE_COMPARE(shader.flags(), data.flags);
     CORRADE_VERIFY(shader.id());
     {
-        #ifdef CORRADE_TARGET_APPLE
+        #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
         CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
         #endif
         CORRADE_VERIFY(shader.validate().first);
@@ -1121,7 +1121,7 @@ void MeshVisualizerGLTest::construct3D() {
     CORRADE_COMPARE(shader.flags(), data.flags);
     CORRADE_VERIFY(shader.id());
     {
-        #ifdef CORRADE_TARGET_APPLE
+        #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
         CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
         #endif
         CORRADE_VERIFY(shader.validate().first);
@@ -1199,7 +1199,7 @@ void MeshVisualizerGLTest::constructUniformBuffers3D() {
     CORRADE_COMPARE(shader.flags(), data.flags);
     CORRADE_VERIFY(shader.id());
     {
-        #ifdef CORRADE_TARGET_APPLE
+        #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
         CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
         #endif
         CORRADE_VERIFY(shader.validate().first);
diff --git a/src/Magnum/Shaders/Test/PhongGLTest.cpp b/src/Magnum/Shaders/Test/PhongGLTest.cpp
index c70e5d332..5a4998dec 100644
--- a/src/Magnum/Shaders/Test/PhongGLTest.cpp
+++ b/src/Magnum/Shaders/Test/PhongGLTest.cpp
@@ -1012,7 +1012,7 @@ void PhongGLTest::construct() {
     CORRADE_COMPARE(shader.lightCount(), data.lightCount);
     CORRADE_VERIFY(shader.id());
     {
-        #ifdef CORRADE_TARGET_APPLE
+        #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
         CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
         #endif
         CORRADE_VERIFY(shader.validate().first);
@@ -1055,7 +1055,7 @@ void PhongGLTest::constructUniformBuffers() {
     CORRADE_COMPARE(shader.drawCount(), data.drawCount);
     CORRADE_VERIFY(shader.id());
     {
-        #ifdef CORRADE_TARGET_APPLE
+        #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
         CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
         #endif
         CORRADE_VERIFY(shader.validate().first);
diff --git a/src/Magnum/Shaders/Test/VectorGLTest.cpp b/src/Magnum/Shaders/Test/VectorGLTest.cpp
index 0e7d7a548..caf9837a9 100644
--- a/src/Magnum/Shaders/Test/VectorGLTest.cpp
+++ b/src/Magnum/Shaders/Test/VectorGLTest.cpp
@@ -354,7 +354,7 @@ template<UnsignedInt dimensions> void VectorGLTest::construct() {
     CORRADE_COMPARE(shader.flags(), data.flags);
     CORRADE_VERIFY(shader.id());
     {
-        #ifdef CORRADE_TARGET_APPLE
+        #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
         CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
         #endif
         CORRADE_VERIFY(shader.validate().first);
@@ -393,7 +393,7 @@ template<UnsignedInt dimensions> void VectorGLTest::constructUniformBuffers() {
     CORRADE_COMPARE(shader.drawCount(), data.drawCount);
     CORRADE_VERIFY(shader.id());
     {
-        #ifdef CORRADE_TARGET_APPLE
+        #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
         CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
         #endif
         CORRADE_VERIFY(shader.validate().first);
diff --git a/src/Magnum/Shaders/Test/VertexColorGLTest.cpp b/src/Magnum/Shaders/Test/VertexColorGLTest.cpp
index 9bb6392fa..7e8b69338 100644
--- a/src/Magnum/Shaders/Test/VertexColorGLTest.cpp
+++ b/src/Magnum/Shaders/Test/VertexColorGLTest.cpp
@@ -293,7 +293,7 @@ template<UnsignedInt dimensions> void VertexColorGLTest::construct() {
     VertexColorGL<dimensions> shader;
     CORRADE_VERIFY(shader.id());
     {
-        #ifdef CORRADE_TARGET_APPLE
+        #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
         CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
         #endif
         CORRADE_VERIFY(shader.validate().first);
@@ -332,7 +332,7 @@ template<UnsignedInt dimensions> void VertexColorGLTest::constructUniformBuffers
     CORRADE_COMPARE(shader.drawCount(), data.drawCount);
     CORRADE_VERIFY(shader.id());
     {
-        #ifdef CORRADE_TARGET_APPLE
+        #if defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES)
         CORRADE_EXPECT_FAIL("macOS drivers need insane amount of state to validate properly.");
         #endif
         CORRADE_VERIFY(shader.validate().first);