diff --git a/tests/meson.build b/tests/meson.build
index 04dd4dc..27103ef 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -30,27 +30,15 @@
 # The 'test' transport APIs will never be marked stable as they are just for
 # testing.
 if get_option('abi').contains('testing')
-  tests += [
-    'transport',
-    'transport/send_recv_one',
-    'transport/send_recv_timeout',
-    'transport/send_recv_unwanted',
-    'transport/send_recv_wrong_command_code',
-    'transport/send_recv_wrong_pldm_type',
-  ]
+  subdir('transport')
 endif
 
 if get_option('oem-ibm').allowed()
-  tests += [
-    'oem/ibm/libpldm_fileio_test',
-    'oem/ibm/libpldm_host_test',
-  ]
+  subdir('oem/ibm')
 endif
 
 if get_option('oem-meta').allowed()
-  tests += [
-    'oem/meta/libpldm_fileio_test',
-  ]
+  subdir('oem/meta')
 endif
 
 test_include_dirs = [ libpldm_include_dir, include_directories('../src') ]
diff --git a/tests/oem/ibm/meson.build b/tests/oem/ibm/meson.build
new file mode 100644
index 0000000..94c2011
--- /dev/null
+++ b/tests/oem/ibm/meson.build
@@ -0,0 +1,4 @@
+tests += [
+  'oem/ibm/libpldm_fileio_test',
+  'oem/ibm/libpldm_host_test',
+]
diff --git a/tests/oem/meta/meson.build b/tests/oem/meta/meson.build
new file mode 100644
index 0000000..16cc794
--- /dev/null
+++ b/tests/oem/meta/meson.build
@@ -0,0 +1,3 @@
+tests += [
+  'oem/meta/libpldm_fileio_test',
+]
diff --git a/tests/transport/meson.build b/tests/transport/meson.build
new file mode 100644
index 0000000..d4c27ee
--- /dev/null
+++ b/tests/transport/meson.build
@@ -0,0 +1,8 @@
+tests += [
+  'transport/transport',
+  'transport/send_recv_one',
+  'transport/send_recv_timeout',
+  'transport/send_recv_unwanted',
+  'transport/send_recv_wrong_command_code',
+  'transport/send_recv_wrong_pldm_type',
+]
diff --git a/tests/transport.cpp b/tests/transport/transport.cpp
similarity index 100%
rename from tests/transport.cpp
rename to tests/transport/transport.cpp