diff --git a/cogl/cogl/driver/gl/cogl-driver-gl.c b/cogl/cogl/driver/gl/cogl-driver-gl.c
index cc183a57e..407eb169b 100644
--- a/cogl/cogl/driver/gl/cogl-driver-gl.c
+++ b/cogl/cogl/driver/gl/cogl-driver-gl.c
@@ -41,6 +41,7 @@ cogl_driver_gl_class_init (CoglDriverGLClass *klass)
 {
   CoglDriverClass *driver_klass = COGL_DRIVER_CLASS (klass);
 
+  driver_klass->context_init = _cogl_driver_gl_context_init;
   driver_klass->context_deinit = _cogl_driver_gl_context_deinit;
   driver_klass->get_vendor = _cogl_context_get_gl_vendor;
   driver_klass->is_hardware_accelerated = _cogl_driver_gl_is_hardware_accelerated;
diff --git a/cogl/cogl/driver/gl/gl/cogl-driver-gl3.c b/cogl/cogl/driver/gl/gl/cogl-driver-gl3.c
index 24fa9c2c0..9dd5df2d3 100644
--- a/cogl/cogl/driver/gl/gl/cogl-driver-gl3.c
+++ b/cogl/cogl/driver/gl/gl/cogl-driver-gl3.c
@@ -46,7 +46,7 @@ cogl_driver_gl3_context_init (CoglDriver  *driver,
 {
   GLuint vertex_array;
 
-  _cogl_driver_gl_context_init (driver, context);
+  COGL_DRIVER_CLASS (cogl_driver_gl3_parent_class)->context_init (driver, context);
 
   /* In a forward compatible context, GL 3 doesn't support rendering
    * using the default vertex array object. Cogl doesn't use vertex
diff --git a/cogl/cogl/driver/gl/gles/cogl-driver-gles2.c b/cogl/cogl/driver/gl/gles/cogl-driver-gles2.c
index b67e1c534..f8d30f15d 100644
--- a/cogl/cogl/driver/gl/gles/cogl-driver-gles2.c
+++ b/cogl/cogl/driver/gl/gles/cogl-driver-gles2.c
@@ -866,7 +866,6 @@ cogl_driver_gles2_class_init (CoglDriverGLES2Class *klass)
 {
   CoglDriverClass *driver_klass = COGL_DRIVER_CLASS (klass);
 
-  driver_klass->context_init = _cogl_driver_gl_context_init;
   driver_klass->pixel_format_to_gl = cogl_driver_gles2_pixel_format_to_gl;
   driver_klass->get_read_pixels_format = cogl_driver_gles2_get_read_pixels_format;
   driver_klass->update_features = cogl_driver_gles2_update_features;