diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-19.1.7-GCCcore-8.3.0.eb b/easybuild/easyconfigs/m/Mesa/Mesa-19.1.7-GCCcore-8.3.0.eb
index 4c51ea66897..91d046257ff 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-19.1.7-GCCcore-8.3.0.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-19.1.7-GCCcore-8.3.0.eb
@@ -7,8 +7,6 @@
 # it will try to use the llvmpipe by default. It you want swr, do:
 # GALLIUM_DRIVER=swr
 
-easyblock = 'MesonNinja'
-
 name = 'Mesa'
 version = '19.1.7'
 
@@ -54,23 +52,8 @@ dependencies = [
 ]
 
 configopts = " -Dplatforms=x11 -Dosmesa=gallium -Ddri3=false -Ddri-drivers='' -Dvulkan-drivers=''"
-configopts += " -Dgbm=false -Dglx-direct=false -Dgallium-drivers='swrast,swr' -Degl=false"
+configopts += " -Dgbm=false -Dglx-direct=false -Degl=false"
 configopts += " -Dllvm=true -Dshared-llvm=true"
 configopts += " -Dlibunwind=true -Dglx=gallium-xlib"
 
-# also install header files located include/GL/internal/
-# we can't enable both DRI and Gallium drivers, but we can provide the DRI header file (GL/internal/dri_interface.h)
-postinstallcmds = ["cp -a %(builddir)s/mesa-%(version)s/include/GL/internal %(installdir)s/include/GL/"]
-
-sanity_check_paths = {
-    'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libOSMesa.%s' % SHLIB_EXT,
-              'lib/libGLESv1_CM.%s' % SHLIB_EXT, 'lib/libGLESv2.%s' % SHLIB_EXT,
-              'include/GL/glext.h', 'include/GL/gl_mangle.h',
-              'include/GL/glx.h', 'include/GL/osmesa.h',
-              'include/GL/gl.h', 'include/GL/glxext.h',
-              'include/GL/glx_mangle.h', 'include/GLES/gl.h',
-              'include/GLES2/gl2.h', 'include/GLES3/gl3.h'],
-    'dirs': ['include/GL/internal'],
-}
-
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-19.2.1-GCCcore-8.3.0.eb b/easybuild/easyconfigs/m/Mesa/Mesa-19.2.1-GCCcore-8.3.0.eb
index 1aaf2c5d8a3..24c29f2bd60 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-19.2.1-GCCcore-8.3.0.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-19.2.1-GCCcore-8.3.0.eb
@@ -7,8 +7,6 @@
 # it will try to use the llvmpipe by default. It you want swr, do:
 # GALLIUM_DRIVER=swr
 
-easyblock = 'MesonNinja'
-
 name = 'Mesa'
 version = '19.2.1'
 
@@ -61,7 +59,6 @@ dependencies = [
 ]
 
 configopts = " -Dplatforms=x11 -Dosmesa=gallium -Ddri-drivers='' -Dvulkan-drivers=''"
-configopts += " -Dgallium-drivers='swrast,swr' -Dswr-arches=avx,avx2,skx,knl"
 configopts += " -Dllvm=true -Dshared-llvm=true"
 configopts += " -Dlibunwind=true"
 configopts += " -Dglvnd=true"
@@ -74,15 +71,4 @@ postinstallcmds = ["ln -s libGLX_mesa.so.0 %(installdir)s/lib/libGLX_indirect.so
 # Tells libglvnd where to find EGL libraries
 modextrapaths = {"__EGL_VENDOR_LIBRARY_DIRS": "share/glvnd/egl_vendor.d"}
 
-sanity_check_paths = {
-    'files': ['lib/libGLX_mesa.%s' % SHLIB_EXT, 'lib/libOSMesa.%s' % SHLIB_EXT,
-              'lib/libEGL_mesa.%s' % SHLIB_EXT,
-              'include/GL/glext.h', 'include/GL/gl_mangle.h',
-              'include/GL/glx.h', 'include/GL/osmesa.h',
-              'include/GL/gl.h', 'include/GL/glxext.h',
-              'include/GL/glx_mangle.h', 'include/GLES/gl.h',
-              'include/GLES2/gl2.h', 'include/GLES3/gl3.h'],
-    'dirs': ['include/GL/internal'],
-}
-
 moduleclass = 'vis'