diff --git a/meson.build b/meson.build
index 295699f570417cf8abde2ee003ccf93f3f823318..d1fac6dad884b4b5cb193dac8792a6463641941f 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,6 @@
 project('cmp_tool', 'c',
   version : '0.09',
+  meson_version : '>= 0.50',
   license : 'GPL-2.0',
   default_options : ['warning_level=3', 'c_std=gnu99']
 )
diff --git a/test/cmp_tool/meson.build b/test/cmp_tool/meson.build
index b60e2cf5283685a13140008ac89a0c82502d9cb8..25b47e263479144384a513895d60ae47d007f077 100644
--- a/test/cmp_tool/meson.build
+++ b/test/cmp_tool/meson.build
@@ -1,4 +1,8 @@
 int_test_file = files('cmp_tool_integration_test.py')
 
 pytest = find_program('pytest', required : false)
-test('Integration Test', pytest, args : ['--color=yes', '-vvv', int_test_file])
+if pytest.found()
+  test('Integration Test', pytest, args : ['--color=yes', '-vvv', int_test_file])
+else
+  message('Pytest framework not found! Skipping integration tests.')
+endif
diff --git a/test/meson.build b/test/meson.build
index ea06655afd9ec23492e9601553d7835e58d038b9..c3a6afba8cc0cba9d93f01737f3a4aff8acbd516 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -20,7 +20,7 @@ if cppcheck.found()
     '--cppcheck-build-dir='+meson.current_build_dir(),
     '-I', 'include',
     '--std=c89',
-    '--addon=misra.py',
+    # '--addon=misra.py',
     '--bug-hunting',
     '--enable=all',
     '--inconclusive'
@@ -35,5 +35,7 @@ subdir('cmp_tool')
 cunit_dep = dependency('cunit', required : false)
 if cunit_dep.found()
   subdir('cmp_icu')
+else
+  message('C Unit Testing Framework not found! Skipping unit tests.')
 endif