diff --git a/meson.build b/meson.build
index 4654803..bf70f29 100644
--- a/meson.build
+++ b/meson.build
@@ -134,8 +134,8 @@ if not meson.is_cross_build()
   if py.found() and swig.found()
     subdir('pylibfdt')
   endif
+endif
 
-  if get_option('tools')
-    subdir('tests')
-  endif
+if get_option('tests')
+  subdir('tests')
 endif
diff --git a/meson_options.txt b/meson_options.txt
index 82621c3..36f391a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -10,3 +10,5 @@ option('python', type: 'feature', value: 'auto',
        description: 'Build pylibfdt Python library')
 option('static-build', type: 'boolean', value: false,
        description: 'Build static binaries')
+option('tests', type: 'boolean', value: true,
+       description: 'Build tests')