diff --git a/Cargo.lock b/Cargo.lock
index fb8635be2..1d0f2e3a1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -111,6 +111,12 @@ version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
+[[package]]
+name = "base64"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51"
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -345,7 +351,7 @@ dependencies = [
  "async-channel",
  "async-stream",
  "async-trait",
- "base64",
+ "base64 0.22.0",
  "buf-list",
  "bytes",
  "camino",
@@ -1096,7 +1102,7 @@ version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310"
 dependencies = [
- "base64",
+ "base64 0.21.7",
  "serde",
 ]
 
@@ -1342,7 +1348,7 @@ version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab"
 dependencies = [
- "base64",
+ "base64 0.21.7",
  "rustls-pki-types",
 ]
 
diff --git a/dropshot/Cargo.toml b/dropshot/Cargo.toml
index 62f43e4c3..f0adb7230 100644
--- a/dropshot/Cargo.toml
+++ b/dropshot/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["network-programming", "web-programming::http-server"]
 [dependencies]
 async-stream = "0.3.5"
 async-trait = "0.1.78"
-base64 = "0.21.7"
+base64 = "0.22.0"
 bytes = "1"
 camino = { version = "1.1.6", features = ["serde1"] }
 debug-ignore = "1.0.5"
diff --git a/dropshot/tests/test_pagination.rs b/dropshot/tests/test_pagination.rs
index 021dac1c2..a1b884128 100644
--- a/dropshot/tests/test_pagination.rs
+++ b/dropshot/tests/test_pagination.rs
@@ -1,4 +1,5 @@
-// Copyright 2020 Oxide Computer Company
+// Copyright 2024 Oxide Computer Company
+
 //! Test cases for API handler functions that use pagination.
 
 use chrono::DateTime;
@@ -223,8 +224,7 @@ async fn test_paginate_errors() {
         ErrorTestCase {
             path: "/intapi?page_token=q".to_string(),
             message: "unable to parse query string: failed to parse \
-                      pagination token: Encoded text cannot have a 6-bit \
-                      remainder.",
+                      pagination token: Invalid input length: 1",
         },
     ];
 
@@ -392,7 +392,7 @@ async fn test_paginate_empty() {
         client,
         "/empty?page_token=q",
         "unable to parse query string: failed to parse pagination token: \
-         Encoded text cannot have a 6-bit remainder.",
+        Invalid input length: 1",
     )
     .await;
 
@@ -843,7 +843,7 @@ async fn start_example(path: &str, port: u16) -> ExampleContext {
                     .method(Method::GET)
                     .uri(url.clone())
                     .body(Body::empty())
-                    .expect("attempted to cosntruct invalid request"),
+                    .expect("attempted to construct invalid request"),
             )
             .await;
         if response.is_ok() {