diff --git a/meson.build b/meson.build
index 4d46d8a..230eaac 100644
--- a/meson.build
+++ b/meson.build
@@ -1,10 +1,16 @@
-project('openav_luppp', ['c','cpp'])
+project( 'openav_luppp', ['c','cpp'],
+  default_options : [
+    'cpp_std=c++11',
+    ])
 
 conf_data = configuration_data()
 conf_data.set('version', '1.1.1')
 
-#add_project_arguments('-std=c99', language : 'c')
-#add_project_arguments('-std=c++11', language : 'cpp')
+
+if(get_option('tests') == true)
+  add_project_arguments('-DBUILD_TESTS', language : 'cpp')
+endif
+
 add_project_arguments('-Wno-unused-variable', language : 'cpp')
 add_project_arguments('-Wno-reorder', language : 'cpp')
 add_project_arguments('-Wno-sign-compare', language : 'cpp')
diff --git a/meson_options.txt b/meson_options.txt
new file mode 100644
index 0000000..701b984
--- /dev/null
+++ b/meson_options.txt
@@ -0,0 +1 @@
+option('tests', type : 'boolean', value : true, description : 'Build tests')
diff --git a/src/meson.build b/src/meson.build
index 1af9470..7e02ce8 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -30,3 +30,7 @@ subdir('controller')
 subdir('observer')
 subdir('state')
 subdir('avtk')
+
+if(get_option('tests') == true)
+  subdir('tests')
+endif
diff --git a/src/tests/meson.build b/src/tests/meson.build
new file mode 100644
index 0000000..2a5604d
--- /dev/null
+++ b/src/tests/meson.build
@@ -0,0 +1,5 @@
+luppp_src += files(
+  'diskreadertest.cxx',
+  'diskwritertest.cxx',
+  'goptionstest.cxx',
+  'gridlogictests.cxx')