diff --git a/cookiecutter.json b/cookiecutter.json
index f875da48e..2a3c168db 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -24,6 +24,8 @@
     "postgresql@12.9",
     "postgresql@11.14",
     "postgresql@10.19",
+    "mysql@8.0.28",
+    "mysql@8.0",
     "mysql@5.7"
   ],
   "__processed_database_engine": "{{ cookiecutter.database_version.lower()|split('@')[0] }}",
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 1d7048395..8386fedec 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -52,6 +52,8 @@ SUPPORTED_COMBINATIONS = [
     {"database_engine": "postgresql", "database_version": "postgresql@12.9"},
     {"database_engine": "postgresql", "database_version": "postgresql@11.14"},
     {"database_engine": "postgresql", "database_version": "postgresql@10.1  9"},
+    {"database_engine": "mysql", "database_version": "mysql@8.0.28"},
+    {"database_engine": "mysql", "database_version": "mysql@8.0"},
     {"database_engine": "mysql", "database_version": "mysql@5.7"},
     {"cloud_provider": "AWS", "use_whitenoise": "y"},
     {"cloud_provider": "AWS", "use_whitenoise": "n"},
@@ -118,6 +120,8 @@ UNSUPPORTED_COMBINATIONS = [
     {"cloud_provider": "None", "use_whitenoise": "n"},
     {"cloud_provider": "GCP", "mail_service": "Amazon SES"},
     {"cloud_provider": "None", "mail_service": "Amazon SES"},
+    {"database_engine": "postgresql", "database_version": "mysql@8.0.28"},
+    {"database_engine": "postgresql", "database_version": "mysql@8.0"},
     {"database_engine": "postgresql", "database_version": "mysql@5.7"},
     {"database_engine": "mysql", "database_version": "postgresql@14.1"},
     {"database_engine": "mysql", "database_version": "postgresql@13.5"},