diff --git a/meson.build b/meson.build
index 17671a3..9b00bf4 100644
--- a/meson.build
+++ b/meson.build
@@ -106,87 +106,5 @@
 subdir('src')
 
 if get_option('tests').allowed()
-    test_boost_args = boost_args + ['-DBOOST_ASIO_DISABLE_THREADS']
-    gtest = dependency('gtest', main: true, disabler: true, required: false)
-    gmock = dependency('gmock', disabler: true, required: false)
-    if not (gtest.found() and gmock.found())
-        cmake = import('cmake')
-        gtest_subproject = cmake.subproject('gtest')
-        cm_gtest = gtest_subproject.dependency('gtest')
-        cm_gtest_main = gtest_subproject.dependency('gtest_main')
-        gtest = declare_dependency(
-            dependencies: [cm_gtest, cm_gtest_main, threads],
-        )
-        gmock = gtest_subproject.dependency('gmock')
-
-    endif
-
-    test(
-        'test_entity_manager',
-        executable(
-            'test_entity_manager',
-            'test/test_entity-manager.cpp',
-            'src/entity_manager/expression.cpp',
-            'src/utils.cpp',
-            'src/entity_manager/utils.cpp',
-            cpp_args: test_boost_args,
-            dependencies: [
-                boost,
-                gtest,
-                nlohmann_json_dep,
-                phosphor_logging_dep,
-                sdbusplus,
-                valijson,
-            ],
-            include_directories: 'src',
-        ),
-    )
-
-    test(
-        'test_fru_utils',
-        executable(
-            'test_fru_utils',
-            'test/test_fru-utils.cpp',
-            'src/fru_device/fru_utils.cpp',
-            'src/fru_device/fru_reader.cpp',
-            cpp_args: test_boost_args,
-            dependencies: [boost, gtest, gmock, phosphor_logging_dep, sdbusplus],
-            include_directories: 'src',
-        ),
-    )
-
-    test(
-        'test_topology',
-        executable(
-            'test_topology',
-            'test/test_topology.cpp',
-            'src/entity_manager/topology.cpp',
-            cpp_args: test_boost_args,
-            dependencies: [
-                gtest,
-                gmock,
-                nlohmann_json_dep,
-                phosphor_logging_dep,
-            ],
-            include_directories: 'src',
-        ),
-    )
-
-    test(
-        'test_gpio_presence',
-        executable(
-            'test_gpio_presence',
-            'test/test_gpio_presence.cpp',
-            cpp_args: test_boost_args,
-            include_directories: ['src'],
-            dependencies: [
-                boost,
-                gtest,
-                gmock,
-                phosphor_logging_dep,
-                libgpio_dep,
-            ],
-            link_with: gpio_presence_lib,
-        ),
-    )
+    subdir('test')
 endif
diff --git a/test/meson.build b/test/meson.build
new file mode 100644
index 0000000..8acb384
--- /dev/null
+++ b/test/meson.build
@@ -0,0 +1,73 @@
+test_boost_args = boost_args + ['-DBOOST_ASIO_DISABLE_THREADS']
+gtest = dependency('gtest', main: true, disabler: true, required: false)
+gmock = dependency('gmock', disabler: true, required: false)
+
+if not (gtest.found() and gmock.found())
+    cmake = import('cmake')
+    gtest_subproject = cmake.subproject('gtest')
+    cm_gtest = gtest_subproject.dependency('gtest')
+    cm_gtest_main = gtest_subproject.dependency('gtest_main')
+    gtest = declare_dependency(dependencies: [cm_gtest, cm_gtest_main, threads])
+    gmock = gtest_subproject.dependency('gmock')
+
+endif
+
+test_include_dir = '../src'
+
+test(
+    'test_entity_manager',
+    executable(
+        'test_entity_manager',
+        'test_entity-manager.cpp',
+        '../src/entity_manager/expression.cpp',
+        '../src/utils.cpp',
+        '../src/entity_manager/utils.cpp',
+        cpp_args: test_boost_args,
+        dependencies: [
+            boost,
+            gtest,
+            nlohmann_json_dep,
+            phosphor_logging_dep,
+            sdbusplus,
+            valijson,
+        ],
+        include_directories: test_include_dir,
+    ),
+)
+
+test(
+    'test_fru_utils',
+    executable(
+        'test_fru_utils',
+        'test_fru-utils.cpp',
+        '../src/fru_device/fru_utils.cpp',
+        '../src/fru_device/fru_reader.cpp',
+        cpp_args: test_boost_args,
+        dependencies: [boost, gtest, gmock, phosphor_logging_dep, sdbusplus],
+        include_directories: test_include_dir,
+    ),
+)
+
+test(
+    'test_topology',
+    executable(
+        'test_topology',
+        'test_topology.cpp',
+        '../src/entity_manager/topology.cpp',
+        cpp_args: test_boost_args,
+        dependencies: [gtest, gmock, nlohmann_json_dep, phosphor_logging_dep],
+        include_directories: test_include_dir,
+    ),
+)
+
+test(
+    'test_gpio_presence',
+    executable(
+        'test_gpio_presence',
+        'test_gpio_presence.cpp',
+        cpp_args: test_boost_args,
+        include_directories: test_include_dir,
+        dependencies: [boost, gtest, gmock, phosphor_logging_dep, libgpio_dep],
+        link_with: gpio_presence_lib,
+    ),
+)