diff --git a/test/openpower-pels/Makefile.include b/test/openpower-pels/Makefile.include
index ee7f99f..b4c6a01 100644
--- a/test/openpower-pels/Makefile.include
+++ b/test/openpower-pels/Makefile.include
@@ -252,6 +252,7 @@
 fru_identity_test_CXXFLAGS = $(test_cxxflags)
 fru_identity_test_LDADD = \
 	$(test_ldadd) \
+	$(FMT_LIBS) \
 	$(top_builddir)/extensions/openpower-pels/fru_identity.o \
 	$(top_builddir)/extensions/openpower-pels/pel_values.o
 fru_identity_test_LDFLAGS = $(test_ldflags)
@@ -280,6 +281,7 @@
 src_callout_test_LDADD = \
 	$(test_ldadd) \
 	$(pel_test_utils_ldadd) \
+	$(FMT_LIBS) \
 	$(top_builddir)/extensions/openpower-pels/callout.o \
 	$(top_builddir)/extensions/openpower-pels/fru_identity.o \
 	$(top_builddir)/extensions/openpower-pels/mru.o \
@@ -295,6 +297,7 @@
 src_callouts_test_LDADD = \
 	$(test_ldadd) \
 	$(pel_test_utils_ldadd) \
+	$(FMT_LIBS) \
 	$(top_builddir)/extensions/openpower-pels/callout.o \
 	$(top_builddir)/extensions/openpower-pels/callouts.o \
 	$(top_builddir)/extensions/openpower-pels/fru_identity.o \
@@ -311,18 +314,7 @@
 src_test_LDADD = \
 	$(test_ldadd) \
 	$(pel_test_utils_ldadd) \
-	$(top_builddir)/extensions/openpower-pels/ascii_string.o \
-	$(top_builddir)/extensions/openpower-pels/callout.o \
-	$(top_builddir)/extensions/openpower-pels/callouts.o \
-	$(top_builddir)/extensions/openpower-pels/device_callouts.o \
-	$(top_builddir)/extensions/openpower-pels/fru_identity.o \
-	$(top_builddir)/extensions/openpower-pels/json_utils.o \
-	$(top_builddir)/extensions/openpower-pels/mru.o \
-	$(top_builddir)/extensions/openpower-pels/mtms.o \
-	$(top_builddir)/extensions/openpower-pels/pce_identity.o \
-	$(top_builddir)/extensions/openpower-pels/pel_values.o \
-	$(top_builddir)/extensions/openpower-pels/registry.o \
-	$(top_builddir)/extensions/openpower-pels/src.o
+	$(pel_objects)
 src_test_LDFLAGS = $(test_ldflags)
 
 extended_user_header_test_SOURCES = \
@@ -332,20 +324,7 @@
 extended_user_header_test_LDADD = \
 	$(test_ldadd) \
 	$(pel_test_utils_ldadd) \
-	$(top_builddir)/extensions/openpower-pels/ascii_string.o \
-	$(top_builddir)/extensions/openpower-pels/callout.o \
-	$(top_builddir)/extensions/openpower-pels/callouts.o \
-	$(top_builddir)/extensions/openpower-pels/device_callouts.o \
-	$(top_builddir)/extensions/openpower-pels/data_interface.o \
-	$(top_builddir)/extensions/openpower-pels/extended_user_header.o \
-	$(top_builddir)/extensions/openpower-pels/fru_identity.o \
-	$(top_builddir)/extensions/openpower-pels/json_utils.o \
-	$(top_builddir)/extensions/openpower-pels/mru.o \
-	$(top_builddir)/extensions/openpower-pels/mtms.o \
-	$(top_builddir)/extensions/openpower-pels/pel_values.o \
-	$(top_builddir)/extensions/openpower-pels/pce_identity.o \
-	$(top_builddir)/extensions/openpower-pels/registry.o \
-	$(top_builddir)/extensions/openpower-pels/src.o
+	$(pel_objects)
 extended_user_header_test_LDFLAGS = $(test_ldflags)
 
 pel_rules_test_SOURCES = %reldir%/pel_rules_test.cpp