diff --git a/mayan/apps/navigation/apps.py b/mayan/apps/navigation/apps.py
index c2f5ddb53c..e529d10406 100644
--- a/mayan/apps/navigation/apps.py
+++ b/mayan/apps/navigation/apps.py
@@ -1,9 +1,11 @@
 from __future__ import unicode_literals
 
-from django import apps
 from django.utils.translation import ugettext_lazy as _
 
+from common.apps import MayanAppConfig
 
-class NavigationApp(apps.AppConfig):
+
+class NavigationApp(MayanAppConfig):
     name = 'navigation'
+    test = True
     verbose_name = _('Navigation')
diff --git a/mayan/apps/navigation/classes.py b/mayan/apps/navigation/classes.py
index 95664a7ace..dcf55d0c3b 100644
--- a/mayan/apps/navigation/classes.py
+++ b/mayan/apps/navigation/classes.py
@@ -222,6 +222,13 @@ class Link(object):
         current_path = request.META['PATH_INFO']
         current_view = resolve(current_path).view_name
 
+        # ACL is tested agains the resolved_object or just {{ object }} if not
+        if not resolved_object:
+            try:
+                resolved_object = Variable('object').resolve(context=context)
+            except VariableDoesNotExist:
+                pass
+
         # If this link has a required permission check that the user have it
         # too
         if self.permissions:
diff --git a/mayan/apps/navigation/tests/__init__.py b/mayan/apps/navigation/tests/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/mayan/apps/navigation/tests/test_classes.py b/mayan/apps/navigation/tests/test_classes.py
new file mode 100644
index 0000000000..4a9e67a8d7
--- /dev/null
+++ b/mayan/apps/navigation/tests/test_classes.py
@@ -0,0 +1,121 @@
+from __future__ import absolute_import, unicode_literals
+
+from django.conf.urls import include, url
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import Group
+from django.contrib.contenttypes.models import ContentType
+from django.core.files.base import File
+from django.core.urlresolvers import reverse
+from django.http import HttpResponse
+from django.template import Context, Template
+
+from mayan.urls import urlpatterns
+
+from acls.models import AccessControlList
+from common.tests.test_views import GenericViewTestCase
+from permissions import Permission, PermissionNamespace
+from user_management.tests import TEST_USER_PASSWORD, TEST_USER_USERNAME
+
+from ..classes import Link
+
+TEST_OBJECT = None
+TEST_PERMISSION_NAMESPACE_NAME = 'test namespace name'
+TEST_PERMISSION_NAMESPACE_TEXT = 'test namespace text'
+TEST_PERMISSION_NAME = 'test permission name'
+TEST_PERMISSION_LABEL = 'test permission label'
+TEST_LINK_TEXT = 'test link text'
+TEST_VIEW_URL = 'test-view-url'
+TEST_VIEW_NAME = 'test view name'
+
+
+def test_view(request):
+    template = Template('{{ object }}')
+    context = Context({'object': TEST_OBJECT})
+    return HttpResponse(template.render(context=context))
+
+
+urlpatterns += (url(TEST_VIEW_URL, test_view, name=TEST_VIEW_NAME),)
+
+
+class LinkClassTestCase(GenericViewTestCase):
+    def setUp(self):
+        super(LinkClassTestCase, self).setUp()
+
+        global TEST_OBJECT
+        TEST_OBJECT = self.group
+
+        self.namespace = PermissionNamespace(
+            TEST_PERMISSION_NAMESPACE_NAME, TEST_PERMISSION_NAMESPACE_TEXT
+        )
+
+        self.permission = self.namespace.add_permission(
+            name=TEST_PERMISSION_NAME, label=TEST_PERMISSION_LABEL
+        )
+
+        self.link = Link(text=TEST_LINK_TEXT, view=TEST_VIEW_NAME)
+        Permission.invalidate_cache()
+
+    def test_link_resolve(self):
+        response = self.get(TEST_VIEW_NAME)
+        context = Context({'request': response.wsgi_request})
+
+        resolved_link = self.link.resolve(context=context)
+
+        self.assertEqual(resolved_link.url, reverse(TEST_VIEW_NAME))
+
+    def test_link_permission_resolve_no_permission(self):
+        self.login(
+            username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD
+        )
+
+        link = Link(permissions=(self.permission,), text=TEST_LINK_TEXT, view=TEST_VIEW_NAME)
+
+        response = self.get(TEST_VIEW_NAME)
+        response.context.update({'request': response.wsgi_request})
+        context = Context(response.context)
+
+        resolved_link = link.resolve(context=context)
+
+        self.assertEqual(resolved_link, None)
+
+    def test_link_permission_resolve_with_permission(self):
+        self.login(
+            username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD
+        )
+
+        link = Link(permissions=(self.permission,), text=TEST_LINK_TEXT, view=TEST_VIEW_NAME)
+
+        self.role.permissions.add(self.permission.stored_permission)
+
+        response = self.get(TEST_VIEW_NAME)
+        response.context.update({'request': response.wsgi_request})
+        context = Context(response.context)
+
+        resolved_link = link.resolve(context=context)
+
+        self.assertEqual(resolved_link.url, reverse(TEST_VIEW_NAME))
+
+    def test_link_permission_resolve_with_acl(self):
+        # ACL is tested agains the resolved_object or just {{ object }} if not
+        self.login(
+            username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD
+        )
+
+        link = Link(
+            permissions=(self.permission,), text=TEST_LINK_TEXT,
+            view=TEST_VIEW_NAME
+        )
+
+        acl = AccessControlList.objects.create(
+            content_object=TEST_OBJECT, role=self.role
+        )
+        acl.permissions.add(self.permission.stored_permission)
+
+        response = self.get(TEST_VIEW_NAME)
+        response.context.update({'request': response.wsgi_request})
+        context = Context(response.context)
+
+        resolved_link = link.resolve(context=context)
+
+        self.assertNotEqual(resolved_link, None)
+        self.assertEqual(resolved_link.url, reverse(TEST_VIEW_NAME))