diff --git a/testsuite/modules.10-use/999-cleanup.exp b/testsuite/modules.10-use/999-cleanup.exp
new file mode 100644
index 00000000..05b43449
--- /dev/null
+++ b/testsuite/modules.10-use/999-cleanup.exp
@@ -0,0 +1,22 @@
+##############################################################################
+#   Modules Revision 3.0
+#   Providing a flexible user environment
+#
+#   File:		modules.10-use/%M%
+#   Revision:		%I%
+#   First Edition:	2019/05/15
+#   Last Mod.:		%U%, %G%
+#
+#   Authors:		Xavier Delaruelle, xavier.delaruelle@cea.fr
+#
+#   Description:	Testuite testsequence
+#   Command:
+#   Modulefiles:
+#   Sub-Command:
+#
+#   Comment:	%C{
+#			Cleanup from this part of the testsuite
+#		}C%
+#
+##############################################################################
+
diff --git a/testsuite/modules.61-coll/999-cleanup.exp b/testsuite/modules.61-coll/999-cleanup.exp
index 7a0a1fb5..8195b9b2 100644
--- a/testsuite/modules.61-coll/999-cleanup.exp
+++ b/testsuite/modules.61-coll/999-cleanup.exp
@@ -39,8 +39,8 @@ if { $verbose > 0 } {
 file delete $hometestdotmod
 file delete $hometestcoll
 
-unset testcoll
-unset testcoll_list
+catch {unset testcoll}
+catch {unset testcoll_list}
 
 unset mlu
 unset mll
diff --git a/testsuite/modules.90-avail/999-cleanup.exp b/testsuite/modules.90-avail/999-cleanup.exp
new file mode 100644
index 00000000..b4c2974d
--- /dev/null
+++ b/testsuite/modules.90-avail/999-cleanup.exp
@@ -0,0 +1,22 @@
+##############################################################################
+#   Modules Revision 3.0
+#   Providing a flexible user environment
+#
+#   File:		modules.90-avail/%M%
+#   Revision:		%I%
+#   First Edition:	2019/05/15
+#   Last Mod.:		%U%, %G%
+#
+#   Authors:		Xavier Delaruelle, xavier.delaruelle@cea.fr
+#
+#   Description:	Testuite testsequence
+#   Command:
+#   Modulefiles:
+#   Sub-Command:
+#
+#   Comment:	%C{
+#			Cleanup from this part of the testsuite
+#		}C%
+#
+##############################################################################
+