diff --git a/buildkite/pipelines/bazel-toolchains-postsubmit.json b/buildkite/pipelines/bazel-toolchains-postsubmit.json
new file mode 100644
index 0000000..a8f519e
--- /dev/null
+++ b/buildkite/pipelines/bazel-toolchains-postsubmit.json
@@ -0,0 +1,48 @@
+{
+  "platforms": {
+    "ubuntu1404": {
+      "test_targets": [
+        "//test:debian-jessie-autoconfig_test",
+        "//test:debian-jessie-bazel-head-autoconfig_test",
+        "//test:debian-jessie-custom-bazel-version-autoconfig_test",
+        "//test:debian-jessie-custom-bazel-rc-version-autoconfig_test",
+        "//test:ubuntu-trusty-autoconfig_test",
+        "//test:ubuntu-trusty-bazel-head-autoconfig_test",
+        "//test:ubuntu-trusty-custom-bazel-version-autoconfig_test",
+        "//test:ubuntu-trusty-custom-bazel-rc-version-autoconfig_test",
+        "//test:ubuntu-xenial-autoconfig_test",
+        "//test:ubuntu-xenial-bazel-head-autoconfig_test",
+        "//test:ubuntu-xenial-custom-bazel-version-autoconfig_test",
+        "//test:ubuntu-xenial-custom-bazel-rc-version-autoconfig_test",
+        "//test:debian8_clang_autoconfig_test",
+        "//rules:debian8-clang-0.2.0-bazel_0.7.0-autoconfig_test",
+        "//rules:debian8-clang-0.2.0-bazel_0.8.0-autoconfig_test",
+        "//rules:debian8-clang-0.2.0-bazel_0.9.0-autoconfig_test",
+        "//rules:debian8-clang-0.2.0-bazel_0.10.0-autoconfig_test",
+        "//rules:debian8-clang-0.3.0-bazel_0.10.0-autoconfig_test"
+      ]
+    },
+    "ubuntu1604": {
+      "test_targets": [
+        "//test:debian-jessie-autoconfig_test",
+        "//test:debian-jessie-bazel-head-autoconfig_test",
+        "//test:debian-jessie-custom-bazel-version-autoconfig_test",
+        "//test:debian-jessie-custom-bazel-rc-version-autoconfig_test",
+        "//test:ubuntu-trusty-autoconfig_test",
+        "//test:ubuntu-trusty-bazel-head-autoconfig_test",
+        "//test:ubuntu-trusty-custom-bazel-version-autoconfig_test",
+        "//test:ubuntu-trusty-custom-bazel-rc-version-autoconfig_test",
+        "//test:ubuntu-xenial-autoconfig_test",
+        "//test:ubuntu-xenial-bazel-head-autoconfig_test",
+        "//test:ubuntu-xenial-custom-bazel-version-autoconfig_test",
+        "//test:ubuntu-xenial-custom-bazel-rc-version-autoconfig_test",
+        "//test:debian8_clang_autoconfig_test",
+        "//rules:debian8-clang-0.2.0-bazel_0.7.0-autoconfig_test",
+        "//rules:debian8-clang-0.2.0-bazel_0.8.0-autoconfig_test",
+        "//rules:debian8-clang-0.2.0-bazel_0.9.0-autoconfig_test",
+        "//rules:debian8-clang-0.2.0-bazel_0.10.0-autoconfig_test",
+        "//rules:debian8-clang-0.3.0-bazel_0.10.0-autoconfig_test"
+      ]
+    }
+  }
+}
diff --git a/buildkite/pipelines/bazelci.py b/buildkite/pipelines/bazelci.py
index 2f13791..732a307 100644
--- a/buildkite/pipelines/bazelci.py
+++ b/buildkite/pipelines/bazelci.py
@@ -34,6 +34,10 @@
           "git_repository": "https://github.com/bazelbuild/BUILD_file_generator.git",
           "http_config": "https://raw.githubusercontent.com/bazelbuild/continuous-integration/master/buildkite/pipelines/BUILD_file_generator-postsubmit.json"
       },
+      "bazel-toolchains": {
+          "git_repository": "https://github.com/bazelbuild/bazel-toolchains.git",
+          "http_config": "https://raw.githubusercontent.com/bazelbuild/continuous-integration/master/buildkite/pipelines/bazel-toolchains-postsubmit.json"
+      },
       "buildtools": {
           "git_repository": "https://github.com/bazelbuild/buildtools.git",
           "http_config": "https://raw.githubusercontent.com/bazelbuild/continuous-integration/master/buildkite/pipelines/buildtools-postsubmit.json"