diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 685b908..e7422ad 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -2,11 +2,11 @@
 platforms:
   rbe_ubuntu1604:
     test_targets:
-    - "//test/configs:debian-jessie-autoconfig_test"
-    - "//test/configs:debian-jessie-custom-bazel-rc-version-autoconfig_test"
-    - "//test/configs:ubuntu-xenial-autoconfig_test"
-    - "//test/configs:ubuntu-xenial-custom-bazel-rc-version-autoconfig_test"
-    - "//test/configs:debian8_clang_autoconfig_test"
+    - "//tests/config:debian-jessie-autoconfig_test"
+    - "//tests/config:debian-jessie-custom-bazel-rc-version-autoconfig_test"
+    - "//tests/config:ubuntu-xenial-autoconfig_test"
+    - "//tests/config:ubuntu-xenial-custom-bazel-rc-version-autoconfig_test"
+    - "//tests/config:debian8_clang_autoconfig_test"
     - "//configs/debian8_clang:default-debian8-clang-0.3.0-bazel_0.16.1-autoconfig_test"
     - "//configs/debian8_clang:msan-debian8-clang-0.3.0-bazel_0.16.1-autoconfig_test"
     - "//configs/ubuntu16_04_clang:default-ubuntu16_04-clang-1.0-bazel_0.16.1-autoconfig_test"
diff --git a/WORKSPACE b/WORKSPACE
index c29725a..59d7f20 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -71,7 +71,7 @@
 
 # TODO(xingao) Switch to use "marketplace.gcr.io" registry once Buildkite support proper auth.
 # Pinned to gcr.io/cloud-marketplace/google/clang-debian8@sha256:ac3b1fdc22c0f2b95abe67f2daf33788425fab52d4e6845900bfe1a42443098f
-# solely for testing purpose used by //test/configs:debian8_clang_autoconfig_test.
+# solely for testing purpose used by //tests/config:debian8_clang_autoconfig_test.
 container_pull(
     name = "debian8-clang-test",
     digest = "sha256:ac3b1fdc22c0f2b95abe67f2daf33788425fab52d4e6845900bfe1a42443098f",
diff --git a/rules/docker_config.bzl b/rules/docker_config.bzl
index 247fb11..a9a40c8 100644
--- a/rules/docker_config.bzl
+++ b/rules/docker_config.bzl
@@ -487,7 +487,7 @@
             name = kwargs["name"] + "_test",
             size = "medium",
             timeout = "long",
-            srcs = ["@bazel_toolchains//test/configs:autoconfig_test.sh"],
+            srcs = ["@bazel_toolchains//tests/config:autoconfig_test.sh"],
             data = [":" + kwargs["name"]],
         )
 
diff --git a/test/configs/BUILD b/tests/config/BUILD
similarity index 98%
rename from test/configs/BUILD
rename to tests/config/BUILD
index b5ca4c6..ff87e34 100644
--- a/test/configs/BUILD
+++ b/tests/config/BUILD
@@ -137,7 +137,7 @@
     test = True,
 )
 
-# For test purpose only. Used by //test/configs:debian8_clang_autoconfig_test.
+# For test purpose only. Used by //tests/config:debian8_clang_autoconfig_test.
 # debian8_clang_autoconfig_test compares configs generated by this target and those
 # already published in the repo to make sure the current docker_toolchain_autoconfig
 # can generate the exact same configs as before.
diff --git a/test/configs/autoconfig_test.sh b/tests/config/autoconfig_test.sh
similarity index 100%
rename from test/configs/autoconfig_test.sh
rename to tests/config/autoconfig_test.sh
diff --git a/test/configs/debian8_clang_autoconfig_test.sh b/tests/config/debian8_clang_autoconfig_test.sh
similarity index 97%
rename from test/configs/debian8_clang_autoconfig_test.sh
rename to tests/config/debian8_clang_autoconfig_test.sh
index 87ee969..ebbc1f1 100755
--- a/test/configs/debian8_clang_autoconfig_test.sh
+++ b/tests/config/debian8_clang_autoconfig_test.sh
@@ -28,7 +28,7 @@
 BAZEL_VERSION=0.10.0
 CONFIG_VERSION=0.3.0
 TEST_CONFIGS_DIR=${TEST_TMPDIR}/bazel-toolchains-${COMMIT}/configs/debian8_clang/${CONFIG_VERSION}/bazel_${BAZEL_VERSION}/
-AUTOCONFIG_SCRIPT=${WORKSPACE_ROOT}/test/configs/debian8-clang-${CONFIG_VERSION}-bazel_${BAZEL_VERSION}-autoconfig
+AUTOCONFIG_SCRIPT=${WORKSPACE_ROOT}/tests/config/debian8-clang-${CONFIG_VERSION}-bazel_${BAZEL_VERSION}-autoconfig
 
 # Helper function for always delete the containers / temporary files on exit
 function cleanup_on_finish {
diff --git a/test/container/BUILD b/tests/container/BUILD
similarity index 100%
rename from test/container/BUILD
rename to tests/container/BUILD