diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index a51073843f6..a4dedeea2e5 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -422,14 +422,7 @@ one_time_init( struct gl_context *ctx )
    if (!(api_init_mask & (1 << ctx->API))) {
       _mesa_init_get_hash(ctx);
 
-      /*
-       * This is fine as ES does not use the remap table, but it may not be
-       * future-proof.  We cannot always initialize the remap table because
-       * when an app is linked to libGLES*, there are not enough dynamic
-       * entries.
-       */
-      if (_mesa_is_desktop_gl(ctx) || ctx->API == API_OPENGLES2)
-         _mesa_init_remap_table();
+      _mesa_init_remap_table();
    }
 
    api_init_mask |= 1 << ctx->API;
@@ -943,23 +936,7 @@ _mesa_initialize_context(struct gl_context *ctx,
    }
 
    /* setup the API dispatch tables */
-   switch (ctx->API) {
-#if FEATURE_GL || FEATURE_ES2
-   case API_OPENGL:
-   case API_OPENGL_CORE:
-   case API_OPENGLES2:
-      ctx->Exec = _mesa_create_exec_table(ctx);
-      break;
-#endif
-#if FEATURE_ES1
-   case API_OPENGLES:
-      ctx->Exec = _mesa_create_exec_table_es1();
-      break;
-#endif
-   default:
-      _mesa_problem(ctx, "unknown or unsupported API");
-      break;
-   }
+   ctx->Exec = _mesa_create_exec_table(ctx);
 
    if (!ctx->Exec) {
       _mesa_reference_shared_state(ctx, &ctx->Shared, NULL);
diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp
index 11956339391..fadf2959fec 100644
--- a/src/mesa/main/tests/dispatch_sanity.cpp
+++ b/src/mesa/main/tests/dispatch_sanity.cpp
@@ -76,7 +76,6 @@ extern const struct function gles2_functions_possible[];
 extern const struct function gles3_functions_possible[];
 
 #if FEATURE_ES1
-extern "C" _glapi_table *_mesa_create_exec_table_es1(void);
 extern const struct function gles11_functions_possible[];
 #endif /* FEATURE_ES1 */
 
@@ -147,9 +146,20 @@ validate_nops(const _glapi_proc *table)
 #if FEATURE_ES1
 TEST_F(DispatchSanity_test, GLES11)
 {
-   _glapi_proc *exec = (_glapi_proc *) _mesa_create_exec_table_es1();
-   validate_functions(exec, gles11_functions_possible);
-   validate_nops(exec);
+   ctx.Version = 11;
+   _mesa_initialize_context(&ctx,
+                            API_OPENGLES,
+                            &visual,
+                            NULL /* share_list */,
+                            &driver_functions);
+
+   _swrast_CreateContext(&ctx);
+   _vbo_CreateContext(&ctx);
+   _tnl_CreateContext(&ctx);
+   _swsetup_CreateContext(&ctx);
+
+   validate_functions((_glapi_proc *) ctx.Exec, gles11_functions_possible);
+   validate_nops((_glapi_proc *) ctx.Exec);
 }
 #endif /* FEATURE_ES1 */
 
@@ -251,6 +261,7 @@ const struct function gles11_functions_possible[] = {
    { "glEnableClientState", _gloffset_EnableClientState },
    { "glFinish", _gloffset_Finish },
    { "glFlush", _gloffset_Flush },
+   { "glFlushMappedBufferRangeEXT", -1 },
    { "glFogf", _gloffset_Fogf },
    { "glFogfv", _gloffset_Fogfv },
    { "glFogx", -1 },
@@ -312,6 +323,7 @@ const struct function gles11_functions_possible[] = {
    { "glLoadMatrixx", -1 },
    { "glLogicOp", _gloffset_LogicOp },
    { "glMapBufferOES", -1 },
+   { "glMapBufferRangeEXT", -1 },
    { "glMaterialf", _gloffset_Materialf },
    { "glMaterialfv", _gloffset_Materialfv },
    { "glMaterialx", -1 },