diff --git a/.github/workflows/meson.yml b/.github/workflows/meson.yml
index f81aa3c8d5..0d2ac97a96 100644
--- a/.github/workflows/meson.yml
+++ b/.github/workflows/meson.yml
@@ -170,7 +170,7 @@ jobs:
       - name: Build
         run: ninja -C build
       - name: Run tests
-        run: make check
+        run: cd build && meson test
 
   build-omnios:
     name: "OmniOS"
diff --git a/meson.build b/meson.build
index 62bb9fa3b4..d96100ef87 100644
--- a/meson.build
+++ b/meson.build
@@ -216,7 +216,10 @@ check_headers = [
 ]
 
 foreach header : check_headers
-    if cc.has_header(header, include_directories: include_directories(header_dir))
+    if cc.has_header(
+        header,
+        include_directories: include_directories(header_dir),
+    )
         cdata.set('HAVE_' + header.underscorify().to_upper(), 1)
     endif
 endforeach
@@ -612,7 +615,11 @@ endif
 
 if with_kerberos
     if host_os == 'sunos'
-        kerberos_c_args += run_command(krb5_config, '--cflags', check: true).stdout().strip()
+        kerberos_c_args += run_command(
+            krb5_config,
+            '--cflags',
+            check: true,
+        ).stdout().strip()
     endif
     cdata.set('HAVE_KERBEROS', 1)
     kerberos_functions = [
diff --git a/test/afpd/meson.build b/test/afpd/meson.build
index 3f4e6ebea8..46bfae25d9 100644
--- a/test/afpd/meson.build
+++ b/test/afpd/meson.build
@@ -31,39 +31,20 @@ test_sources = [
     'afpfunc_helpers.c',
 ]
 
-test_deps = [kerberos, libgcrypt, mysqlclient]
-
-test_libs = []
-
-if not get_option('with-spotlight').disabled()
-    test_sources += [
-        meson.project_source_root() / 'etc/afpd/spotlight.c',
-        meson.project_source_root() / 'etc/afpd/spotlight_marshalling.c',
-    ]
-    test_libs += libspotlight
-    test_deps += [
-        glib,
-        talloc,
-        tracker_sparql,
-    ]
-endif
-
-if host_os != 'darwin'
-    if not get_option('with-acls').disabled()
-        test_sources += [
-            meson.project_source_root() / 'etc/afpd/acls.c',
-        ]
-        test_deps += [acl_deps]
-    endif
-endif
-
 afpdtest = executable(
     'afpdtest',
     test_sources,
     include_directories: root_includes,
-    dependencies: test_deps,
+    dependencies: [
+        afpd_external_deps,
+        gssapi,
+        kerberos,
+        libgcrypt,
+        libcnid_deps,
+        threads,
+    ],
     c_args: ['-DAPPLCNAME', dversion, messagedir, uamdir, confdir, statedir],
-    link_with: [libatalk, test_libs],
+    link_with: [afpd_internal_deps, libatalk],
 )
 
 test_sh = find_program('test.sh')