diff --git a/.ci/travis/code_layout/script.sh b/.ci/travis/code_layout/script.sh
index 1c5a2198217..c04aae36d18 100755
--- a/.ci/travis/code_layout/script.sh
+++ b/.ci/travis/code_layout/script.sh
@@ -15,5 +15,6 @@
 set -e
 
 pushd build
-xvfb-run ctest -V --output-on-failure
+export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k"
+python ${TRAVIS_BUILD_DIR}/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V --output-on-failure -S ${TRAVIS_BUILD_DIR}/.ci/travis/travis.ctest
 popd
diff --git a/.travis.yml b/.travis.yml
index 3ae53a7b701..fa981a9c1d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,6 +50,7 @@ matrix:
         apt:
           sources:
             - sourceline: 'ppa:jonathonf/backports'  # silversearcher-ag backport
+            - sourceline: 'ppa:sergey-dryabzhinsky/packages' # doxygen
           packages:
             - doxygen
             - graphviz
diff --git a/cmake_templates/Doxyfile.in b/cmake_templates/Doxyfile.in
index 2b88c205119..7135b6cf4da 100644
--- a/cmake_templates/Doxyfile.in
+++ b/cmake_templates/Doxyfile.in
@@ -303,15 +303,6 @@ EXTENSION_MAPPING      =
 
 MARKDOWN_SUPPORT       = YES
 
-# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
-# to that level are automatically included in the table of contents, even if
-# they do not have an id attribute.
-# Note: This feature currently applies only to Markdown headings.
-# Minimum value: 0, maximum value: 99, default value: 0.
-# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
-
-TOC_INCLUDE_HEADINGS   = 0
-
 # When enabled doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
 # be prevented in individual cases by putting a % sign in front of the word or
@@ -2388,11 +2379,6 @@ DIAFILE_DIRS           =
 
 PLANTUML_JAR_PATH      =
 
-# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
-# configuration file for plantuml.
-
-PLANTUML_CFG_FILE      =
-
 # When using plantuml, the specified paths are searched for files specified by
 # the !include statement in a plantuml block.