diff --git a/test/common/meson.build b/test/common/meson.build
index f808149..fa29507 100644
--- a/test/common/meson.build
+++ b/test/common/meson.build
@@ -1 +1,34 @@
 subdir('pldm')
+subdir('nopdevice')
+subdir('device')
+subdir('software')
+
+testcases = [
+  'test_device_config',
+  'test_software_update',
+]
+
+foreach t : testcases
+  test(
+    t,
+    executable(
+      t,
+      f'@t@.cpp',
+      include_directories: [
+        common_include,
+      ],
+      dependencies: [
+        libpldm_dep,
+        sdbusplus_dep,
+        phosphor_logging_dep,
+        gtest_main,
+      ],
+      link_with: [
+        libpldmutil,
+        libpldmcreatepkg,
+        software_common_lib,
+        libnopdevice,
+      ]
+    )
+  )
+endforeach