diff --git a/superset/views.py b/superset/views.py
index 88bdb6ed99812..cfdccfe45f978 100755
--- a/superset/views.py
+++ b/superset/views.py
@@ -205,7 +205,8 @@ def check_ownership(obj, raise_if_false=True):
 
 def get_user_roles():
     if g.user.is_anonymous():
-        return [appbuilder.sm.find_role('Public')]
+        public_role = config.get('AUTH_ROLE_PUBLIC')
+        return [appbuilder.sm.find_role(public_role)] if public_role else []
     return g.user.roles
 
 
diff --git a/tests/superset_test_config.py b/tests/superset_test_config.py
index 43ba500a35530..1e65d2b0ca357 100644
--- a/tests/superset_test_config.py
+++ b/tests/superset_test_config.py
@@ -20,7 +20,7 @@
 SECRET_KEY = 'thisismyscretkey'
 WTF_CSRF_ENABLED = False
 PUBLIC_ROLE_LIKE_GAMMA = True
-
+AUTH_ROLE_PUBLIC = 'Public'
 
 class CeleryConfig(object):
     BROKER_URL = 'sqla+sqlite:///' + SQL_CELERY_DB_FILE_PATH