diff --git a/CHANGELOG.md b/CHANGELOG.md
index e208ba3..9f6eb5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ Ground-up port from the latest Readability.js (v0.6.0) using Claude's Fable mode
 - HTML5-PHP dependency; `ext-xml` requirement
 - Options that existed as libxml workarounds: `parser`, `substituteEntities`, `normalizeEntities`, `summonCthulhu`
 - The custom DOM subclass layer (`src/Nodes/`) and its workarounds (attribute-based state, shifting-aware iteration)
+- The Docker-based local test setup (`docker-compose.yml`, `Makefile`, `docker/`); tests and static analysis run directly on PHP 8.4/8.5, locally and in CI
 
 ## [v3.3.3](https://github.com/fivefilters/readability.php/releases/tag/v3.3.3)
 - Fix type error - extends type support to add DOMProcessingInstruction in more method signatures (reported by @reinierkors)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 05fd7f0..0625667 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -37,8 +37,9 @@ Things that intentionally differ from the JS (don't "fix" these): scoring state
 ``` bash
 $ ./vendor/bin/phpunit      # requires PHP 8.4+
 $ ./vendor/bin/psalm        # static analysis; CI runs this too
-$ make test-all             # multiple PHP versions; requires docker and docker-compose
 ```
 
+CI runs both on PHP 8.4 and 8.5.
+
 
 **Happy coding**!
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 33f42fe..0000000
--- a/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-.PHONY: test-all test-8.4 test-8.5 start stop
-
-test-all: start test-8.4 test-8.5 stop
-
-test-8.4:
-	docker-compose exec php-8.4 php /app/vendor/phpunit/phpunit/phpunit --configuration /app/phpunit.xml
-
-test-8.5:
-	docker-compose exec php-8.5 php /app/vendor/phpunit/phpunit/phpunit --configuration /app/phpunit.xml
-
-start:
-	docker-compose up -d php-8.4 php-8.5
-
-stop:
-	docker-compose stop
diff --git a/README.md b/README.md
index 3d12a70..caee0fc 100644
--- a/README.md
+++ b/README.md
@@ -219,11 +219,7 @@ composer install --prefer-source
 ./vendor/bin/phpunit
 ```
 
-To test against multiple PHP versions with Docker:
-
-```bash
-make test-all   # or make test-8.4 / make test-8.5
-```
+CI runs the suite (plus [Psalm](https://psalm.dev/) static analysis) on PHP 8.4 and 8.5.
 
 ### Updating the expected test output
 
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 82b32b7..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-services:
-  php-8.4: &template
-    build:
-      context: ./docker/php
-      args:
-        PHP_VERSION: 8.4
-    volumes:
-      - ./:/app
-    tty: true
-
-  php-8.5:
-    <<: *template
-    build:
-      context: ./docker/php
-      args:
-        PHP_VERSION: 8.5
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
deleted file mode 100644
index 9e8bbbe..0000000
--- a/docker/php/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# PHP >= 8.4 bundles the Lexbor-based HTML parser in ext-dom,
-# so the official CLI images are all we need (no libxml pinning).
-ARG PHP_VERSION
-FROM php:${PHP_VERSION}-cli
-
-RUN apt-get update