diff --git a/meson.build b/meson.build
index 972ff85..ad23680 100644
--- a/meson.build
+++ b/meson.build
@@ -143,6 +143,33 @@
 
 subdir('service_files')
 subdir('src')
+
 if not build_tests.disabled()
-  subdir('test')
+    gtest = dependency('gtest', main: true, disabler: true, required: false)
+    if not gtest.found() and build_tests.enabled()
+        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])
+    endif
+
+    test(
+        'test_entity_manager',
+        executable(
+            'test_entity_manager',
+            'test/test_entity-manager.cpp',
+            'src/Utils.cpp',
+            cpp_args: boost_args + ['-DBOOST_ASIO_DISABLE_THREADS'],
+            dependencies: [
+                boost,
+                gtest,
+                nlohmann_json,
+                sdbusplus,
+                valijson,
+            ],
+            implicit_include_directories: false,
+            include_directories: 'include',
+        )
+    )
 endif
diff --git a/test/meson.build b/test/meson.build
deleted file mode 100644
index 06b293f..0000000
--- a/test/meson.build
+++ /dev/null
@@ -1,27 +0,0 @@
-gtest = dependency('gtest', main: true, disabler: true, required: false)
-if not gtest.found() and build_tests.enabled()
-    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])
-endif
-
-test(
-    'test_entity_manager',
-    executable(
-        'test_entity_manager',
-        'test_entity-manager.cpp',
-        '../src/Utils.cpp',
-        cpp_args: boost_args + ['-DBOOST_ASIO_DISABLE_THREADS'],
-        dependencies: [
-            boost,
-            gtest,
-            nlohmann_json,
-            sdbusplus,
-            valijson,
-        ],
-        implicit_include_directories: false,
-        include_directories: '../include',
-    )
-)