diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000..659ed3a
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,54 @@
+name: Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - django-version: "2.2"
+            python-version: "3.8"
+            grappelli: "1"
+          - django-version: "3.2"
+            python-version: "3.9"
+          - django-version: "3.2"
+            python-version: "3.10"
+            grappelli: "1"
+          - django-version: "4.2"
+            python-version: "3.10"
+          - django-version: "4.2"
+            python-version: "3.11"
+            grappelli: "1"
+          - django-version: "5.1"
+            python-version: "3.12"
+          - django-version: "5.2"
+            python-version: "3.12"
+          - django-version: "5.2"
+            python-version: "3.13"
+            grappelli: "1"
+
+    runs-on: ubuntu-latest
+    name: Django ${{ matrix.django-version }} (Python ${{ matrix.python-version }})${{ matrix.grappelli == '1' && ' + grappelli' || '' }}
+    env:
+      PYTHON: ${{ matrix.python-version }}
+      DJANGO: ${{ matrix.django-version }}
+      GRAPPELLI: ${{ matrix.grappelli || '0' }}
+      CHROME_HEADLESS: '1'
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Install tox
+      run: |
+       python3 -m pip install tox tox-gh-actions
+
+    - name: Run tests
+      run: |
+        tox || tox || tox
diff --git a/setup.py b/setup.py
index 8f37c14..7d217a4 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,6 @@
     author='Josh West',
     packages=find_packages(exclude=['tests']),
     include_package_data=True,
-    install_requires=['six'],
     zip_safe=False,
     keywords=['Django', 'admin', 'locking'],
     classifiers=[
diff --git a/tests/settings.py b/tests/settings.py
index f222478..c7d7a99 100644
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -3,12 +3,11 @@
 
 import os
 import sys
-import imp
 
 import django
 
 try:
-    imp.find_module('grappelli')
+    import grappelli
 except ImportError:
     GRAPPELLI_INSTALLED = False
 else: