diff --git a/src/nvidia-gpu/meson.build b/src/nvidia-gpu/meson.build
index 9359b2b..dbd5b27 100644
--- a/src/nvidia-gpu/meson.build
+++ b/src/nvidia-gpu/meson.build
@@ -7,7 +7,6 @@
     'NvidiaGpuMctpVdm.cpp',
     'NvidiaGpuPowerSensor.cpp',
     'NvidiaGpuSensor.cpp',
-    'NvidiaGpuSensorMain.cpp',
     'NvidiaGpuThresholds.cpp',
     'NvidiaGpuVoltageSensor.cpp',
     'NvidiaSmaDevice.cpp',
@@ -19,7 +18,7 @@
 
 executable(
     'nvidiagpusensor',
-    gpusensor_sources,
+    gpusensor_sources + files('NvidiaGpuSensorMain.cpp'),
     implicit_include_directories: false,
     include_directories: [gpusensor_include_dir, sensor_include_dir],
     dependencies: [thresholds_dep, utils_dep],
@@ -27,6 +26,3 @@
     install_dir: '/usr/libexec/dbus-sensors',
 )
 
-if get_option('tests').enabled()
-    subdir('tests')
-endif
diff --git a/src/nvidia-gpu/tests/meson.build b/src/nvidia-gpu/tests/meson.build
deleted file mode 100644
index 99ed721..0000000
--- a/src/nvidia-gpu/tests/meson.build
+++ /dev/null
@@ -1,30 +0,0 @@
-gtest_dep = dependency('gtest', main: true, disabler: true, required: false)
-gmock_dep = dependency('gmock', disabler: true, required: false)
-if not gtest_dep.found() or not gmock_dep.found()
-    gtest_proj = import('cmake').subproject('googletest', required: true)
-    gtest_dep = declare_dependency(
-        dependencies: [
-            dependency('threads'),
-            gtest_proj.dependency('gtest'),
-            gtest_proj.dependency('gtest_main'),
-        ],
-    )
-    gmock_dep = gtest_proj.dependency('gmock')
-endif
-
-gpusensor_test_include_dirs = [gpusensor_include_dir]
-
-test(
-    'nvidiagpusensor_test',
-    executable(
-        'nvidiagpusensor_test',
-        'NvidiaGpuSensorTest.cpp',
-        'NvidiaDeviceInventoryMctpVdm.cpp',
-        '../OcpMctpVdm.cpp',
-        '../NvidiaGpuMctpVdm.cpp',
-        implicit_include_directories: false,
-        include_directories: gpusensor_test_include_dirs,
-        dependencies: [gtest_dep, gmock_dep],
-    ),
-    workdir: meson.current_source_dir(),
-)
diff --git a/src/tests/meson.build b/src/tests/meson.build
index 8fc3477..0cf8b45 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -75,3 +75,17 @@
         include_directories: '../mctp',
     ),
 )
+
+test(
+    'NvidiaGPU',
+    executable(
+        'test_NvidiaGPU',
+        'test_NvidiaGpuSensorTest.cpp',
+        'test_NvidiaDeviceInventoryMctpVdm.cpp',
+        gpusensor_sources,
+        dependencies: [gmock_dep, ut_deps_list, utils_dep],
+        link_with: [thresholds_a],
+        implicit_include_directories: false,
+        include_directories: '../nvidia-gpu',
+    ),
+)
diff --git a/src/nvidia-gpu/tests/NvidiaDeviceInventoryMctpVdm.cpp b/src/tests/test_NvidiaDeviceInventoryMctpVdm.cpp
similarity index 100%
rename from src/nvidia-gpu/tests/NvidiaDeviceInventoryMctpVdm.cpp
rename to src/tests/test_NvidiaDeviceInventoryMctpVdm.cpp
diff --git a/src/nvidia-gpu/tests/NvidiaGpuSensorTest.cpp b/src/tests/test_NvidiaGpuSensorTest.cpp
similarity index 100%
rename from src/nvidia-gpu/tests/NvidiaGpuSensorTest.cpp
rename to src/tests/test_NvidiaGpuSensorTest.cpp