diff --git a/test/Makefile.am b/test/Makefile.am
index ff34005..74760fe 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -4,11 +4,32 @@
 # Run all 'check' test programs
 TESTS = $(check_PROGRAMS)
 
-# # Build/add utest to test suite
+# Build/add utest to test suite
 check_PROGRAMS = utest
-utest_CPPFLAGS = -Igtest $(GTEST_CPPFLAGS) $(AM_CPPFLAGS) $(PHOSPHOR_LOGGING_CFLAGS) $(LIBEVDEV_CFLAGS)
-utest_CXXFLAGS = $(PTHREAD_CFLAGS) $(LIBEVDEV_CFLAGS) $(PHOSPHOR_DBUS_INTERFACES_CFLAGS)
-utest_LDFLAGS = -lgtest_main -lgtest $(PTHREAD_LIBS) $(OESDK_TESTCASE_FLAGS) $(SYSTEMD_LIBS) $(PHOSPHOR_LOGGING_LIBS) \
-$(LIBEVDEV_LIBS) $(PHOSPHOR_DBUS_INTERFACES_LIBS)
+
+utest_CPPFLAGS = \
+	-Igtest \
+	$(GTEST_CPPFLAGS) \
+	$(AM_CPPFLAGS) \
+	$(PHOSPHOR_LOGGING_CFLAGS) \
+	$(LIBEVDEV_CFLAGS)
+
+utest_CXXFLAGS = \
+	$(PTHREAD_CFLAGS) \
+	$(LIBEVDEV_CFLAGS) \
+	$(PHOSPHOR_DBUS_INTERFACES_CFLAGS)
+
+utest_LDFLAGS = \
+	-lgtest_main -lgtest \
+	$(PTHREAD_LIBS) \
+	$(OESDK_TESTCASE_FLAGS) \
+	$(SYSTEMD_LIBS) \
+	$(PHOSPHOR_LOGGING_LIBS) \
+	$(LIBEVDEV_LIBS) \
+	$(PHOSPHOR_DBUS_INTERFACES_LIBS)
+
 utest_SOURCES = utest.cpp
-utest_LDADD = $(top_builddir)/monitor.o $(top_srcdir)/evdev.cpp
+
+utest_LDADD = \
+	$(top_builddir)/monitor.o \
+	$(top_srcdir)/evdev.cpp