diff --git a/web/src/test/java/lcsb/mapviewer/web/CommentControllerIntegrationTestWithoutTransaction.java b/web/src/test/java/lcsb/mapviewer/web/CommentControllerIntegrationTestWithoutTransaction.java
index 5a3005d70176dba9bf692fa6511ad76f5c649fe5..cc201fa3cf99971d4c0f72dd6a017a7d012b0b58 100644
--- a/web/src/test/java/lcsb/mapviewer/web/CommentControllerIntegrationTestWithoutTransaction.java
+++ b/web/src/test/java/lcsb/mapviewer/web/CommentControllerIntegrationTestWithoutTransaction.java
@@ -16,8 +16,6 @@ import org.springframework.test.web.servlet.RequestBuilder;
 @Rollback
 public class CommentControllerIntegrationTestWithoutTransaction extends ControllerIntegrationTest {
 
-  private static final String BUILT_IN_TEST_ADMIN_PASSWORD = "admin";
-  private static final String BUILT_IN_TEST_ADMIN_LOGIN = "admin";
   Logger logger = LogManager.getLogger();
 
   @Before
diff --git a/web/src/test/java/lcsb/mapviewer/web/ControllerIntegrationTest.java b/web/src/test/java/lcsb/mapviewer/web/ControllerIntegrationTest.java
index 1a3ad7b6a86e18b7f8fe99a92c6ca335f3bea6ce..a966faf2a7827e9f55639b9c5e795086661d8dc9 100644
--- a/web/src/test/java/lcsb/mapviewer/web/ControllerIntegrationTest.java
+++ b/web/src/test/java/lcsb/mapviewer/web/ControllerIntegrationTest.java
@@ -51,6 +51,9 @@ import lcsb.mapviewer.web.config.SpringWebConfig;
 @ContextConfiguration(classes = SpringWebConfig.class)
 abstract public class ControllerIntegrationTest {
 
+  protected static final String BUILT_IN_TEST_ADMIN_PASSWORD = "admin";
+  protected static final String BUILT_IN_TEST_ADMIN_LOGIN = "admin";
+
   @Rule
   public UnitTestFailedWatcher unitTestFailedWatcher = new UnitTestFailedWatcher();
   protected MockMvc mockMvc;
diff --git a/web/src/test/java/lcsb/mapviewer/web/MapControllerIntegrationTest.java b/web/src/test/java/lcsb/mapviewer/web/MapControllerIntegrationTest.java
index 1c02f73f51059eceea9bde86d5ccd0726eb8fe10..80f1ccf3a2eaf9fdee8984f914e8d3dea4cef335 100644
--- a/web/src/test/java/lcsb/mapviewer/web/MapControllerIntegrationTest.java
+++ b/web/src/test/java/lcsb/mapviewer/web/MapControllerIntegrationTest.java
@@ -11,6 +11,7 @@ import org.junit.*;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
+import org.springframework.mock.web.MockHttpSession;
 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.web.servlet.RequestBuilder;
@@ -76,6 +77,19 @@ public class MapControllerIntegrationTest extends ControllerIntegrationTest {
     assertTrue("user should be able to access elements", elements > 0);
   }
 
+  @Test
+  public void testGetAllElementsForUndefinedProject() throws Exception {
+    MockHttpSession session = createSession(ControllerIntegrationTest.BUILT_IN_TEST_ADMIN_LOGIN,
+        ControllerIntegrationTest.BUILT_IN_TEST_ADMIN_PASSWORD);
+    
+    RequestBuilder request = get("/projects/*/models/*/bioEntities/elements/")
+        .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+        .session(session);
+
+    mockMvc.perform(request)
+        .andExpect(status().isNotFound());
+  }
+
   @Test
   public void testSearchBioEntitiesAsAnonymous() throws Exception {
     userService.grantUserPrivilege(anonymous, PrivilegeType.READ_PROJECT, project.getProjectId());