diff --git a/test/Makefile.am b/test/Makefile.am
index 1a94d0d..b58ac66 100755
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -28,15 +28,18 @@
 	-lcrypto
 
 utest_SOURCES = \
+	../activation.cpp \
+	../version.cpp \
+	../item_updater.cpp \
+	../org/openbmc/Associations/server.cpp \
+	../image_verify.cpp \
+	../msl_verify.cpp \
+	../ubi/activation_ubi.cpp \
+	../ubi/item_updater_ubi.cpp \
+	../ubi/serialize.cpp \
+	../ubi/watch.cpp \
 	utest.cpp \
 	msl_verify.cpp
+
 utest_LDADD = \
-	$(top_builddir)/openpower_update_manager-activation.o \
-	$(top_builddir)/openpower_update_manager-version.o \
-	$(top_builddir)/ubi/openpower_update_manager-serialize.o \
-	$(top_builddir)/ubi/openpower_update_manager-watch.o \
-	$(top_builddir)/openpower_update_manager-item_updater.o \
-	$(top_builddir)/org/openbmc/Associations/openpower_update_manager-server.o \
-	$(top_builddir)/image_verify.cpp \
-	$(top_builddir)/msl_verify.cpp \
 	-lstdc++fs