diff --git a/glib-tap.mk b/glib-tap.mk
index 9a3a445bd..5f25b620a 100644
--- a/glib-tap.mk
+++ b/glib-tap.mk
@@ -1,6 +1,6 @@
 # GLIB - Library of useful C routines
 
-TESTS_ENVIRONMENT= \
+AM_TESTS_ENVIRONMENT= \
 	G_TEST_SRCDIR="$(abs_srcdir)" 		\
 	G_TEST_BUILDDIR="$(abs_builddir)" 	\
 	G_DEBUG=gc-friendly 			\
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 72af39d40..46231507d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -79,7 +79,7 @@ dist_test_data = \
 check_PROGRAMS += $(installed_test_programs) $(installed_test_extra_programs)
 check_SCRIPTS += $(installed_test_scripts)
 TESTS += $(installed_test_programs) $(dist_uninstalled_test_extra_scripts)
-TESTS_ENVIRONMENT = \
+AM_TESTS_ENVIRONMENT = \
 	G_TEST_SRCDIR=$(abs_srcdir)				\
 	G_TEST_BUILDDIR=$(abs_builddir)				\
 	LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset	\
diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am
index 16f28278a..656941db1 100644
--- a/tests/gobject/Makefile.am
+++ b/tests/gobject/Makefile.am
@@ -34,7 +34,7 @@ noinst_PROGRAMS += \
 # This will cause them to be built even if installed tests are disabled.
 check_PROGRAMS += $(installed_test_programs) $(installed_test_extra_programs)
 TESTS += $(installed_test_programs)
-TESTS_ENVIRONMENT = \
+AM_TESTS_ENVIRONMENT = \
 	LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset    \
 	MALLOC_CHECK_=2                                         \
 	MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
diff --git a/tests/refcount/Makefile.am b/tests/refcount/Makefile.am
index f9a98dcd7..6315c6ea0 100644
--- a/tests/refcount/Makefile.am
+++ b/tests/refcount/Makefile.am
@@ -20,7 +20,7 @@ TESTS += \
 	signal4					\
 	$(NULL)
 
-TESTS_ENVIRONMENT = srcdir=$(srcdir) \
+AM_TESTS_ENVIRONMENT = srcdir=$(srcdir) \
 	LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
 
 signal1_SOURCES = signals.c