diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 960cfea2..7664eabc 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -17,6 +17,24 @@ jobs:
         python-version: [ 3.9, "3.10" ]
         django-version: [ 3.2, 4.0, 4.1, 4.2 ]
         include:
+          - os: macos-latest
+            python-version: "3.7"
+            django-version: "3.2"
+          - os: ubuntu-latest
+            python-version: "3.7"
+            django-version: "3.2"
+          - os: macos-latest
+            python-version: "3.8"
+            django-version: "3.2"
+          - os: ubuntu-latest
+            python-version: "3.8"
+            django-version: "3.2"
+          - os: macos-latest
+            python-version: "3.8"
+            django-version: "4.0"
+          - os: ubuntu-latest
+            python-version: "3.8"
+            django-version: "4.0"
           - os: macos-latest
             python-version: "3.10"
             django-version: "5.0"
@@ -52,4 +70,4 @@ jobs:
           python setup.py install
       - name: Test with pytest
         run: |
-          python runtests.py
\ No newline at end of file
+          python runtests.py
diff --git a/README.md b/README.md
index a287903f..ccf00210 100644
--- a/README.md
+++ b/README.md
@@ -377,7 +377,7 @@ Checkout at http://127.0.0.1:8000/simple-form/ on your browser.
 [7]: https://img.shields.io/pypi/pyversions/martor.svg
 [8]: https://pypi.python.org/pypi/martor
 
-[9]: https://img.shields.io/badge/Django-3.2%20%3E=%204.1-green.svg
+[9]: https://img.shields.io/badge/Django-3.2%20%3E=%204.2-green.svg
 [10]: https://www.djangoproject.com
 
 [11]: https://img.shields.io/github/actions/workflow/status/agusmakmun/django-markdown-editor/run-tests.yml?branch=master
diff --git a/setup.py b/setup.py
index 111aa59a..7aa281a7 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,6 @@ def get_requirements():
         "Operating System :: OS Independent",
         "Programming Language :: JavaScript",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",