diff --git a/src/hooks/dhcp/lease_cmds/libloadtests/meson.build b/src/hooks/dhcp/lease_cmds/libloadtests/meson.build
index 07639aff66..9c305a98b8 100644
--- a/src/hooks/dhcp/lease_cmds/libloadtests/meson.build
+++ b/src/hooks/dhcp/lease_cmds/libloadtests/meson.build
@@ -4,6 +4,9 @@ endif
 
 dhcp_lease_cmds_libload_tests = executable(
     'dhcp-lease-cmds-libload-tests',
+    'lease_cmds4_unittest.cc',
+    'lease_cmds6_unittest.cc',
+    'lease_cmds_unittest.cc',
     'load_unload_unittests.cc',
     'run_unittests.cc',
     cpp_args: [
diff --git a/src/hooks/dhcp/lease_cmds/meson.build b/src/hooks/dhcp/lease_cmds/meson.build
index 994953482e..311f4b9bfc 100644
--- a/src/hooks/dhcp/lease_cmds/meson.build
+++ b/src/hooks/dhcp/lease_cmds/meson.build
@@ -1,5 +1,6 @@
 dhcp_lease_cmds_lib = shared_library(
     'dhcp_lease_cmds',
+    'binding_variables.cc',
     'lease_cmds.cc',
     'lease_cmds_callouts.cc',
     'lease_cmds_log.cc',
diff --git a/src/hooks/dhcp/lease_cmds/tests/meson.build b/src/hooks/dhcp/lease_cmds/tests/meson.build
index 14a30efde8..f36103388c 100644
--- a/src/hooks/dhcp/lease_cmds/tests/meson.build
+++ b/src/hooks/dhcp/lease_cmds/tests/meson.build
@@ -4,13 +4,10 @@ endif
 
 dhcp_lease_cmds_lib_tests = executable(
     'dhcp-lease-cmds-lib-tests',
-    'lease_cmds4_unittest.cc',
-    'lease_cmds6_unittest.cc',
-    'lease_cmds_unittest.cc',
+    'binding_variables_unittest.cc',
+    'lease_cmds_func4_unittest.cc',
+    'lease_cmds_func6_unittest.cc',
     'run_unittests.cc',
-    cpp_args: [
-        f'-DLEASE_CMDS_LIB_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/lease_cmds/libdhcp_lease_cmds.so"',
-    ],
     dependencies: [gtest, crypto],
     include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: [dhcp_lease_cmds_archive] + LIBS_BUILT_SO_FAR,