diff --git a/pswi/06_test_cleanup.sh b/pswi/06_test_cleanup.sh
index 6896e16862..6f8ee19f06 100644
--- a/pswi/06_test_cleanup.sh
+++ b/pswi/06_test_cleanup.sh
@@ -57,28 +57,6 @@ sh scripts/submit_jcl.sh "$(cat JCL)"
 rm JCL
 
 
-# Unmount and delete
-echo "Unmounting and deleting zFS ${WORK_ZFS}."
-
-echo ${JOBST1} >JCL
-echo ${JOBST2} >>JCL
-echo "//UNMNTZFS EXEC PGM=IKJEFT01,REGION=4096K,DYNAMNBR=50" >>JCL
-echo "//SYSTSPRT DD SYSOUT=*" >>JCL
-echo "//SYSTSOUT DD SYSOUT=*" >>JCL
-echo "//SYSTSIN DD * " >>JCL
-echo "UNMOUNT FILESYSTEM('${WORK_ZFS}') +  " >>JCL
-echo "IMMEDIATE" >>JCL
-echo "/*" >>JCL
-echo "//DELTZFST EXEC PGM=IDCAMS" >>JCL
-echo "//SYSPRINT DD SYSOUT=*" >>JCL
-echo "//SYSIN    DD *" >>JCL
-echo " DELETE ${WORK_ZFS}" >>JCL
-echo "/*" >>JCL
-
-sh scripts/submit_jcl.sh "$(cat JCL)"
-# Not checking results so the script doesn't fail
-rm JCL
-
 
 # Unmount and delete
 echo "Unmounting and deleting zFS ${TEST_HLQ}.ZFS."
@@ -126,3 +104,24 @@ sh scripts/submit_jcl.sh "$(cat JCL)"
 rm JCL
 
 
+# Unmount and delete
+echo "Unmounting and deleting zFS ${WORK_ZFS}."
+
+echo ${JOBST1} >JCL
+echo ${JOBST2} >>JCL
+echo "//UNMNTZFS EXEC PGM=IKJEFT01,REGION=4096K,DYNAMNBR=50" >>JCL
+echo "//SYSTSPRT DD SYSOUT=*" >>JCL
+echo "//SYSTSOUT DD SYSOUT=*" >>JCL
+echo "//SYSTSIN DD * " >>JCL
+echo "UNMOUNT FILESYSTEM('${WORK_ZFS}') +  " >>JCL
+echo "IMMEDIATE" >>JCL
+echo "/*" >>JCL
+echo "//DELTZFST EXEC PGM=IDCAMS" >>JCL
+echo "//SYSPRINT DD SYSOUT=*" >>JCL
+echo "//SYSIN    DD *" >>JCL
+echo " DELETE ${WORK_ZFS}" >>JCL
+echo "/*" >>JCL
+
+sh scripts/submit_jcl.sh "$(cat JCL)"
+# Not checking results so the script doesn't fail
+rm JCL