diff --git a/meson.build b/meson.build
index cc7f470bffb906500028cd6d9e628daf132f7f72..9af86989cd01e57c6ee75c47b50cb1d03c68babc 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project(
   version : '0.1',
   default_options : [
     'warning_level=1',
-    'cpp_std=c++2a'
+    'cpp_std=c++17'
   ]
 )
 
diff --git a/src/csg/meson.build b/src/csg/meson.build
index d3461767718bf03f955a4c4280740ae96e75b52a..e84bb74e85b7da044476f050db1956fd4972eaf6 100644
--- a/src/csg/meson.build
+++ b/src/csg/meson.build
@@ -11,6 +11,4 @@ lib_csg_parser = static_library('csg-parser',
   dependencies: [pegtl, cgal],
   install : true)
 
-if get_option('cpp_std')=='c++2a'
-  subdir('tests')
-endif
+subdir('tests')