diff --git a/testsuite/example/sh-to-mod.csh b/testsuite/example/sh-to-mod.csh
index 8993e0a5..6a0136b9 100644
--- a/testsuite/example/sh-to-mod.csh
+++ b/testsuite/example/sh-to-mod.csh
@@ -97,6 +97,7 @@ if ( $?TESTSUITE_SHTOMOD_MODULE ) then
    module load setenv/1.0
    unalias ml
    unalias module
+   unalias mogui
    unsetenv MODULESHOME
 endif
 
diff --git a/testsuite/example/sh-to-mod.fish b/testsuite/example/sh-to-mod.fish
index a92cb29f..b7cc61a8 100644
--- a/testsuite/example/sh-to-mod.fish
+++ b/testsuite/example/sh-to-mod.fish
@@ -124,7 +124,7 @@ if set -q TESTSUITE_SHTOMOD_MODULE
    eval $TCLSH $MODULES_CMD fish autoinit | source -
    module config collection_target bar
    module load setenv/1.0
-   functions -e ml module _module_raw
+   functions -e ml module _module_raw mogui
    set -e MODULESHOME
 end
 
diff --git a/testsuite/example/sh-to-mod.sh b/testsuite/example/sh-to-mod.sh
index 3cefe65d..09a5cb1c 100644
--- a/testsuite/example/sh-to-mod.sh
+++ b/testsuite/example/sh-to-mod.sh
@@ -110,7 +110,7 @@ if [ "${TESTSUITE_SHTOMOD_MODULE:+x}" = 'x' ]; then
    eval $($TCLSH $MODULES_CMD sh autoinit)
    module config collection_target bar
    module load setenv/1.0
-   unset -f ml module _module_raw
+   unset -f ml module _module_raw mogui
    unset MODULESHOME
 fi
 
diff --git a/testsuite/is_func_defined b/testsuite/is_func_defined
new file mode 100755
index 00000000..32cddf13
--- /dev/null
+++ b/testsuite/is_func_defined
@@ -0,0 +1,2 @@
+#!/bin/bash
+type "$1" >/dev/null 2>&1
diff --git a/testsuite/is_func_defined.fish b/testsuite/is_func_defined.fish
new file mode 100755
index 00000000..828159d0
--- /dev/null
+++ b/testsuite/is_func_defined.fish
@@ -0,0 +1,2 @@
+#!/usr/bin/fish
+type -q "$argv[1]"
diff --git a/testsuite/is_module_defined b/testsuite/is_module_defined
deleted file mode 100755
index fa9a531f..00000000
--- a/testsuite/is_module_defined
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-type module >/dev/null 2>&1
diff --git a/testsuite/is_module_defined.fish b/testsuite/is_module_defined.fish
deleted file mode 100755
index deef759b..00000000
--- a/testsuite/is_module_defined.fish
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/fish
-type -q module
diff --git a/testsuite/modules.00-init/005-init_ts.exp b/testsuite/modules.00-init/005-init_ts.exp
index f48c87cc..84d0ecbd 100644
--- a/testsuite/modules.00-init/005-init_ts.exp
+++ b/testsuite/modules.00-init/005-init_ts.exp
@@ -199,8 +199,14 @@ unset orig_perms
 unset new_perms
 
 # check if module command is defined prior running tests
-set is_modules_defined [expr {![catch {exec $env(TESTSUITEDIR)/is_module_defined}]}]
-set is_modules_defined_fish [expr {![catch {exec $env(TESTSUITEDIR)/is_module_defined.fish}]}]
+set is_modules_defined [expr {![catch {exec $env(TESTSUITEDIR)/is_func_defined module}]}]
+set is_modules_defined_fish [expr {![catch {exec $env(TESTSUITEDIR)/is_func_defined.fish module}]}]
+send_user "\tModules is defined in SH env prior tests: $is_modules_defined\n"
+send_user "\tModules is defined in FISH env prior tests: $is_modules_defined_fish\n"
+set is_mogui_defined [expr {![catch {exec $env(TESTSUITEDIR)/is_func_defined mogui}]}]
+set is_mogui_defined_fish [expr {![catch {exec $env(TESTSUITEDIR)/is_func_defined.fish mogui}]}]
+send_user "\tMoGui is defined in SH env prior tests: $is_mogui_defined\n"
+send_user "\tMoGui is defined in FISH env prior tests: $is_mogui_defined_fish\n"
 
 # check if symbolic link registered in git repository have been effectively
 # created as symbolic link to determine if they are supported on filesystem
