diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37fa180b6e..75208a3b82 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -173,7 +173,6 @@ if(OPENGL_FOUND AND NOT OPENGLES_FOUND)
 endif(OPENGL_FOUND AND NOT OPENGLES_FOUND)
 
 if(OPENGLES_FOUND)
-  add_subdirectory(opengltest)
   target_link_libraries(kdeinit_kwin ${OPENGLES_LIBRARIES} ${OPENGLES_EGL_LIBRARIES})
 endif(OPENGLES_FOUND)
 
diff --git a/compositingprefs.cpp b/compositingprefs.cpp
index 7e9fd2f463..9e78d9bccd 100644
--- a/compositingprefs.cpp
+++ b/compositingprefs.cpp
@@ -235,6 +235,7 @@ void CompositingPrefs::deleteGLXContext()
 void CompositingPrefs::detectDriverAndVersion()
     {
 #ifdef KWIN_HAVE_OPENGL_COMPOSITING
+#ifndef KWIN_HAVE_OPENGLES
     GLPlatform *gl = GLPlatform::instance();
     gl->detect();
     gl->printResults();
@@ -243,6 +244,7 @@ void CompositingPrefs::detectDriverAndVersion()
 
     if( mXgl )
         kWarning( 1212 ) << "Using XGL";
+#endif
 #endif
     }