diff --git a/lib/pacemaker/tests/pcmk_resource/Makefile.am b/lib/pacemaker/tests/pcmk_resource/Makefile.am
index b8205cb7be..bed9a0ed18 100644
--- a/lib/pacemaker/tests/pcmk_resource/Makefile.am
+++ b/lib/pacemaker/tests/pcmk_resource/Makefile.am
@@ -1,23 +1,20 @@
 #
-# Copyright 2023 the Pacemaker project contributors
+# Copyright 2023-2024 the Pacemaker project contributors
 #
 # The version control history for this file may have further details.
 #
 # This source code is licensed under the GNU General Public License version 2
 # or later (GPLv2+) WITHOUT ANY WARRANTY.
 #
 
 include $(top_srcdir)/mk/tap.mk
 include $(top_srcdir)/mk/unittest.mk
 
 LDADD += $(top_builddir)/lib/pacemaker/libpacemaker.la
 LDADD += $(top_builddir)/lib/cib/libcib.la
 
-AM_TESTS_ENVIRONMENT += PCMK_CTS_CLI_DIR=$(top_srcdir)/cts/cli
-AM_TESTS_ENVIRONMENT += PCMK_schema_directory=$(top_builddir)/xml
-
 # Add "_test" to the end of all test program names to simplify .gitignore.
 
 check_PROGRAMS = pcmk_resource_delete_test
 
 TESTS = $(check_PROGRAMS)
diff --git a/mk/tap.mk b/mk/tap.mk
index 950b72cd65..f9995fdd47 100644
--- a/mk/tap.mk
+++ b/mk/tap.mk
@@ -1,38 +1,40 @@
 #
 # Copyright 2021-2024 the Pacemaker project contributors
 #
 # The version control history for this file may have further details.
 #
 # This source code is licensed under the GNU General Public License version 2
 # or later (GPLv2+) WITHOUT ANY WARRANTY.
 #
 
-AM_TESTS_ENVIRONMENT= 					\
-	G_DEBUG=gc-friendly 				\
-	MALLOC_CHECK_=2 				\
-	MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
+AM_TESTS_ENVIRONMENT = G_DEBUG=gc-friendly
+AM_TESTS_ENVIRONMENT += MALLOC_CHECK_=2
+AM_TESTS_ENVIRONMENT += MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
+AM_TESTS_ENVIRONMENT += PCMK_CTS_CLI_DIR=$(top_srcdir)/cts/cli
+AM_TESTS_ENVIRONMENT += PCMK_schema_directory=$(top_builddir)/xml
+
 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tests/tap-driver.sh
 LOG_COMPILER = $(top_srcdir)/tests/tap-test
 CLEANFILES = *.log *.trs
 
 WRAPPED = abort 		\
 	  calloc		\
 	  endgrent		\
 	  fopen 		\
 	  getenv		\
 	  getpid		\
 	  getgrent		\
 	  getpwnam_r		\
 	  readlink		\
 	  realloc 		\
 	  setenv		\
 	  setgrent		\
 	  strdup 		\
 	  uname			\
 	  unsetenv
 
 if WRAPPABLE_FOPEN64
 WRAPPED	+= fopen64
 endif
 
 LDFLAGS_WRAP = $(foreach fn,$(WRAPPED),-Wl,--wrap=$(fn))