diff --git a/Cargo.lock b/Cargo.lock
index 712040b89e69f..8d571bb1bf7b8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7445,6 +7445,17 @@ dependencies = [
  "webpki",
 ]
 
+[[package]]
+name = "tokio-stream"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c535f53c0cfa1acace62995a8994fc9cc1f12d202420da96ff306ee24d576469"
+dependencies = [
+ "futures-core",
+ "pin-project-lite 0.2.4",
+ "tokio 1.2.0",
+]
+
 [[package]]
 name = "tokio-test"
 version = "0.2.1"
@@ -7456,6 +7467,19 @@ dependencies = [
  "tokio 0.2.25",
 ]
 
+[[package]]
+name = "tokio-test"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f58403903e94d4bc56805e46597fced893410b2e753e229d3f7f22423ea03f67"
+dependencies = [
+ "async-stream",
+ "bytes 1.0.1",
+ "futures-core",
+ "tokio 1.2.0",
+ "tokio-stream",
+]
+
 [[package]]
 name = "tokio-timer"
 version = "0.2.13"
@@ -7585,7 +7609,7 @@ dependencies = [
  "futures-util",
  "pin-project 0.4.27",
  "tokio 0.2.25",
- "tokio-test",
+ "tokio-test 0.2.1",
  "tower-layer",
  "tower-service",
 ]
@@ -8227,7 +8251,7 @@ dependencies = [
  "tokio 0.2.25",
  "tokio-openssl",
  "tokio-postgres",
- "tokio-test",
+ "tokio-test 0.4.1",
  "tokio-util 0.3.1",
  "tokio01-test",
  "toml",
diff --git a/Cargo.toml b/Cargo.toml
index 4980714cd6b3d..e74e9322427d6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -260,7 +260,7 @@ reqwest = { version = "0.10.9", features = ["json"] }
 rusty-fork = "0.3.0"
 tempfile = "3.0.6"
 tokio = { version = "0.2", features = ["test-util"] }
-tokio-test = "0.2"
+tokio-test = "0.4"
 tokio01-test = "0.1.1"
 tower-test = "0.3.0"
 walkdir = "2.2.7"