diff --git a/meson.build b/meson.build
index fa054c5..4936a76 100644
--- a/meson.build
+++ b/meson.build
@@ -24,6 +24,10 @@
 library_is_share = get_option('default_library') == 'shared'
 add_project_arguments('-D_POSIX_C_SOURCE=200809L', language: 'c')
 
+if get_option('output-all-properties').enabled()
+    add_project_arguments('-DOUTPUT_ALL_PROPERTIES', language: ['c', 'cpp'])
+endif
+
 project_description = 'libcper library'
 
 section_sources = files(
@@ -158,6 +162,10 @@
     )
 endif
 
-if get_option('tests').allowed()
-    subdir('tests')
+# Disable unit tests when output-all-properties is enabled
+# because it changes CPER-IR output format.
+if get_option('output-all-properties').disabled()
+    if get_option('tests').allowed()
+        subdir('tests')
+    endif
 endif