diff --git a/nsswitch/tests/test_wbinfo_user_info.sh b/nsswitch/tests/test_wbinfo_user_info.sh
index 8158ead5a4b..c699a30538f 100755
--- a/nsswitch/tests/test_wbinfo_user_info.sh
+++ b/nsswitch/tests/test_wbinfo_user_info.sh
@@ -4,7 +4,7 @@
 
 if [ $# -lt 6 ]; then
 cat <<EOF
-Usage: $(basename $0) DOMAIN REALM OWN_DOMAIN USERNAME1 UPN_NAME1 USERNAME2 UPN_NAME2
+Usage: $(basename $0) DOMAIN REALM OWN_DOMAIN USERNAME1 UPN_NAME1 USERNAME2 UPN_NAME2 ENVNAME
 EOF
 exit 1;
 fi
@@ -16,7 +16,8 @@ USERNAME1=$4
 UPN_NAME1=$5
 USERNAME2=$6
 UPN_NAME2=$7
-shift 6
+ENVNAME=$8
+shift 7
 
 failed=0
 
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 20b96762e7a..720485db7db 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -242,13 +242,13 @@ env = "ad_member:local"
 plantestsuite("samba3.wbinfo_user_info", env,
               [os.path.join(srcdir(),
                             "nsswitch/tests/test_wbinfo_user_info.sh"),
-               '$DOMAIN', '$REALM', '$DOMAIN', 'alice', 'alice', 'jane', 'jane.doe'])
+               '$DOMAIN', '$REALM', '$DOMAIN', 'alice', 'alice', 'jane', 'jane.doe', env])
 
 env = "fl2008r2dc:local"
 plantestsuite("samba3.wbinfo_user_info", env,
               [os.path.join(srcdir(),
                             "nsswitch/tests/test_wbinfo_user_info.sh"),
-               '$TRUST_DOMAIN', '$TRUST_REALM', '$DOMAIN', 'alice', 'alice', 'jane', 'jane.doe'])
+               '$TRUST_DOMAIN', '$TRUST_REALM', '$DOMAIN', 'alice', 'alice', 'jane', 'jane.doe', env])
 
 env = "ad_member"
 t = "WBCLIENT-MULTI-PING"