diff --git a/.htmltest_nightly.yml b/.htmltest_nightly.yml
new file mode 100644
index 00000000000..6072d0074bc
--- /dev/null
+++ b/.htmltest_nightly.yml
@@ -0,0 +1,11 @@
+DirectoryPath: "_site"
+ExternalTimeout: 30
+IgnoreDirs:
+  - ^docs/stable
+  - ^docs/dev
+  - ^docs/v1.2
+IgnoreURLs:
+  - http://localhost:4000
+  - https://github.com
+IgnoreInternalEmptyHash: true
+TestFilesConcurrently: false 
diff --git a/ci/nightly b/ci/nightly
index e137aba96cf..4d98bd87f15 100755
--- a/ci/nightly
+++ b/ci/nightly
@@ -5,5 +5,5 @@ run() {
   "$(dirname "$0")"/builder run "$@"
 }
 
-run bundle exec jekyll build
-run htmltest
+run bundle exec jekyll build --incremental --trace --config _config_base.yml,_config_cockroachdb.yml
+run htmltest -c .htmltest_nightly.yml