diff --git a/.buildkite/custom-tests.json b/.buildkite/custom-tests.json
index 00574e6..3171e62 100644
--- a/.buildkite/custom-tests.json
+++ b/.buildkite/custom-tests.json
@@ -1,15 +1,5 @@
 {
   "tests": [
-    {
-      "test_name": "build-mshv",
-      "command": "cargo build --release --no-default-features --features mshv",
-      "platform": ["x86_64"]
-    },
-    {
-      "test_name": "clippy-mshv",
-      "command": "cargo clippy --workspace --bins --examples --benches --no-default-features --features mshv --all-targets -- -D warnings",
-      "platform": ["x86_64"]
-    },
     {
       "test_name": "build-nohv",
       "command": "cargo build --release --no-default-features",
diff --git a/crates/vfio-ioctls/Cargo.toml b/crates/vfio-ioctls/Cargo.toml
index ed99dda..3fa7386 100644
--- a/crates/vfio-ioctls/Cargo.toml
+++ b/crates/vfio-ioctls/Cargo.toml
@@ -9,10 +9,13 @@ readme = "README.md"
 edition = "2018"
 keywords = ["vfio"]
 
+[package.metadata.docs.rs]
+features = ["kvm"]
+
 [features]
 default = ["kvm"]
 kvm = ["kvm-ioctls", "kvm-bindings"]
-mshv = ["mshv-ioctls", "mshv-bindings"]
+#mshv = ["mshv-ioctls", "mshv-bindings"]
 
 [dependencies]
 byteorder = ">=1.2.1"
@@ -24,5 +27,5 @@ thiserror = ">=1.0"
 vfio-bindings = "~0"
 vm-memory = { version = ">=0.6", features = ["backend-mmap"] }
 vmm-sys-util = ">=0.8.0"
-mshv-bindings = { git = "https://github.com/rust-vmm/mshv", branch = "main", features = ["with-serde", "fam-wrappers"], optional  = true }
-mshv-ioctls = { git = "https://github.com/rust-vmm/mshv", branch = "main", optional  = true }
+#mshv-bindings = { git = "https://github.com/rust-vmm/mshv", branch = "main", features = ["with-serde", "fam-wrappers"], optional  = true }
+#mshv-ioctls = { git = "https://github.com/rust-vmm/mshv", branch = "main", optional  = true }