diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4432abdfd..542a5e1a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixes
 - Enums will once again work with query parameters (#259). Thanks @packyg!
+- Generated Poetry metadata in pyproject.toml will properly indicate Python 3.6 compatibility (#258). Thanks @bowenwr!
 
 ## 0.7.0 - 2020-11-25
 
diff --git a/end_to_end_tests/golden-record-custom/pyproject.toml b/end_to_end_tests/golden-record-custom/pyproject.toml
index bf0748d1d..295a5018e 100644
--- a/end_to_end_tests/golden-record-custom/pyproject.toml
+++ b/end_to_end_tests/golden-record-custom/pyproject.toml
@@ -13,7 +13,7 @@ include = ["CHANGELOG.md", "custom_e2e/py.typed"]
 
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.6"
 httpx = "^0.15.0"
 attrs = "^20.1.0"
 python-dateutil = "^2.8.1"
diff --git a/end_to_end_tests/golden-record/pyproject.toml b/end_to_end_tests/golden-record/pyproject.toml
index eeb1a9e4e..79730ff78 100644
--- a/end_to_end_tests/golden-record/pyproject.toml
+++ b/end_to_end_tests/golden-record/pyproject.toml
@@ -13,7 +13,7 @@ include = ["CHANGELOG.md", "my_test_api_client/py.typed"]
 
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.6"
 httpx = "^0.15.0"
 attrs = "^20.1.0"
 python-dateutil = "^2.8.1"
diff --git a/openapi_python_client/templates/pyproject.toml b/openapi_python_client/templates/pyproject.toml
index c20bc2d94..7f9ededf7 100644
--- a/openapi_python_client/templates/pyproject.toml
+++ b/openapi_python_client/templates/pyproject.toml
@@ -13,7 +13,7 @@ include = ["CHANGELOG.md", "{{ package_name }}/py.typed"]
 
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.6"
 httpx = "^0.15.0"
 attrs = "^20.1.0"
 python-dateutil = "^2.8.1"