diff --git a/src/bin/dhcp6/tests/Makefile.am b/src/bin/dhcp6/tests/Makefile.am
index 801d6872bc2bbac06eb2eed4136b190a02554b30..f09eb3c18b2e84f941c8dfe1e624614aef4a4e66 100644
--- a/src/bin/dhcp6/tests/Makefile.am
+++ b/src/bin/dhcp6/tests/Makefile.am
@@ -92,12 +92,12 @@ if CONFIG_BACKEND_BUNDY
 # For Bundy backend, we only need to run the usual tests. There are no
 # Bundy-specific tests yet.
 dhcp6_unittests_SOURCES += ../bundy_controller.cc
-dhcp6_unittests_SOURCES += bundy_backend_unittest.cc
+dhcp6_unittests_SOURCES += bundy_controller_unittest.cc
 endif
 
 if CONFIG_BACKEND_JSON
 dhcp6_unittests_SOURCES += ../jsonfile_controller.cc
-dhcp6_unittests_SOURCES += jsonfile_backend_unittest.cc
+dhcp6_unittests_SOURCES += jsonfile_controller_unittest.cc
 endif
 
 nodist_dhcp6_unittests_SOURCES  = ../dhcp6_messages.h ../dhcp6_messages.cc
diff --git a/src/bin/dhcp6/tests/bundy_backend_unittest.cc b/src/bin/dhcp6/tests/bundy_controller_unittest.cc
similarity index 100%
rename from src/bin/dhcp6/tests/bundy_backend_unittest.cc
rename to src/bin/dhcp6/tests/bundy_controller_unittest.cc
diff --git a/src/bin/dhcp6/tests/jsonfile_backend_unittest.cc b/src/bin/dhcp6/tests/kea_controller_unittest.cc
similarity index 100%
rename from src/bin/dhcp6/tests/jsonfile_backend_unittest.cc
rename to src/bin/dhcp6/tests/kea_controller_unittest.cc