diff --git a/contrib/network-storage/heketi/roles/tear-down/tasks/main.yml b/contrib/network-storage/heketi/roles/tear-down/tasks/main.yml
index a62d59d97..3943047ec 100644
--- a/contrib/network-storage/heketi/roles/tear-down/tasks/main.yml
+++ b/contrib/network-storage/heketi/roles/tear-down/tasks/main.yml
@@ -1,4 +1,7 @@
 ---
+- name: "Remove storage class."
+  command: "kubectl delete storageclass gluster"
+  ignore_errors: true
 - name: "Tear down heketi."
   command: "kubectl delete all,service,jobs,deployment,secret --selector=\"glusterfs=heketi-pod\""
   ignore_errors: true