diff --git a/.ci/Jenkinsfile_baseline_capture b/.ci/Jenkinsfile_baseline_capture
index d074da1cb1926..9d662f4b39fb9 100644
--- a/.ci/Jenkinsfile_baseline_capture
+++ b/.ci/Jenkinsfile_baseline_capture
@@ -37,7 +37,7 @@ kibanaPipeline(timeoutMinutes: 210) {
                   tasks([
                     kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh'),
                     kibanaPipeline.functionalTestProcess('xpack-baseline', './test/scripts/jenkins_xpack_baseline.sh'),
-                    kibanaPipeline.scriptTask('Check Public API Docs', 'test/scripts/checks/plugin_public_api_docs.sh'),
+                    kibanaPipeline.scriptTask('Check Public API Docs', 'test/scripts/checks/baseline_plugin_public_api_docs.sh'),
                   ])
                 }
               }
diff --git a/test/scripts/checks/baseline_plugin_public_api_docs.sh b/test/scripts/checks/baseline_plugin_public_api_docs.sh
new file mode 100755
index 0000000000000..6b357897d963c
--- /dev/null
+++ b/test/scripts/checks/baseline_plugin_public_api_docs.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+source src/dev/ci_setup/setup_env.sh
+
+###
+### rebuild plugin api docs to ensure it's not out of date
+###
+echo " -- building api docs"
+node scripts/build_api_docs
diff --git a/test/scripts/checks/plugin_public_api_docs.sh b/test/scripts/checks/plugin_public_api_docs.sh
deleted file mode 100644
index 8fe9eb3f2f43c..0000000000000
--- a/test/scripts/checks/plugin_public_api_docs.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-source src/dev/ci_setup/setup_env.sh
-
-###
-### rebuild plugin api docs to ensure it's not out of date
-###
-echo " -- building api docs"
-node scripts/build_api_docs
-
-###
-### verify no api changes
-###
-### GIT_CHANGES="$(git ls-files --modified)"
-
-### if [ "$GIT_CHANGES" ]; then
-###   echo -e "\n${RED}ERROR: 'node scripts/build_api_docs' caused changes to the following files:${C_RESET}\n"
-###   echo -e "$GIT_CHANGES\n"
-###   exit 1
-### fi
diff --git a/test/scripts/checks/type_check.sh b/test/scripts/checks/type_check_plugin_public_api_docs.sh
similarity index 83%
rename from test/scripts/checks/type_check.sh
rename to test/scripts/checks/type_check_plugin_public_api_docs.sh
index bbe5748558684..d32343fcd173d 100755
--- a/test/scripts/checks/type_check.sh
+++ b/test/scripts/checks/type_check_plugin_public_api_docs.sh
@@ -12,3 +12,6 @@ checks-reporter-with-killswitch "Build TS Refs" \
 
 checks-reporter-with-killswitch "Check Types" \
   node scripts/type_check
+
+echo " -- building api docs"
+node scripts/build_api_docs
diff --git a/vars/tasks.groovy b/vars/tasks.groovy
index 1d33fd1249681..9a60512436c2d 100644
--- a/vars/tasks.groovy
+++ b/vars/tasks.groovy
@@ -11,8 +11,7 @@ def check() {
     kibanaPipeline.scriptTask('Check Doc API Changes', 'test/scripts/checks/doc_api_changes.sh'),
     kibanaPipeline.scriptTask('Check @kbn/pm Distributable', 'test/scripts/checks/kbn_pm_dist.sh'),
     kibanaPipeline.scriptTask('Check Plugin List Docs', 'test/scripts/checks/plugin_list_docs.sh'),
-    kibanaPipeline.scriptTask('Check Public API Docs', 'test/scripts/checks/plugin_public_api_docs.sh'),
-    kibanaPipeline.scriptTask('Check Types', 'test/scripts/checks/type_check.sh'),
+    kibanaPipeline.scriptTask('Check Types and Public API Docs', 'test/scripts/checks/type_check_plugin_public_api_docs.sh'),
     kibanaPipeline.scriptTask('Check Bundle Limits', 'test/scripts/checks/bundle_limits.sh'),
     kibanaPipeline.scriptTask('Check i18n', 'test/scripts/checks/i18n.sh'),
     kibanaPipeline.scriptTask('Check File Casing', 'test/scripts/checks/file_casing.sh'),