diff --git a/src/mapi/glapi/gen/GL3x.xml b/src/mapi/glapi/gen/GL3x.xml
index 1b7adddfa18..c17a6440279 100644
--- a/src/mapi/glapi/gen/GL3x.xml
+++ b/src/mapi/glapi/gen/GL3x.xml
@@ -595,7 +595,7 @@
   <enum name="MAX_FRAGMENT_INPUT_COMPONENTS"        value="0x9125"/>
   <enum name="CONTEXT_PROFILE_MASK"                 value="0x9126"/>
 
-  <function name="GetInteger64i_v" offset="assign" es2="3.0" exec="skip">
+  <function name="GetInteger64i_v" offset="assign" es2="3.0">
     <param name="cap" type="GLenum"/>
     <param name="index" type="GLuint"/>
     <param name="data" type="GLint64 *"/>
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index db22569afc7..7d922ca154e 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1709,11 +1709,11 @@ _mesa_GetIntegeri_v( GLenum pname, GLuint index, GLint *params )
 }
 
 void GLAPIENTRY
-_mesa_GetInteger64Indexedv( GLenum pname, GLuint index, GLint64 *params )
+_mesa_GetInteger64i_v( GLenum pname, GLuint index, GLint64 *params )
 {
    union value v;
    enum value_type type =
-      find_value_indexed("glGetIntegerIndexedv", pname, index, &v);      
+      find_value_indexed("glGetInteger64i_v", pname, index, &v);
 
    switch (type) {
    case TYPE_INT:
diff --git a/src/mesa/main/get.h b/src/mesa/main/get.h
index 4daa1aec117..6b0158f37e4 100644
--- a/src/mesa/main/get.h
+++ b/src/mesa/main/get.h
@@ -60,7 +60,7 @@ extern void GLAPIENTRY
 _mesa_GetIntegeri_v( GLenum pname, GLuint index, GLint *params );
 
 extern void GLAPIENTRY
-_mesa_GetInteger64Indexedv( GLenum pname, GLuint index, GLint64 *params );
+_mesa_GetInteger64i_v( GLenum pname, GLuint index, GLint64 *params );
 
 extern void GLAPIENTRY
 _mesa_GetPointerv( GLenum pname, GLvoid **params );
diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp
index a28555978e4..3450b86f6e0 100644
--- a/src/mesa/main/tests/dispatch_sanity.cpp
+++ b/src/mesa/main/tests/dispatch_sanity.cpp
@@ -1310,8 +1310,7 @@ const struct function gles3_functions_possible[] = {
    // We check for the aliased -OES version in GLES 2
    // { "glGetBufferPointerv", 30, -1 },
    { "glGetFragDataLocation", 30, -1 },
-   /// XXX: Missing implementation of glGetInteger64i_v
-   // { "glGetInteger64i_v", 30, -1 },
+   { "glGetInteger64i_v", 30, -1 },
    { "glGetInteger64v", 30, -1 },
    { "glGetIntegeri_v", 30, -1 },
    // XXX: Missing implementation of ARB_internalformat_query