diff --git a/interop/Cargo.toml b/interop/Cargo.toml
index 87db1d6..106e7d4 100644
--- a/interop/Cargo.toml
+++ b/interop/Cargo.toml
@@ -25,7 +25,6 @@ http = "0.2"
 http-body = "0.4.2"
 hyper = "0.14"
 prost = "0.11"
-prost-derive = "0.11"
 tokio = {version = "1.0", features = ["rt-multi-thread", "time", "macros", "fs"]}
 tokio-stream = "0.1"
 tonic = {path = "../tonic", features = ["tls"]}
diff --git a/tests/compression/Cargo.toml b/tests/compression/Cargo.toml
index 8f6e352..5d1010b 100644
--- a/tests/compression/Cargo.toml
+++ b/tests/compression/Cargo.toml
@@ -15,7 +15,6 @@ hyper = "0.14.3"
 pin-project = "1.0"
 prost = "0.11"
 tokio = {version = "1.0", features = ["macros", "rt-multi-thread", "net"]}
-tokio-stream = {version = "0.1.5", features = ["net"]}
 tonic = {path = "../../tonic", features = ["gzip"]}
 tower = {version = "0.4", features = []}
 tower-http = {version = "0.3", features = ["map-response-body", "map-request-body"]}
diff --git a/tests/extern_path/my_application/Cargo.toml b/tests/extern_path/my_application/Cargo.toml
index 06ad1bf..a2eeb6b 100644
--- a/tests/extern_path/my_application/Cargo.toml
+++ b/tests/extern_path/my_application/Cargo.toml
@@ -10,7 +10,6 @@ version = "0.1.0"
 
 [dependencies]
 prost = "0.11"
-prost-types = "0.11"
 tonic = {path = "../../../tonic"}
 uuid = {package = "uuid1", path = "../uuid"}
 
diff --git a/tonic/Cargo.toml b/tonic/Cargo.toml
index 0aefcfd..aead5cf 100644
--- a/tonic/Cargo.toml
+++ b/tonic/Cargo.toml
@@ -26,7 +26,7 @@ version = "0.8.3"
 codegen = ["dep:async-trait"]
 gzip = ["dep:flate2"]
 default = ["transport", "codegen", "prost"]
-prost = ["dep:prost", "dep:prost-derive"]
+prost = ["dep:prost"]
 tls = ["dep:rustls-pemfile", "transport", "dep:tokio-rustls"]
 tls-roots = ["tls-roots-common", "dep:rustls-native-certs"]
 tls-roots-common = ["tls"]
@@ -59,13 +59,11 @@ async-stream = "0.3"
 http-body = "0.4.4"
 percent-encoding = "2.1"
 pin-project = "1.0.11"
-tokio-util = {version = "0.7", features = ["codec"]}
 tower-layer = "0.3"
 tower-service = "0.3"
 
 # prost
-prost-derive = {version = "0.11", optional = true}
-prost = {version = "0.11", optional = true}
+prost = {version = "0.11", default-features = false, features = ["std"], optional = true}
 
 # codegen
 async-trait = {version = "0.1.13", optional = true}