diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/activate/test.yml b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/activate/test.yml
index 65dba09a8fb5a..24e2c0353c942 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/activate/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/activate/test.yml
@@ -29,42 +29,3 @@
         CEPH_VOLUME_DEBUG: 1
       with_items:
         - "{{ osd_configs.files }}"
-
-
-# zap tests
-
-- hosts: osds
-  become: yes
-  tasks:
-
-    - name: stop ceph-osd daemons
-      service:
-        name: "ceph-osd@{{ item }}"
-        state: stopped
-      with_items:
-        - "0"
-        - "1"
-
-
-- hosts: mons
-  become: yes
-  tasks:
-
-    - name: purge osds
-      command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it"
-      with_items:
-        - "0"
-        - "1"
-
-
-- hosts: osds
-  become: yes
-  tasks:
-
-    - name: zap devices used for OSDs
-      command: "ceph-volume --cluster {{ cluster }} lvm zap --osd-id {{ item }} --destroy"
-      with_items:
-        - "0"
-        - "1"
-      environment:
-        CEPH_VOLUME_DEBUG: 1
diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-luks/test.yml b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-luks/test.yml
index 44bbf38d7be9e..55ae7cc8eb943 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-luks/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-luks/test.yml
@@ -13,42 +13,3 @@
       command: "ceph-volume --cluster={{ cluster }} simple activate --all"
       environment:
         CEPH_VOLUME_DEBUG: 1
-
-# zap tests
-
-- hosts: osds
-  become: yes
-  tasks:
-
-    - name: stop ceph-osd daemons
-      service:
-        name: "ceph-osd@{{ item }}"
-        state: stopped
-      with_items:
-        - "0"
-        - "1"
-
-
-- hosts: mons
-  become: yes
-  tasks:
-
-    - name: purge osds
-      command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it"
-      with_items:
-        - "0"
-        - "1"
-
-
-- hosts: osds
-  become: yes
-  tasks:
-
-    - name: zap devices used for OSDs
-      command: "ceph-volume --cluster {{ cluster }} lvm zap --osd-id {{ item }} --destroy"
-      with_items:
-        - "0"
-        - "1"
-      environment:
-        CEPH_VOLUME_DEBUG: 1
-
diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-plain/test.yml b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-plain/test.yml
index f58d690cb04c6..24e2c0353c942 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-plain/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-plain/test.yml
@@ -29,42 +29,3 @@
         CEPH_VOLUME_DEBUG: 1
       with_items:
         - "{{ osd_configs.files }}"
-
-# zap tests
-
-- hosts: osds
-  become: yes
-  tasks:
-
-    - name: stop ceph-osd daemons
-      service:
-        name: "ceph-osd@{{ item }}"
-        state: stopped
-      with_items:
-        - "0"
-        - "1"
-
-
-- hosts: mons
-  become: yes
-  tasks:
-
-    - name: purge osds
-      command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it"
-      with_items:
-        - "0"
-        - "1"
-
-
-- hosts: osds
-  become: yes
-  tasks:
-
-    - name: zap devices used for OSDs
-      command: "ceph-volume --cluster {{ cluster }} lvm zap --osd-id {{ item }} --destroy"
-      with_items:
-        - "0"
-        - "1"
-      environment:
-        CEPH_VOLUME_DEBUG: 1
-
diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/activate/test.yml b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/activate/test.yml
index 2947a9bff3033..0745f2571ff5f 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/activate/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/activate/test.yml
@@ -27,42 +27,3 @@
       command: "ceph-volume --cluster={{ cluster }} simple activate --all"
       environment:
         CEPH_VOLUME_DEBUG: 1
-
-# zap tests
-
-- hosts: osds
-  become: yes
-  tasks:
-
-    - name: stop ceph-osd daemons
-      service:
-        name: "ceph-osd@{{ item }}"
-        state: stopped
-      with_items:
-        - "0"
-        - "1"
-
-
-- hosts: mons
-  become: yes
-  tasks:
-
-    - name: purge osds
-      command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it"
-      with_items:
-        - "0"
-        - "1"
-
-
-- hosts: osds
-  become: yes
-  tasks:
-
-    - name: zap devices used for OSDs
-      command: "ceph-volume --cluster {{ cluster }} lvm zap --osd-id {{ item }} --destroy"
-      with_items:
-        - "0"
-        - "1"
-      environment:
-        CEPH_VOLUME_DEBUG: 1
-
diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-luks/test.yml b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-luks/test.yml
index f58d690cb04c6..24e2c0353c942 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-luks/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-luks/test.yml
@@ -29,42 +29,3 @@
         CEPH_VOLUME_DEBUG: 1
       with_items:
         - "{{ osd_configs.files }}"
