diff --git a/seahub/api2/endpoints/admin/license.py b/seahub/api2/endpoints/admin/license.py
index 7c7313dcc4..bef17a3ff9 100644
--- a/seahub/api2/endpoints/admin/license.py
+++ b/seahub/api2/endpoints/admin/license.py
@@ -31,7 +31,7 @@ class AdminLicense(APIView):
             return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
 
         file_type, ext = get_file_type_and_ext(license_file.name)
-        if file_type != 'txt':
+        if ext != 'txt':
             error_msg = file_type_error_msg(ext, 'txt')
             return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
 
diff --git a/tests/api/endpoints/admin/test_favicon.py b/tests/api/endpoints/admin/test_favicon.py
index 1f7cbe4d0c..27edb0092e 100644
--- a/tests/api/endpoints/admin/test_favicon.py
+++ b/tests/api/endpoints/admin/test_favicon.py
@@ -5,6 +5,9 @@ from tests.common.common import BASE_URL
 from django.core.urlresolvers import reverse
 
 from seahub.test_utils import BaseTestCase
+from seahub.utils import PREVIEW_FILEEXT
+from seahub.utils.file_types import IMAGE
+from seahub.utils.error_msg import file_type_error_msg
 from seahub.settings import MEDIA_ROOT, CUSTOM_FAVICON_PATH
 
 class AdminFaviconTest(BaseTestCase):
@@ -58,4 +61,4 @@ class AdminFaviconTest(BaseTestCase):
             resp = self.client.post(logo_url, {'favicon': f})
         json_resp = json.loads(resp.content)
         assert resp.status_code == 400
-        assert json_resp['error_msg'] == "Filetype not allowed."
+        assert json_resp['error_msg'] == file_type_error_msg('noico', PREVIEW_FILEEXT.get(IMAGE))
diff --git a/tests/api/endpoints/admin/test_license.py b/tests/api/endpoints/admin/test_license.py
index 2c6a7f641a..dfd30856e1 100644
--- a/tests/api/endpoints/admin/test_license.py
+++ b/tests/api/endpoints/admin/test_license.py
@@ -5,6 +5,7 @@ from django.core.urlresolvers import reverse
 
 from seahub.api2.endpoints.admin import license as license_api
 from seahub.settings import LICENSE_PATH
+from seahub.utils.error_msg import file_type_error_msg
 from seahub.test_utils import BaseTestCase
 from tests.common.utils import urljoin
 from tests.common.common import BASE_URL
@@ -42,5 +43,5 @@ class AdminLicenseTest(BaseTestCase):
             resp = self.client.post(url, {'license': f})
         json_resp = json.loads(resp.content)
         assert 400 == resp.status_code
-        assert "Filetype not allowed." == json_resp['error_msg']
+        assert file_type_error_msg('notxt', 'txt') == json_resp['error_msg']
 
diff --git a/tests/api/endpoints/admin/test_login_bg_image.py b/tests/api/endpoints/admin/test_login_bg_image.py
index e6cc6298a2..b7f22800ff 100644
--- a/tests/api/endpoints/admin/test_login_bg_image.py
+++ b/tests/api/endpoints/admin/test_login_bg_image.py
@@ -6,6 +6,9 @@ from django.core.urlresolvers import reverse
 
 from seahub.test_utils import BaseTestCase
 from seahub.settings import MEDIA_ROOT, CUSTOM_LOGO_PATH
+from seahub.utils.file_types import IMAGE
+from seahub.utils import PREVIEW_FILEEXT
+from seahub.utils.error_msg import file_type_error_msg
 
 
 class AdminLogoTest(BaseTestCase):
@@ -62,4 +65,4 @@ class AdminLogoTest(BaseTestCase):
 
         os.remove(image_file)
         assert 400 == resp.status_code
-        assert json_resp['error_msg'] == "Filetype not allowed."
+        assert json_resp['error_msg'] == file_type_error_msg("noimage", PREVIEW_FILEEXT.get('Image'))
diff --git a/tests/api/endpoints/admin/test_logo.py b/tests/api/endpoints/admin/test_logo.py
index 4cac54e4dd..b749356bd8 100644
--- a/tests/api/endpoints/admin/test_logo.py
+++ b/tests/api/endpoints/admin/test_logo.py
@@ -6,6 +6,9 @@ from django.core.urlresolvers import reverse
 
 from seahub.test_utils import BaseTestCase
 from seahub.settings import MEDIA_ROOT, CUSTOM_LOGO_PATH
+from seahub.utils import PREVIEW_FILEEXT
+from seahub.utils.file_types import IMAGE
+from seahub.utils.error_msg import file_type_error_msg
 
 
 class AdminLogoTest(BaseTestCase):
@@ -62,4 +65,4 @@ class AdminLogoTest(BaseTestCase):
 
         os.remove(logo_file)
         assert 400 == resp.status_code
-        assert json_resp['error_msg'] == "Filetype not allowed."
+        assert json_resp['error_msg'] == file_type_error_msg('noimage', PREVIEW_FILEEXT.get(IMAGE))