diff --git a/.buildkite/.env b/.buildkite/.env
deleted file mode 100644
index fc3606ead2..0000000000
--- a/.buildkite/.env
+++ /dev/null
@@ -1,11 +0,0 @@
-CI
-BUILDKITE
-BUILDKITE_BUILD_NUMBER
-BUILDKITE_BUILD_NUMBER
-BUILDKITE_JOB_ID
-BUILDKITE_BUILD_URL
-BUILDKITE_PROJECT_SLUG
-BUILDKITE_COMMIT
-BUILDKITE_TAG
-CODECOV_TOKEN
-TRIAL_FLAGS
diff --git a/MANIFEST.in b/MANIFEST.in
index 174e1b1f47..37d61f40de 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -44,7 +44,6 @@ include book.toml
 include pyproject.toml
 recursive-include changelog.d *
 
-prune .buildkite
 prune .circleci
 prune .github
 prune ci
diff --git a/.buildkite/test_db.db b/ci/test_db.db
similarity index 100%
rename from .buildkite/test_db.db
rename to ci/test_db.db
diff --git a/scripts-dev/lint.sh b/scripts-dev/lint.sh
index 869eb2372d..2c77643cda 100755
--- a/scripts-dev/lint.sh
+++ b/scripts-dev/lint.sh
@@ -94,7 +94,7 @@ else
           "scripts-dev/build_debian_packages"
           "scripts-dev/sign_json"
           "scripts-dev/update_database"
-          "contrib" "synctl" "setup.py" "synmark" "stubs" ".buildkite"
+          "contrib" "synctl" "setup.py" "synmark" "stubs" "ci"
       )
   fi
 fi
diff --git a/tox.ini b/tox.ini
index da77d124fc..b695126019 100644
--- a/tox.ini
+++ b/tox.ini
@@ -49,7 +49,7 @@ lint_targets =
     contrib
     synctl
     synmark
-    .buildkite
+    ci
     docker
 
 # default settings for all tox environments