diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c9e443813..8eb4e452bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,7 +124,9 @@ if(${TINT_BUILD_DOCS})
   find_package(Doxygen)
   if(DOXYGEN_FOUND)
     add_custom_target(tint-docs ALL
-        COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile
+        COMMAND ${CMAKE_COMMAND}
+          -E env "DOXYGEN_OUTPUT_DIRECTORY=${CMAKE_BINARY_DIR}/docs"
+          ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         COMMENT "Generating API documentation"
         VERBATIM)
diff --git a/Doxyfile b/Doxyfile
index f6fcbb84ef..028d0ef17b 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -58,7 +58,7 @@ PROJECT_LOGO           =
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = out/docs
+OUTPUT_DIRECTORY       = $(DOXYGEN_OUTPUT_DIRECTORY)
 
 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
diff --git a/kokoro/linux/docker.sh b/kokoro/linux/docker.sh
index 516518e370..37376b1b31 100755
--- a/kokoro/linux/docker.sh
+++ b/kokoro/linux/docker.sh
@@ -59,6 +59,8 @@ ORIGINAL_SRC_DIR="$(pwd)"
 . /bin/using.sh # Declare the bash `using` function for configuring toolchains.
 
 using depot_tools
+using go-1.14.4      # Speeds up ./tools/lint
+using doxygen-1.8.18
 
 status "Cloning to clean source directory"
 # We do this so that the docker script can be tested in a local development
@@ -72,6 +74,9 @@ status "Fetching dependencies"
 cp standalone.gclient .gclient
 with_retry gclient sync
 
+status "Linting"
+./tools/lint
+
 status "Configuring build system"
 if [ "$BUILD_SYSTEM" == "cmake" ]; then
     using cmake-3.17.2