diff --git a/.github/workflows/pytest-remote-data.yml b/.github/workflows/pytest-remote-data.yml
index f9a726af41..ad57d2c175 100644
--- a/.github/workflows/pytest-remote-data.yml
+++ b/.github/workflows/pytest-remote-data.yml
@@ -56,10 +56,10 @@ jobs:
     strategy:
       fail-fast: false  # don't cancel other matrix jobs when one fails
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9, "3.10"]
         suffix: ['']  # the alternative to "-min"
         include:
-          - python-version: 3.6
+          - python-version: 3.7
             suffix: -min
 
     runs-on: ubuntu-latest
@@ -102,7 +102,7 @@ jobs:
         run: pytest pvlib/tests/iotools pvlib/tests/test_forecast.py --cov=./ --cov-report=xml --remote-data
 
       - name: Upload coverage to Codecov
-        if: matrix.python-version == 3.6 && matrix.suffix == ''
+        if: matrix.python-version == 3.7 && matrix.suffix == ''
         uses: codecov/codecov-action@v2
         with:
           fail_ci_if_error: true
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index 64ad2a724b..79e345baff 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -11,18 +11,17 @@ jobs:
     strategy:
       fail-fast: false  # don't cancel other matrix jobs when one fails
       matrix:
-        # use macos-10.15 instead of macos-latest for py3.6 support
-        os: [ubuntu-latest, macos-10.15, windows-latest]
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        python-version: [3.7, 3.8, 3.9, "3.10"]
         environment-type: [conda, bare]
         suffix: ['']  # placeholder as an alternative to "-min"
         include:
           - os: ubuntu-latest
-            python-version: 3.6
+            python-version: 3.7
             environment-type: conda
             suffix: -min
         exclude:
-          - os: macos-10.15
+          - os: macos-latest
             environment-type: conda
           - os: windows-latest
             environment-type: bare
@@ -81,7 +80,7 @@ jobs:
           pytest pvlib --cov=./ --cov-report=xml --ignore=pvlib/tests/iotools --ignore=pvlib/tests/test_forecast.py
 
       - name: Upload coverage to Codecov
-        if: matrix.python-version == 3.6 && matrix.suffix == '' && matrix.os == 'ubuntu-latest' && matrix.environment-type == 'conda'
+        if: matrix.python-version == 3.7 && matrix.suffix == '' && matrix.os == 'ubuntu-latest' && matrix.environment-type == 'conda'
         uses: codecov/codecov-action@v2
         with:
           fail_ci_if_error: true
diff --git a/benchmarks/asv.conf.json b/benchmarks/asv.conf.json
index 79773e928f..16e66ab8a1 100644
--- a/benchmarks/asv.conf.json
+++ b/benchmarks/asv.conf.json
@@ -114,7 +114,7 @@
     "include": [
         // minimum supported versions
         {
-            "python": "3.6",
+            "python": "3.7",
             "numpy": "1.16.0",
             "pandas": "0.25.0",
             "scipy": "1.2.0",
diff --git a/ci/requirements-py3.6.yml b/ci/requirements-py3.10.yml
similarity index 67%
rename from ci/requirements-py3.6.yml
rename to ci/requirements-py3.10.yml
index 596a2e0bbd..c7e5248230 100644
--- a/ci/requirements-py3.6.yml
+++ b/ci/requirements-py3.10.yml
@@ -7,9 +7,9 @@ dependencies:
     - cython
     - ephem
     - h5py
-    - netcdf4
+    # - netcdf4  # pulls in a different version of numpy with ImportError
     - nose
-    - numba
+    # - numba  # python 3.9 compat in early 2021
     - numpy >= 1.16.0
     - pandas >= 0.25.0
     - pip
@@ -17,17 +17,16 @@ dependencies:
     - pytest-cov
     - pytest-mock
     - requests-mock
+    - pytest-timeout
     - pytest-rerunfailures
     - pytest-remotedata
-    - pytest-timeout
-    - python=3.6
+    - python=3.10
     - pytz
     - requests
     - scipy >= 1.2.0
     - shapely  # pvfactors dependency
-    - siphon  # conda-forge
+    # - siphon  # conda-forge
     - statsmodels
     - pip:
-        - dataclasses
-        - nrel-pysam>=2.0
+        # - nrel-pysam>=2.0  # install error on windows
         - pvfactors==1.4.1
diff --git a/ci/requirements-py3.6-min.yml b/ci/requirements-py3.7-min.yml
similarity index 96%
rename from ci/requirements-py3.6-min.yml
rename to ci/requirements-py3.7-min.yml
index dfff0a9f97..d93d0b2bd3 100644
--- a/ci/requirements-py3.6-min.yml
+++ b/ci/requirements-py3.7-min.yml
@@ -9,7 +9,7 @@ dependencies:
     - pytest-cov
     - pytest-mock
     - pytest-timeout
-    - python=3.6
+    - python=3.7
     - pytz
     - requests
     - pip:
diff --git a/docs/sphinx/source/whatsnew/v0.9.2.rst b/docs/sphinx/source/whatsnew/v0.9.2.rst
index dcce33370f..d5a415f972 100644
--- a/docs/sphinx/source/whatsnew/v0.9.2.rst
+++ b/docs/sphinx/source/whatsnew/v0.9.2.rst
@@ -30,6 +30,7 @@ Testing
 ~~~~~~~
 * Switched CI testing provider from Azure to GitHub Actions (:pull:`1306`)
 * Speed up CI setup using micromamba instead of conda (:pull:`1493`)
+* Drop python 3.6 (reached end of life Dec 2021) and add 3.10 to test matrix (:pull:`1507`)
 
 
 Documentation
@@ -47,6 +48,7 @@ Benchmarking
 
 Requirements
 ~~~~~~~~~~~~
+* Python 3.7 or greater. (:pull:`1507`)
 * Minimum pandas version increased to v0.25.0, released July 18, 2019. (:pull:`1448`)
 
 Contributors
diff --git a/setup.py b/setup.py
index 96b4737515..c33e1c3715 100755
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@
                     'requests',
                     'scipy >= 1.2.0',
                     'h5py',
-                    'dataclasses; python_version < "3.7"']
+                    ]
 
 TESTS_REQUIRE = ['nose', 'pytest', 'pytest-cov', 'pytest-mock',
                  'requests-mock', 'pytest-timeout', 'pytest-rerunfailures',
@@ -75,7 +75,7 @@
     'zip_safe': False,
     'scripts': [],
     'include_package_data': True,
-    'python_requires': '>=3.6'
+    'python_requires': '>=3.7'
 }
 
 PROJECT_URLS = {