-
-# zap tests
-
-- hosts: osds
-  become: yes
-  tasks:
-
-    - name: stop ceph-osd daemons
-      service:
-        name: "ceph-osd@{{ item }}"
-        state: stopped
-      with_items:
-        - "0"
-        - "1"
-
-
-- hosts: mons
-  become: yes
-  tasks:
-
-    - name: purge osds
-      command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it"
-      with_items:
-        - "0"
-        - "1"
-
-
-- hosts: osds
-  become: yes
-  tasks:
-
-    - name: zap devices used for OSDs
-      command: "ceph-volume --cluster {{ cluster }} lvm zap --osd-id {{ item }} --destroy"
-      with_items:
-        - "0"
-        - "1"
-      environment:
-        CEPH_VOLUME_DEBUG: 1
-
diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-plain/test.yml b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-plain/test.yml
index f58d690cb04c6..24e2c0353c942 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-plain/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-plain/test.yml
@@ -29,42 +29,3 @@
         CEPH_VOLUME_DEBUG: 1
       with_items:
         - "{{ osd_configs.files }}"
-
-# zap tests
-
-- hosts: osds
-  become: yes
-  tasks:
-
-    - name: stop ceph-osd daemons
-      service:
-        name: "ceph-osd@{{ item }}"
-        state: stopped
-      with_items:
-        - "0"
-        - "1"
-
-
-- hosts: mons
-  become: yes
-  tasks:
-
-    - name: purge osds
-      command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it"
-      with_items:
-        - "0"
-        - "1"
-
-
-- hosts: osds
-  become: yes
-  tasks:
-
-    - name: zap devices used for OSDs
-      command: "ceph-volume --cluster {{ cluster }} lvm zap --osd-id {{ item }} --destroy"
-      with_items:
-        - "0"
-        - "1"
-      environment:
-        CEPH_VOLUME_DEBUG: 1
-
diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/activate/test.yml b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/activate/test.yml
index dad0b3d55972a..24e2c0353c942 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/activate/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/activate/test.yml
@@ -29,41 +29,3 @@
         CEPH_VOLUME_DEBUG: 1
       with_items:
         - "{{ osd_configs.files }}"
-
-# zap tests
-
-- hosts: osds
-  become: yes
-  tasks:
-
-    - name: stop ceph-osd daemons
-      service:
-        name: "ceph-osd@{{ item }}"
-        state: stopped
-      with_items:
-        - "0"
-        - "1"
-
-
-- hosts: mons
-  become: yes
-  tasks:
-
-    - name: purge osds
-      command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it"
-      with_items:
-        - "0"
-        - "1"
-
-
-- hosts: osds
-  become: yes
-  tasks:
-
-    - name: zap devices used for OSDs
-      command: "ceph-volume --cluster {{ cluster }} lvm zap --osd-id {{ item }} --destroy"
-      with_items:
-        - "0"
-        - "1"
-      environment:
-        CEPH_VOLUME_DEBUG: 1
diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-luks/test.yml b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-luks/test.yml
index f58d690cb04c6..24e2c0353c942 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-luks/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-luks/test.yml
@@ -29,42 +29,3 @@
         CEPH_VOLUME_DEBUG: 1
       with_items:
         - "{{ osd_configs.files }}"
-
-# zap tests
-
-- hosts: osds
-  become: yes
-  tasks:
-
-    - name: stop ceph-osd daemons
-      service:
-        name: "ceph-osd@{{ item }}"
-        state: stopped
-      with_items:
-        - "0"
-        - "1"
-
-
-- hosts: mons
-  become: yes
-  tasks:
-
-    - name: purge osds
-      command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it"
-      with_items:
-        - "0"
-        - "1"
-
-
-- hosts: osds
-  become: yes
-  tasks:
-
-    - name: zap devices used for OSDs
-      command: "ceph-volume --cluster {{ cluster }} lvm zap --osd-id {{ item }} --destroy"
-      with_items:
-        - "0"
-        - "1"
-      environment:
-        CEPH_VOLUME_DEBUG: 1
-
diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-plain/test.yml b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-plain/test.yml
index f58d690cb04c6..24e2c0353c942 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-plain/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-plain/test.yml
@@ -29,42 +29,3 @@
         CEPH_VOLUME_DEBUG: 1
       with_items:
         - "{{ osd_configs.files }}"
