diff --git a/autoendpoint/Cargo.toml b/autoendpoint/Cargo.toml
index d7cd43c8a..eb11b5653 100644
--- a/autoendpoint/Cargo.toml
+++ b/autoendpoint/Cargo.toml
@@ -68,7 +68,7 @@ tokio = { workspace = true, features = ["fs", "macros"] }
 
 [features]
 default = ["dynamodb"]
-dynamodb = []
+dynamodb = ["autopush_common/dynamodb"]
 emulator = ["bigtable"]
 dual = ["bigtable", "dynamodb"]
 bigtable = ["autopush_common/bigtable"]
diff --git a/autopush-common/Cargo.toml b/autopush-common/Cargo.toml
index f693ad7b3..129a0015a 100644
--- a/autopush-common/Cargo.toml
+++ b/autopush-common/Cargo.toml
@@ -28,9 +28,9 @@ openssl.workspace = true
 rand.workspace = true
 regex.workspace = true
 reqwest.workspace = true
-rusoto_core.workspace = true
-rusoto_credential.workspace = true
-rusoto_dynamodb.workspace = true
+rusoto_core = { workspace = true, optional = true }
+rusoto_credential = { workspace = true, optional = true }
+rusoto_dynamodb = { workspace = true, optional = true }
 sentry-backtrace.workspace = true
 sentry.workspace = true
 sentry-core.workspace = true
@@ -78,7 +78,7 @@ actix-rt = "2.8"
 # for testing:
 # default = ["emulator"]
 bigtable = ["dep:google-cloud-rust-raw", "dep:grpcio", "dep:protobuf"]
-dynamodb = []
+dynamodb = ["dep:rusoto_core", "dep:rusoto_credential", "dep:rusoto_dynamodb"]
 emulator = [
     "bigtable",
 ] # used for testing big table, requires an external bigtable emulator running.