diff --git a/.zuul.yaml b/.zuul.yaml
index 715139c..df0a224 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -40,13 +40,6 @@
       jobs:
         - images-upload-git-mirror
 
-- job:
-    name: airship-images-functional
-    nodeset: airship-images-single-node
-    pre-run: playbooks/airship-images-deploy-docker.yaml
-    run: playbooks/airship-images-test.yaml
-    post-run: playbooks/airship-collect-logs.yaml
-
 - job:
     name: airship-images-build
     nodeset: airship-images-single-node
diff --git a/playbooks/airship-images-test.yaml b/playbooks/airship-images-test.yaml
deleted file mode 100644
index 5830809..0000000
--- a/playbooks/airship-images-test.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2018 AT&T Intellectual Property.  All other rights reserved.
-#
-# 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: Run Test
-      block:
-        - name: "make tests"
-          make:
-            chdir: "{{ makefile_chdir }}"
-            target: tests
-    - name: install libvirt
-      include_role:
-        name: libvirt-install
-        tasks_from: "{{ item }}"
-      with_items:
-        - main
-        - configure
-    - virt_net:
-        state: active
-        name: default
-    - name: Launch and test VM with UEFI boot mode
-      include_role:
-        name: libvirt-domain
-      vars:
-        vm_name: ubuntu_focal_uefi
-        boot_mode: UEFI
-        src_image: /home/zuul/src/opendev.org/airship/images/iso-builder/build/ubuntu-focal.iso
-    - name: Launch and test VM with Legacy boot mode
-      include_role:
-        name: libvirt-domain
-      vars:
-        vm_name: ubuntu_focal_legacy
-        boot_mode: legacy
-        src_image: /home/zuul/src/opendev.org/airship/images/iso-builder/build/ubuntu-focal.iso