diff --git a/testsuite/modulefiles.3/tag/.modulerc b/testsuite/modulefiles.3/tag/.modulerc
index c4dc844a..1beeb6c7 100644
--- a/testsuite/modulefiles.3/tag/.modulerc
+++ b/testsuite/modulefiles.3/tag/.modulerc
@@ -177,3 +177,42 @@ if {[info exists env(TESTSUITE_STASH)]} {
         }
     }
 }
+
+# --user/--group tests in 50/440
+if {[info exists env(TESTSUITE_TAG_USER_GROUP)]} {
+    switch -- $env(TESTSUITE_TAG_USER_GROUP) {
+        user2 {
+            module-tag --user [list unknown1 [module-info username] unknown2] foo tag
+        }
+        user3 {
+            module-tag --user [list unknown1 unknown2] foo tag
+        }
+        user_notgroup3 {
+            module-tag --user [module-info username] --not-group [module-info usergroups] foo tag
+        }
+        user_notgroup4 {
+            module-tag --user unknown1 --not-group unknown1 foo tag
+        }
+        group2 {
+            module-tag --group [concat [list unknown1 unknown2] [module-info usergroups]] foo tag
+        }
+        group3 {
+            module-tag --group [list unknown1 unknown2] foo tag
+        }
+        group_notuser1 {
+            module-tag --group [module-info usergroups] --not-user unknown1 foo tag
+        }
+        group_notuser2 {
+            module-tag --group unknown1 --not-user [module-info username] foo tag
+        }
+        group_user1 {
+            module-tag --group [module-info usergroups] --user unknown1 foo tag
+        }
+        group_user2 {
+            module-tag --group unknown1 --user [module-info username] foo tag
+        }
+        group_user_notuser_notgroup2 {
+            module-tag --group unknown1 --user unknown1 foo tag --not-user unknown1 --not-group unknown1 hide1
+        }
+    }
+}
diff --git a/testsuite/modules.50-cmds/440-module-tag.exp b/testsuite/modules.50-cmds/440-module-tag.exp
index 554fdf7f..879a093d 100644
--- a/testsuite/modules.50-cmds/440-module-tag.exp
+++ b/testsuite/modules.50-cmds/440-module-tag.exp
@@ -367,6 +367,47 @@ testouterr_cmd sh {load tag/5.0} $ans {}
 setenv_var MODULERCFILE $ORIG_MODULERCFILE
 
 
+#
+# --user/--group options test
+#
+
+set tserr_wtag "$mp:\ntag/5.0 <foo>"
+set tserr_notag $mp:\ntag/5.0
+
+setenv_var TESTSUITE_TAG_USER_GROUP user2
+testouterr_cmd sh {avail -t tag/5.0} OK $tserr_wtag
+
+setenv_var TESTSUITE_TAG_USER_GROUP user3
+testouterr_cmd sh {avail -t tag/5.0} OK $tserr_notag
+
+setenv_var TESTSUITE_TAG_USER_GROUP user_notgroup3
+testouterr_cmd sh {avail -t tag/5.0} OK $tserr_wtag
+
+setenv_var TESTSUITE_TAG_USER_GROUP user_notgroup4
+testouterr_cmd sh {avail -t tag/5.0} OK $tserr_notag
+
+setenv_var TESTSUITE_TAG_USER_GROUP group2
+testouterr_cmd sh {avail -t tag/5.0} OK $tserr_wtag
+
+setenv_var TESTSUITE_TAG_USER_GROUP group3
+testouterr_cmd sh {avail -t tag/5.0} OK $tserr_notag
+
+setenv_var TESTSUITE_TAG_USER_GROUP group_notuser1
+testouterr_cmd sh {avail -t tag/5.0} OK $tserr_wtag
+
+setenv_var TESTSUITE_TAG_USER_GROUP group_notuser2
+testouterr_cmd sh {avail -t tag/5.0} OK $tserr_notag
+
+setenv_var TESTSUITE_TAG_USER_GROUP group_user1
+testouterr_cmd sh {avail -t tag/5.0} OK $tserr_wtag
+
+setenv_var TESTSUITE_TAG_USER_GROUP group_user2
+testouterr_cmd sh {avail -t tag/5.0} OK $tserr_wtag
+
+setenv_var TESTSUITE_TAG_USER_GROUP group_user_notuser_notgroup2
+testouterr_cmd sh {avail -t tag/5.0} OK $tserr_notag
+
+
 #
 #  Cleanup
 #