diff --git a/meson.build b/meson.build
index d44ef75..bc697ff 100644
--- a/meson.build
+++ b/meson.build
@@ -88,5 +88,7 @@
 subdir('power-supply')
 subdir('phosphor-power-supply')
 subdir('tools/power-utils')
-subdir('test')
+if get_option('tests').enabled()
+    subdir('test')
+endif
 subdir('cold-redundancy')
diff --git a/power-supply/meson.build b/power-supply/meson.build
index f58e02f..0273181 100644
--- a/power-supply/meson.build
+++ b/power-supply/meson.build
@@ -19,4 +19,6 @@
 
 record_manager = psu_monitor.extract_objects('record_manager.cpp')
 
-subdir('test')
+if get_option('tests').enabled()
+    subdir('test')
+endif
diff --git a/tools/i2c/meson.build b/tools/i2c/meson.build
index 424a197..76261b3 100644
--- a/tools/i2c/meson.build
+++ b/tools/i2c/meson.build
@@ -10,4 +10,6 @@
     include_directories : libi2c_inc,
     link_args : '-li2c')
 
-subdir('test')
+if get_option('tests').enabled()
+    subdir('test')
+endif
diff --git a/tools/power-utils/meson.build b/tools/power-utils/meson.build
index 142683b..848c42f 100644
--- a/tools/power-utils/meson.build
+++ b/tools/power-utils/meson.build
@@ -15,4 +15,6 @@
     ]
 )
 
-subdir('test')
+if get_option('tests').enabled()
+    subdir('test')
+endif