diff --git a/lib/common/tests/nvpair/Makefile.am b/lib/common/tests/nvpair/Makefile.am
index 2f27f66dab..d294c8242a 100644
--- a/lib/common/tests/nvpair/Makefile.am
+++ b/lib/common/tests/nvpair/Makefile.am
@@ -1,27 +1,22 @@
 #
 # Copyright 2021-2025 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/common.mk
 include $(top_srcdir)/mk/tap.mk
 include $(top_srcdir)/mk/unittest.mk
 
 # Add "_test" to the end of all test program names to simplify .gitignore.
 check_PROGRAMS = crm_meta_name_test		\
 		 crm_meta_value_test		\
 		 pcmk__cmp_nvpair_blocks_test	\
 		 pcmk__scan_nvpair_test		\
-		 pcmk__xe_attr_is_true_test 	\
-		 pcmk__xe_get_bool_attr_test 	\
-		 pcmk__xe_get_datetime_test	\
-		 pcmk__xe_get_flags_test	\
-		 pcmk__xe_set_bool_attr_test	\
 		 pcmk__unpack_nvpair_block_test	\
 		 pcmk_unpack_nvpair_blocks_test
 
 TESTS = $(check_PROGRAMS)
diff --git a/lib/common/tests/xml_element/Makefile.am b/lib/common/tests/xml_element/Makefile.am
index 70d005fca5..5ea8cbe012 100644
--- a/lib/common/tests/xml_element/Makefile.am
+++ b/lib/common/tests/xml_element/Makefile.am
@@ -1,25 +1,30 @@
 #
-# Copyright 2024 the Pacemaker project contributors
+# Copyright 2024-2025 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/common.mk
 include $(top_srcdir)/mk/tap.mk
 include $(top_srcdir)/mk/unittest.mk
 
 # Add "_test" to the end of all test program names to simplify .gitignore
 check_PROGRAMS = \
+		 pcmk__xe_attr_is_true_test 	\
 		 pcmk__xe_copy_attrs_test	\
 		 pcmk__xe_first_child_test	\
 		 pcmk__xe_foreach_child_test 	\
+		 pcmk__xe_get_bool_attr_test 	\
+		 pcmk__xe_get_datetime_test	\
+		 pcmk__xe_get_flags_test	\
 		 pcmk__xe_get_score_test	\
 		 pcmk__xe_next_test		\
+		 pcmk__xe_set_bool_attr_test	\
 		 pcmk__xe_set_id_test		\
 		 pcmk__xe_set_score_test	\
 		 pcmk__xe_sort_attrs_test
 
 TESTS = $(check_PROGRAMS)
diff --git a/lib/common/tests/nvpair/pcmk__xe_attr_is_true_test.c b/lib/common/tests/xml_element/pcmk__xe_attr_is_true_test.c
similarity index 100%
rename from lib/common/tests/nvpair/pcmk__xe_attr_is_true_test.c
rename to lib/common/tests/xml_element/pcmk__xe_attr_is_true_test.c
diff --git a/lib/common/tests/nvpair/pcmk__xe_get_bool_attr_test.c b/lib/common/tests/xml_element/pcmk__xe_get_bool_attr_test.c
similarity index 100%
rename from lib/common/tests/nvpair/pcmk__xe_get_bool_attr_test.c
rename to lib/common/tests/xml_element/pcmk__xe_get_bool_attr_test.c
diff --git a/lib/common/tests/nvpair/pcmk__xe_get_datetime_test.c b/lib/common/tests/xml_element/pcmk__xe_get_datetime_test.c
similarity index 100%
rename from lib/common/tests/nvpair/pcmk__xe_get_datetime_test.c
rename to lib/common/tests/xml_element/pcmk__xe_get_datetime_test.c
diff --git a/lib/common/tests/nvpair/pcmk__xe_get_flags_test.c b/lib/common/tests/xml_element/pcmk__xe_get_flags_test.c
similarity index 100%
rename from lib/common/tests/nvpair/pcmk__xe_get_flags_test.c
rename to lib/common/tests/xml_element/pcmk__xe_get_flags_test.c
diff --git a/lib/common/tests/nvpair/pcmk__xe_set_bool_attr_test.c b/lib/common/tests/xml_element/pcmk__xe_set_bool_attr_test.c
similarity index 100%
rename from lib/common/tests/nvpair/pcmk__xe_set_bool_attr_test.c
rename to lib/common/tests/xml_element/pcmk__xe_set_bool_attr_test.c