diff --git a/testbed/authentication/.env b/testbed/authentication/.env
new file mode 100644
index 000000000..cda3f6268
--- /dev/null
+++ b/testbed/authentication/.env
@@ -0,0 +1 @@
+COMPOSE_PROJECT_NAME=shibui-test
diff --git a/testbed/authentication/directory/999_users.ldif b/testbed/authentication/directory/999_users.ldif
index 2beedb37f..c4f611bf6 100644
--- a/testbed/authentication/directory/999_users.ldif
+++ b/testbed/authentication/directory/999_users.ldif
@@ -50,6 +50,7 @@ businessCategory:Law
 userPassword: password
 eduPersonAffiliation: member
 eduPersonAffiliation: student
+eduPersonEntitlement: ROLE_ADMIN
 
 dn: uid=whenderson,ou=People,dc=unicon,dc=local
 objectClass: organizationalPerson
@@ -65,6 +66,7 @@ mail: whenderson@unicon.local
 businessCategory:Advising
 userPassword: password
 eduPersonAffiliation: community
+eduPersonEntitlement: ROLE_USER
 
 dn: uid=ddavis,ou=People,dc=unicon,dc=local
 objectClass: organizationalPerson
diff --git a/testbed/authentication/shibboleth-idp/config/shib-idp/conf/attribute-filter.xml b/testbed/authentication/shibboleth-idp/config/shib-idp/conf/attribute-filter.xml
index d4d57250a..57dc7eeeb 100644
--- a/testbed/authentication/shibboleth-idp/config/shib-idp/conf/attribute-filter.xml
+++ b/testbed/authentication/shibboleth-idp/config/shib-idp/conf/attribute-filter.xml
@@ -129,6 +129,9 @@
         <AttributeRule attributeID="mail">
             <PermitValueRule xsi:type="ANY" />
         </AttributeRule>
+        <AttributeRule attributeID="eduPersonEntitlement">
+            <PermitValueRule xsi:type="ANY" />
+        </AttributeRule>
     </AttributeFilterPolicy>
 
     <!-- Attribute release for all InCommon SPs -->