diff --git a/etnaviv/etnaviv-symbol-check b/etnaviv/etnaviv-symbols.txt
old mode 100755
new mode 100644
similarity index 59%
rename from etnaviv/etnaviv-symbol-check
rename to etnaviv/etnaviv-symbols.txt
index b3f3dda7..f48cecea
--- a/etnaviv/etnaviv-symbol-check
+++ b/etnaviv/etnaviv-symbols.txt
@@ -1,17 +1,3 @@
-#!/bin/sh
-
-set -u
-
-# The following symbols (past the first five) are taken from the public headers.
-# A list of the latter should be available Makefile.sources/LIBDRM_ETNAVIV_H_FILES
-
-FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_etnaviv.so} | awk '{print $3}'| while read func; do
-( grep -q "^$func$" || echo $func )  <<EOF
-__bss_start
-_edata
-_end
-_fini
-_init
 etna_device_new
 etna_device_new_dup
 etna_device_ref
@@ -48,8 +34,3 @@ etna_perfmon_create
 etna_perfmon_del
 etna_perfmon_get_dom_by_name
 etna_perfmon_get_sig_by_name
-EOF
-done)
-
-test ! -n "$FUNCS" || echo $FUNCS
-test ! -n "$FUNCS"
diff --git a/etnaviv/meson.build b/etnaviv/meson.build
index 1ecf2940..6040cf63 100644
--- a/etnaviv/meson.build
+++ b/etnaviv/meson.build
@@ -53,8 +53,11 @@ ext_libdrm_etnaviv = declare_dependency(
 )
 
 test(
-  'etnaviv-symbol-check',
-  find_program('etnaviv-symbol-check'),
-  env : env_test,
-  args : libdrm_etnaviv,
+  'etnaviv-symbols-check',
+  symbols_check,
+  args : [
+    '--lib', libdrm_etnaviv,
+    '--symbols-file', files('etnaviv-symbols.txt'),
+    '--nm', prog_nm.path(),
+  ],
 )