-
-# zap tests
-
-- hosts: osds
-  become: yes
-  tasks:
-
-    - name: stop ceph-osd daemons
-      service:
-        name: "ceph-osd@{{ item }}"
-        state: stopped
-      with_items:
-        - "0"
-        - "1"
-
-
-- hosts: mons
-  become: yes
-  tasks:
-
-    - name: purge osds
-      command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it"
-      with_items:
-        - "0"
-        - "1"
-
-
-- hosts: osds
-  become: yes
-  tasks:
-
-    - name: zap devices used for OSDs
-      command: "ceph-volume --cluster {{ cluster }} lvm zap --osd-id {{ item }} --destroy"
-      with_items:
-        - "0"
-        - "1"
-      environment:
-        CEPH_VOLUME_DEBUG: 1
-
diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/activate/test.yml b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/activate/test.yml
index 44bbf38d7be9e..55ae7cc8eb943 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/activate/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/activate/test.yml
@@ -13,42 +13,3 @@
       command: "ceph-volume --cluster={{ cluster }} simple activate --all"
       environment:
         CEPH_VOLUME_DEBUG: 1
-
-# zap tests
-
-- hosts: osds
-  become: yes
-  tasks:
-
-    - name: stop ceph-osd daemons
-      service:
-        name: "ceph-osd@{{ item }}"
-        state: stopped
-      with_items:
-        - "0"
-        - "1"
-
-
-- hosts: mons
-  become: yes
-  tasks:
-
-    - name: purge osds
-      command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it"
-      with_items:
-        - "0"
-        - "1"
-
-
-- hosts: osds
-  become: yes
-  tasks:
-
-    - name: zap devices used for OSDs
-      command: "ceph-volume --cluster {{ cluster }} lvm zap --osd-id {{ item }} --destroy"
-      with_items:
-        - "0"
-        - "1"
-      environment:
-        CEPH_VOLUME_DEBUG: 1
-
diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-luks/test.yml b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-luks/test.yml
index f58d690cb04c6..24e2c0353c942 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-luks/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-luks/test.yml
@@ -29,42 +29,3 @@
         CEPH_VOLUME_DEBUG: 1
       with_items:
         - "{{ osd_configs.files }}"
-
-# zap tests
-
-- hosts: osds
-  become: yes
-  tasks:
-
-    - name: stop ceph-osd daemons
-      service:
-        name: "ceph-osd@{{ item }}"
-        state: stopped
-      with_items:
-        - "0"
-        - "1"
-
-
-- hosts: mons
-  become: yes
-  tasks:
-
-    - name: purge osds
-      command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it"
-      with_items:
-        - "0"
-        - "1"
-
-
-- hosts: osds
-  become: yes
-  tasks:
-
-    - name: zap devices used for OSDs
-      command: "ceph-volume --cluster {{ cluster }} lvm zap --osd-id {{ item }} --destroy"
-      with_items:
-        - "0"
-        - "1"
-      environment:
-        CEPH_VOLUME_DEBUG: 1
-
diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-plain/test.yml b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-plain/test.yml
index f58d690cb04c6..24e2c0353c942 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-plain/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-plain/test.yml
@@ -29,42 +29,3 @@
         CEPH_VOLUME_DEBUG: 1
       with_items:
         - "{{ osd_configs.files }}"
-
-# zap tests
-
-- hosts: osds
-  become: yes
-  tasks:
-
-    - name: stop ceph-osd daemons
-      service:
-        name: "ceph-osd@{{ item }}"
-        state: stopped
-      with_items:
-        - "0"
-        - "1"
-
-
-- hosts: mons
-  become: yes
-  tasks:
-
-    - name: purge osds
-      command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it"
-      with_items:
-        - "0"
-        - "1"
-
-
-- hosts: osds
-  become: yes
-  tasks:
-
-    - name: zap devices used for OSDs
-      command: "ceph-volume --cluster {{ cluster }} lvm zap --osd-id {{ item }} --destroy"
-      with_items:
-        - "0"
-        - "1"
-      environment:
-        CEPH_VOLUME_DEBUG: 1
-