diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md b/.github/ISSUE_TEMPLATE/---bug-report.md
index 0b53690a..19d08d85 100644
--- a/.github/ISSUE_TEMPLATE/---bug-report.md
+++ b/.github/ISSUE_TEMPLATE/---bug-report.md
@@ -17,7 +17,7 @@ Please fill in each section to help maintainers to be helpful and quick to respo
 Describe issue in general terms.
 -->
 
-## Steps to reproduce
+## Steps to reproduce
 
 <!--
 Provide clear steps to reproduce the issue.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 00000000..a9c8f143
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,41 @@
+name: Code quality
+
+on: [push, pull_request]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[skip ci]')"
+    strategy:
+      matrix:
+        python-version: [3.8]
+        toxenv: [pep8, isort, black, pypi-description, docs, towncrier]
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        repository: ${{ github.event.pull_request.head.repo.full_name }}
+        ref: ${{ github.event.pull_request.head.ref }}
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v1
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Cache pip
+      uses: actions/cache@v1
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ matrix.toxenv }}
+        restore-keys: |
+          ${{ runner.os }}-pip-${{ matrix.toxenv }}
+    - name: Cache tox
+      uses: actions/cache@v1
+      with:
+        path: .tox
+        key: ${{ runner.os }}-lint-${{ matrix.toxenv }}-${{ hashFiles('setup.cfg') }}
+        restore-keys: |
+          ${{ runner.os }}-lint-${{ matrix.toxenv }}-
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip setuptools tox>=1.8
+    - name: Test with tox
+      run: |
+        tox -e${{ matrix.toxenv }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4a6cc09f..2e8dd904 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,45 +1,8 @@
-name: Linting - Tests
+name: Tox tests
 
 on: [push, pull_request]
 
 jobs:
-  lint:
-    runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
-    strategy:
-      matrix:
-        python-version: [3.8]
-        toxenv: [pep8, isort, black, pypi-description, docs, towncrier]
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        repository: ${{ github.event.pull_request.head.repo.full_name }}
-        ref: ${{ github.event.pull_request.head.ref }}
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Cache pip
-      uses: actions/cache@v1
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ matrix.toxenv }}
-        restore-keys: |
-          ${{ runner.os }}-pip-${{ matrix.toxenv }}
-    - name: Cache tox
-      uses: actions/cache@v1
-      with:
-        path: .tox
-        key: ${{ runner.os }}-lint-${{ matrix.toxenv }}-${{ hashFiles('setup.cfg') }}
-        restore-keys: |
-          ${{ runner.os }}-lint-${{ matrix.toxenv }}-
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip setuptools tox>=1.8
-    - name: Test with tox
-      run: |
-        tox -e${{ matrix.toxenv }}
-
   test:
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
     runs-on: ubuntu-latest
diff --git a/changes/608.bugfix b/changes/608.bugfix
new file mode 100644
index 00000000..fa86d3c4
--- /dev/null
+++ b/changes/608.bugfix
@@ -0,0 +1 @@
+Split linting GA to its own file