diff --git a/bmc/firmware-handler/meson.build b/bmc/firmware-handler/meson.build
index 14624d8..2d935a3 100644
--- a/bmc/firmware-handler/meson.build
+++ b/bmc/firmware-handler/meson.build
@@ -64,17 +64,17 @@
   'lpc_handler.cpp']
 
 if (get_option('lpc-type') == 'aspeed-lpc' or
-    not get_option('tests').disabled())
+    get_option('tests').allowed())
   firmware_source += 'lpc_aspeed.cpp'
 endif
 
 if (get_option('lpc-type') == 'nuvoton-lpc' or
-    not get_option('tests').disabled())
+    get_option('tests').allowed())
   firmware_source += 'lpc_nuvoton.cpp'
 endif
 
 if (get_option('p2a-type') == 'aspeed-p2a' or
-    not get_option('tests').disabled())
+    get_option('tests').allowed())
   firmware_source += 'pci_handler.cpp'
 endif
 
@@ -121,6 +121,6 @@
   install: true,
   install_dir: get_option('libdir') / 'blob-ipmid')
 
-if not get_option('tests').disabled()
+if get_option('tests').allowed()
   subdir('test')
 endif
diff --git a/bmc/log-handler/meson.build b/bmc/log-handler/meson.build
index 50c4bed..5fad0cf 100644
--- a/bmc/log-handler/meson.build
+++ b/bmc/log-handler/meson.build
@@ -30,6 +30,6 @@
   install: true,
   install_dir: get_option('libdir') / 'blob-ipmid')
 
-if not get_option('tests').disabled()
+if get_option('tests').allowed()
   subdir('test')
 endif
\ No newline at end of file
diff --git a/bmc/meson.build b/bmc/meson.build
index 40ca2b3..7a5ebad 100644
--- a/bmc/meson.build
+++ b/bmc/meson.build
@@ -18,7 +18,7 @@
   link_with: common_lib,
   dependencies: common_pre)
 
-if not get_option('tests').disabled()
+if get_option('tests').allowed()
   subdir('test')
 endif
 
diff --git a/bmc/version-handler/meson.build b/bmc/version-handler/meson.build
index f5b4694..6059dd4 100644
--- a/bmc/version-handler/meson.build
+++ b/bmc/version-handler/meson.build
@@ -30,6 +30,6 @@
   install: true,
   install_dir: get_option('libdir') / 'blob-ipmid')
 
-if not get_option('tests').disabled()
+if get_option('tests').allowed()
   subdir('test')
 endif
\ No newline at end of file
diff --git a/cleanup/meson.build b/cleanup/meson.build
index e550064..0e8f031 100644
--- a/cleanup/meson.build
+++ b/cleanup/meson.build
@@ -25,6 +25,6 @@
   install: true,
   install_dir: get_option('libdir') / 'blob-ipmid')
 
-if not get_option('tests').disabled()
+if get_option('tests').allowed()
   subdir('test')
 endif
diff --git a/meson.build b/meson.build
index 83a1f4f..0cc7021 100644
--- a/meson.build
+++ b/meson.build
@@ -36,7 +36,7 @@
   configuration: conf_data)
 
 # Setup for the test config
-if not get_option('tests').disabled()
+if get_option('tests').allowed()
   add_project_arguments('-DENABLE_STATIC_LAYOUT', language: 'cpp')
   add_project_arguments('-DENABLE_TARBALL_UBI', language: 'cpp')
   add_project_arguments('-DASPEED_P2A', language: 'cpp')
@@ -53,7 +53,7 @@
 
 # Enable LPC and PCI for tests only.
 assert(
-  not get_option('tests').disabled() \
+  get_option('tests').allowed() \
     or get_option('lpc-type') == 'none' \
     or get_option('p2a-type') == 'none',
   'Invalid configuration enabling both PCI and LPC.')
@@ -130,7 +130,7 @@
 blobs_dep = dependency('phosphor-ipmi-blobs')
 nlohmann_json_dep = dependency('nlohmann_json', include_type: 'system')
 
-if not get_option('tests').disabled()
+if get_option('tests').allowed()
   gtest = dependency('gtest', main: true, disabler: true, required: false)
   gmock = dependency('gmock', disabler: true, required: false)
   if not gtest.found() or not gmock.found()
@@ -151,14 +151,14 @@
 endif
 
 
-if not get_option('bmc-blob-handler').disabled()
+if get_option('bmc-blob-handler').allowed()
   subdir('bmc')
 endif
 
-if not get_option('host-tool').disabled()
+if get_option('host-tool').allowed()
   subdir('tools')
 endif
 
-if not get_option('cleanup-delete').disabled()
+if get_option('cleanup-delete').allowed()
   subdir('cleanup')
 endif
diff --git a/tools/meson.build b/tools/meson.build
index 29fd3b4..eda5e19 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -38,6 +38,6 @@
   install: true,
   install_dir: get_option('bindir'))
 
-if not get_option('tests').disabled()
+if get_option('tests').allowed()
   subdir('test')
 endif