diff --git a/test/Makefile.am b/test/Makefile.am
index 9afb25a..589e56d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -10,14 +10,14 @@
 
 # Run all 'check' test programs
 check_PROGRAMS = \
-	firmware_handler \
-	firmware_stat
+	firmware_handler_unittest \
+	firmware_stat_unittest
 
 TESTS = $(check_PROGRAMS)
 
-firmware_handler_SOURCES = firmware_handler_unittest.cpp
-firmware_handler_LDADD = $(top_builddir)/firmware_handler.o
+firmware_handler_unittest_SOURCES = firmware_handler_unittest.cpp
+firmware_handler_unittest_LDADD = $(top_builddir)/firmware_handler.o
 
-firmware_stat_SOURCES = firmware_stat_unittest.cpp
-firmware_stat_LDADD = $(top_builddir)/firmware_handler.o
+firmware_stat_unittest_SOURCES = firmware_stat_unittest.cpp
+firmware_stat_unittest_LDADD = $(top_builddir)/firmware_handler.o