diff --git a/.zuul.yaml b/.zuul.yaml
index ceaaf0f8..dbdb9aff 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -19,13 +19,11 @@
     check:
       jobs:
         - openstack-tox-pep8
-        - airship-armada-lint-pep8
         - airship-armada-ubuntu
         - airship-armada-docker-build-gate
     gate:
       jobs:
         - openstack-tox-pep8
-        - airship-armada-lint-pep8
         - airship-armada-docker-build-gate
     post:
       jobs:
@@ -67,16 +65,6 @@
       - name: primary
         label: ubuntu-xenial
 
-- job:
-    name: airship-armada-lint-pep8
-    description: |
-      Lints Python files against the PEP8 standard
-    run: tools/gate/playbooks/pep8-linter.yaml
-    timeout: 300
-    nodeset: airship-armada-single-node
-    files:
-        - ^.*\.py$
-
 - job:
     name: airship-armada-docker-build-gate
     timeout: 1800
diff --git a/tools/gate/playbooks/pep8-linter.yaml b/tools/gate/playbooks/pep8-linter.yaml
deleted file mode 100644
index a294d081..00000000
--- a/tools/gate/playbooks/pep8-linter.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- hosts: primary
-  tasks:
-    - name: Execute the make target for PEP8 linting
-      make:
-        chdir: "{{ zuul.project.src_dir }}"
-        target: test-pep8
-      register: result
-      failed_when: result.failed