diff --git a/cogl/cogl-context.c b/cogl/cogl-context.c
index 8005aaf23..0f309bd06 100644
--- a/cogl/cogl-context.c
+++ b/cogl/cogl-context.c
@@ -59,6 +59,11 @@ cogl_create_context (void)
   _context->feature_flags = 0;
   _context->features_cached = FALSE;
 
+  /* Initialise the driver specific state */
+  /* TODO: combine these two into one function */
+  _cogl_create_context_driver (_context);
+  _cogl_features_init ();
+
   _context->enable_flags = 0;
   _context->color_alpha = 0;
 
@@ -107,11 +112,6 @@ cogl_create_context (void)
 
   _context->texture_download_material = COGL_INVALID_HANDLE;
 
-  /* Initialise the driver specific state */
-  /* TODO: combine these two into one function */
-  _cogl_create_context_driver (_context);
-  _cogl_features_init ();
-
   /* Create default textures used for fall backs */
   _context->default_gl_texture_2d_tex =
     cogl_texture_new_from_data (1, /* width */