diff --git a/compose.yaml b/compose.yaml
index 5ca1d70ca..596ec9eee 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -103,6 +103,26 @@ services:
       - "--disable-background-timer-throttling"
       - "--disable-extensions"
 
+  pebble:
+    image: "letsencrypt/pebble:latest"
+    ports:
+      - "14000:14000" # ACME server
+      - "15000:15000" # Management interface
+    environment:
+      PEBBLE_VA_NOSLEEP: "1" # Don't sleep during validation for faster testing
+      PEBBLE_WFE_NONCEREJECT: "0" # Don't reject reused nonces
+    command: pebble -config /test/config/pebble-config.json -dnsserver 127.0.0.1:8053
+    volumes:
+      - "./compose/pebble:/test/config:ro"
+
+  pebble-challtestsrv:
+    image: "letsencrypt/pebble-challtestsrv:latest"
+    ports:
+      - "8055:8055" # HTTP-01 challenge test server
+      - "8053:8053" # DNS server
+      - "8056:8056" # Management API
+    command: pebble-challtestsrv -dns01 ":8053" -http01 ":8055" -management ":8056"
+
 volumes:
   postgres-data:
   minio-data:
diff --git a/compose/pebble/pebble-config.json b/compose/pebble/pebble-config.json
new file mode 100644
index 000000000..fd933a3e5
--- /dev/null
+++ b/compose/pebble/pebble-config.json
@@ -0,0 +1,12 @@
+{
+  "pebble": {
+    "listenAddress": "0.0.0.0:14000",
+    "managementListenAddress": "0.0.0.0:15000",
+    "certificate": "test/certs/localhost/cert.pem",
+    "privateKey": "test/certs/localhost/key.pem",
+    "httpPort": 80,
+    "tlsPort": 443,
+    "ocspResponderURL": "",
+    "externalAccountBindingRequired": false
+  }
+}
\ No newline at end of file