diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a94147..98ef218 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## In development
+
+- Drop support for Python 3.8 (EOL) (#571).
+
 ## 24.2 (2024-04-16)
 
 - Reinstate setuptools_scm for build (#441).
diff --git a/pyproject.toml b/pyproject.toml
index d259a9b..8a25150 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -48,7 +48,7 @@ Source = "https://github.com/zostera/django-marina"
 fix = false
 line-length = 120
 src = ["src"]
-target-version = "py38"
+target-version = "py39"
 
 [tool.ruff.lint]
 fixable = [
diff --git a/requirements-test.txt b/requirements-test.txt
index aeab61d..2123019 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,7 +1,3 @@
 tox==4.23.2
 coverage==7.6.1
-<<<<<<< HEAD
 ruff==0.8.1
-=======
-ruff==0.7.4
->>>>>>> parent of e8386a3 (Bump ruff from 0.7.4 to 0.8.0 (#564))
diff --git a/tox.ini b/tox.ini
index d79b523..65bbbf6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,6 @@
 [tox]
 args_are_paths = false
 envlist =
-    py38-{4.2},
     py39-{4.2},
     py310-{4.2,5.0,5.1,main},
     py311-{4.2,5.0,5.1,main},
@@ -12,7 +11,6 @@ envlist =
 
 [testenv]
 basepython =
-    py38: python3.8
     py39: python3.9
     py310: python3.10
     py311: python3.11