diff --git a/meson.build b/meson.build
index 1308c6f1e..5bb67936a 100644
--- a/meson.build
+++ b/meson.build
@@ -67,12 +67,13 @@ test_env = [
     'NETPLAN_GENERATE_PATH=' + join_paths(meson.current_build_dir(), 'src', 'generate'),
     'NETPLAN_DBUS_CMD=' + join_paths(meson.current_build_dir(), 'dbus', 'netplan-dbus'),
 ]
+#FIXME: exclude doc/env/
 test('linting',
      pyflakes,
      args: [meson.current_source_dir()])
 test('codestyle',
      pycodestyle,
-     args: ['--max-line-length=130', meson.current_source_dir()])
+     args: ['--max-line-length=130', '--exclude=doc/env', meson.current_source_dir()])
 test('documentation',
      find_program('tests/validate_docs.sh'),
      workdir: meson.current_source_dir())
diff --git a/tests/validate_docs.sh b/tests/validate_docs.sh
index 3f2afa17d..81cef67fb 100755
--- a/tests/validate_docs.sh
+++ b/tests/validate_docs.sh
@@ -6,7 +6,7 @@
 # sanity check: make sure none have disappeared, as might happen from a reformat.
 count=$(sed -n 's/[ ]\+{"\([a-z0-9-]\+\)", YAML_[A-Z]\+_NODE.*/\1/p' src/parse.c | sort | wc -l)
 # 144 is based on 0.99+da6f776 definitions, and should be updated periodically.
-if [ $count -lt 144 ]; then
+if [ $count -lt 202 ]; then
     echo "ERROR: fewer YAML keys defined in src/parse.c than expected!"
     echo "       Has the file been reformatted or refactored? If so, modify"
     echo "       validate_docs.sh appropriately."
@@ -16,13 +16,13 @@ fi
 # iterate through the keys
 for term in $(sed -n 's/[ ]\+{"\([a-z0-9-]\+\)", YAML_[A-Z]\+_NODE.*/\1/p' src/parse.c | sort | uniq); do
     # it can be documented in the following ways.
-    # 1. "Properties for device type ``blah:``
-    if egrep "## Properties for device type \`\`$term:\`\`" doc/netplan-yaml.md > /dev/null; then
+    # 1. "Properties for device type `blah:`
+    if egrep "## Properties for device type \`$term:\`" doc/netplan-yaml.md > /dev/null; then
         continue
     fi
 
-    # 2. "[blah, ]``blah``[, ``blah2``]: (scalar|bool|...)
-    if egrep "\`\`$term\`\`.*\((scalar|bool|mapping|sequence of scalars|sequence of mappings|sequence of sequence of scalars)" doc/netplan-yaml.md > /dev/null; then
+    # 2. "[blah, ]**blah**[, **blah2**]: (scalar|bool|...)
+    if egrep "\*\*$term\*\*.*\((scalar|bool|mapping|sequence of scalars|sequence of mappings|sequence of sequence of scalars)" doc/netplan-yaml.md > /dev/null; then
         continue
     fi