diff --git a/testsuite/modules.50-cmds/400-source-sh.exp b/testsuite/modules.50-cmds/400-source-sh.exp
index dedcbe08..19a23fb8 100644
--- a/testsuite/modules.50-cmds/400-source-sh.exp
+++ b/testsuite/modules.50-cmds/400-source-sh.exp
@@ -1664,6 +1664,9 @@ lappend ans [list set MODULES_COLLECTION_TARGET bar]
 # will be the unset of the module functions
 if {$is_modules_defined} {
     set extraans \|unset-function\ _module_raw\|unset-function\ ml\|unset-function\ module
+    if {$is_mogui_defined} {
+        append extraans \|unset-function\ mogui
+    }
 } else {
     set extraans {}
 }
@@ -1676,6 +1679,9 @@ if {$install_versioning eq {y}} {
 lappend ans [list set MODULE_VERSION $install_version]
 }
 if {$is_modules_defined} {
+if {$is_mogui_defined} {
+    lappend ans [list {unset -f mogui 2>/dev/null || true;}]
+}
 lappend ans [list {unset -f ml 2>/dev/null || true;}]
 lappend ans [list {unset -f module 2>/dev/null || true;}]
 lappend ans [list {unset -f _module_raw 2>/dev/null || true;}]
@@ -1687,6 +1693,9 @@ set extratserr "
 unset-function\t_module_raw
 unset-function\tml
 unset-function\tmodule"
+if {$is_mogui_defined} {
+    append extratserr "\nunset-function\tmogui"
+}
 } else {
 set extratserr {}
 }
@@ -1766,6 +1775,9 @@ if {$install_versioning eq {y}} {
 lappend ans [list set MODULE_VERSION $install_version]
 }
 if {$is_modules_defined} {
+if {$is_mogui_defined} {
+    lappend ans [list {unset -f mogui 2>/dev/null || true;}]
+}
 lappend ans [list {unset -f ml 2>/dev/null || true;}]
 lappend ans [list {unset -f module 2>/dev/null || true;}]
 lappend ans [list {unset -f _module_raw 2>/dev/null || true;}]
@@ -1801,6 +1813,9 @@ if {$install_versioning eq {y}} {
 lappend ans [list set MODULE_VERSION $install_version]
 }
 if {$is_modules_defined} {
+if {$is_mogui_defined} {
+    lappend ans [list {unset -f mogui 2>/dev/null || true;}]
+}
 lappend ans [list {unset -f ml 2>/dev/null || true;}]
 lappend ans [list {unset -f module 2>/dev/null || true;}]
 lappend ans [list {unset -f _module_raw 2>/dev/null || true;}]
diff --git a/testsuite/modules.70-maint/310-sh-to-mod.exp b/testsuite/modules.70-maint/310-sh-to-mod.exp
index ca3be5d5..6b11dd0b 100644
--- a/testsuite/modules.70-maint/310-sh-to-mod.exp
+++ b/testsuite/modules.70-maint/310-sh-to-mod.exp
@@ -797,11 +797,18 @@ setenv_var TCLSH $TCLSH
 # will be the unset of the module functions
 if {$is_modules_defined} {
     set extratserr "\nunset-function\t_module_raw\nunset-function\tml\nunset-function\tmodule"
+    if {$is_mogui_defined} {
+        append extratserr "\nunset-function\tmogui"
+    }
 } else {
     set extratserr {}
 }
 if {$is_modules_defined_fish && ![string match "CYGWIN*" $tcl_platform(os)]} {
-    set extratserr_fish "\nunset-function\tml\nunset-function\tmodule\nunsetenv\tMODULESHOME"
+    set extratserr_fish "\nunset-function\tml\nunset-function\tmodule"
+    if {$is_mogui_defined} {
+        append extratserr_fish "\nunset-function\tmogui"
+    }
+    append extratserr_fish "\nunsetenv\tMODULESHOME"
 } else {
     set extratserr_fish {}
 }
diff --git a/testsuite/modules.70-maint/311-eval-sh-to-mod.exp b/testsuite/modules.70-maint/311-eval-sh-to-mod.exp
index 72e418ea..24245cdb 100644
--- a/testsuite/modules.70-maint/311-eval-sh-to-mod.exp
+++ b/testsuite/modules.70-maint/311-eval-sh-to-mod.exp
@@ -481,6 +481,9 @@ setenv_var TCLSH $TCLSH
 # will be the unset of the module functions
 if {$is_modules_defined} {
     set extratserr "\nunset-function\t_module_raw\nunset-function\tml\nunset-function\tmodule"
+    if {$is_mogui_defined} {
+        append extratserr "\nunset-function\tmogui"
+    }
 } else {
     set extratserr {}
 }