diff --git a/.buildkite/custom-tests.json b/.buildkite/custom-tests.json
new file mode 100644
index 0000000..b0da5ad
--- /dev/null
+++ b/.buildkite/custom-tests.json
@@ -0,0 +1,25 @@
+{
+    "tests": [
+        {
+            "test_name": "build-vhost-kern",
+            "command": "cargo build --features=vhost-kern",
+            "platform": [
+                "x86_64"
+            ]
+        },
+        {
+            "test_name": "build-vhost-user-master",
+            "command": "cargo build --features=vhost-user-master",
+            "platform": [
+                "x86_64"
+            ]
+        },
+        {
+            "test_name": "build-vhost-user-slave",
+            "command": "cargo build --features=vhost-user-slave",
+            "platform": [
+                "x86_64"
+            ]
+        }
+    ]
+}
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
deleted file mode 100644
index 1bf2a57..0000000
--- a/.buildkite/pipeline.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE-BSD-Google file.
-
-steps:
- - label: "clippy-x86-custom"
-   commands:
-    - cargo clippy --all-features --all-targets --workspace -- -D warnings
-   retry:
-    automatic: false
-   agents:
-    platform: x86_64.metal
-    os: linux
-   plugins:
-    - docker#v3.0.1:
-       image: "rustvmm/dev:v12"
-       always-pull: true
- - label: "build-x86-vhost-kern"
-   commands:
-    - cargo build --features=vhost-kern
-   retry:
-    automatic: false
-   agents:
-    platform: x86_64.metal
-    os: linux
-   plugins:
-    - docker#v3.0.1:
-       image: "rustvmm/dev:v12"
-       always-pull: true
- - label: "build-x86-vhost-user-master"
-   commands:
-    - cargo build --features=vhost-user-master
-   retry:
-    automatic: false
-   agents:
-    platform: x86_64.metal
-    os: linux
-   plugins:
-    - docker#v3.0.1:
-       image: "rustvmm/dev:v12"
-       always-pull: true
- - label: "build-x86-vhost-user-slave"
-   commands:
-    - cargo build --features=vhost-user-slave
-   retry:
-    automatic: false
-   agents:
-    platform: x86_64.metal
-    os: linux
-   plugins:
-    - docker#v3.0.1:
-       image: "rustvmm/dev:v12"
-       always-pull: true
- - label: "clippy-x86-test"
-   commands:
-    - cargo test --features=vhost-kern,vhost-user-master,vhost-user-slave
-   retry:
-    automatic: false
-   agents:
-    platform: x86_64.metal
-    os: linux
-   plugins:
-    - docker#v3.0.1:
-       image: "rustvmm/dev:v12"
-       always-pull: true