diff --git a/destroy_containers.yml b/destroy_containers.yml
new file mode 100644
index 00000000..836732ba
--- /dev/null
+++ b/destroy_containers.yml
@@ -0,0 +1,54 @@
+---
+# Copyright 2015, Rackspace US, Inc.
+#
+# 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.
+- name: Playbook for destroying test containers
+  hosts: all_container
+  gather_facts: false
+  tasks:
+    - name: Destroy a container
+      lxc_container:
+        name: "{{ container_name }}"
+        state: "absent"
+      delegate_to: "{{ physical_host }}"
+      tags:
+        - container-destroy
+    - name: Destroy container service directories
+      file:
+        path: "{{ item }}"
+        state: "absent"
+      with_items:
+        - "/openstack/{{ container_name }}"
+        - "/openstack/backup/{{ container_name }}"
+        - "/openstack/log/{{ container_name }}"
+        - "/var/lib/lxc/{{ container_name }}"
+        - "{{ lxc_container_directory|default('/var/lib/lxc') }}/{{ container_name }}"
+        - "/var/log/lxc/lxc-{{container_name}}"
+      delegate_to: "{{ physical_host }}"
+      tags:
+        - container-directories-service
+    - name: Destroy container data directories
+      file:
+        path: "{{ item }}"
+        state: "absent"
+      with_items:
+        - "/openstack/{{ container_name }}"
+        - "/openstack/backup/{{ container_name }}"
+        - "/openstack/log/{{ container_name }}"
+      delegate_to: "{{ physical_host }}"
+      when:
+        - force_containers_destroy | bool
+        - force_containers_data_destroy | bool
+      tags:
+        - container-directories-data
+
diff --git a/test-prepare-containers.yml b/test-prepare-containers.yml
index c0d539ea..73fe79f5 100644
--- a/test-prepare-containers.yml
+++ b/test-prepare-containers.yml
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+- include: destroy_containers.yml
+  when: destroy_first | default(True) | bool
 - name: Playbook for creating containers
   hosts: all_containers
   gather_facts: false