diff --git a/test/Makefile.am b/test/Makefile.am
index bb1d048..96764e5 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -4,7 +4,7 @@
 TESTS = $(check_PROGRAMS)
 
 # Build/add utest to test suite
-check_PROGRAMS = watchdog_test
+check_PROGRAMS = watchdog
 
 utestCPPFLAGS = $(GTEST_MAIN_CFLAGS) \
                 $(AM_CPPFLAGS) \
@@ -23,8 +23,8 @@
                $(PHOSPHOR_LOGGING_LIBS) \
                $(PHOSPHOR_DBUS_INTERFACES_LIBS)
 
-watchdog_test_CPPFLAGS = ${utestCPPFLAGS}
-watchdog_test_CXXFLAGS = ${utestCXXFLAGS}
-watchdog_test_LDFLAGS = ${utestLDFLAGS}
+watchdog_CPPFLAGS = ${utestCPPFLAGS}
+watchdog_CXXFLAGS = ${utestCXXFLAGS}
+watchdog_LDFLAGS = ${utestLDFLAGS}
 
-watchdog_test_SOURCES = ../watchdog.cpp watchdog_test.cpp
+watchdog_SOURCES = ../watchdog.cpp watchdog.cpp
diff --git a/test/watchdog_test.cpp b/test/watchdog.cpp
similarity index 99%
rename from test/watchdog_test.cpp
rename to test/watchdog.cpp
index 06b43b8..66cca7e 100644
--- a/test/watchdog_test.cpp
+++ b/test/watchdog.cpp
@@ -1,4 +1,4 @@
-#include "watchdog_test.hpp"
+#include "watchdog.hpp"
 
 #include <memory>
 #include <thread>
diff --git a/test/watchdog_test.hpp b/test/watchdog.hpp
similarity index 97%
rename from test/watchdog_test.hpp
rename to test/watchdog.hpp
index 4c798a7..09aceed 100644
--- a/test/watchdog_test.hpp
+++ b/test/watchdog.hpp
@@ -1,8 +1,9 @@
+#include "../watchdog.hpp"
+
 #include <chrono>
 #include <memory>
 #include <sdbusplus/bus.hpp>
 #include <sdeventplus/event.hpp>
-#include <watchdog.hpp>
 
 #include <gtest/gtest.h>