diff --git a/.circleci/config.yml b/.circleci/config.yml
index 62d8afc6fe..ee884fcf1e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -43,7 +43,7 @@ jobs:
   # Run st2 Integration tests
   integration:
     docker:
-      - image: circleci/python:3.6
+      - image: circleci/python:3.8
       - image: mongo:4.0
       - image: rabbitmq:3
     working_directory: ~/st2
@@ -79,7 +79,7 @@ jobs:
   # Run st2 Lint Checks
   lint:
     docker:
-      - image: circleci/python:3.6
+      - image: circleci/python:3.8
       - image: mongo:4.0
       - image: rabbitmq:3
     working_directory: ~/st2
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d85c934e6a..2df2339873 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -15,6 +15,8 @@ Changed
 * Bumped `jsonschema` 2.6.0 -> 3.2.0 now that python3.6 is not supported. #6118
 * Bumped many deps based on the lockfile generated by pants+pex. #6181 (by @cognifloyd and @nzlosh)
 * Switch to python3's standard lib unittest from unittest2, a backport of python3 unittest features for python2. #6187 (by @nzlosh)
+* Drop Python 3.6 testing in CircleCI. #6080
+  Contributed by (@philipphomberger Schwarz IT KG)
 
 Added
 ~~~~~