diff --git a/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageCoreTests.java b/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageCoreTests.java
index 790311f74..a3eb00c04 100644
--- a/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageCoreTests.java
+++ b/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageCoreTests.java
@@ -38,7 +38,10 @@ public class GetProcessDefinitionImageCoreTests extends RestTest
         restClient.withWorkflowAPI()
                 .usingProcessDefinitions(randomProcessDefinition).getProcessDefinitionImage();
         restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND)
-                .assertLastError().containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, "invalidID"));
+                .assertLastError().containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, "invalidID"))
+                .containsErrorKey(RestErrorModel.ENTITY_NOT_FOUND_ERRORKEY)
+                .descriptionURLIs(RestErrorModel.RESTAPIEXPLORER)
+                .stackTraceIs(RestErrorModel.STACKTRACE);
     }
 
     @TestRail(section = { TestGroup.REST_API, TestGroup.PROCESS_DEFINITION },
diff --git a/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageFullTests.java b/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageFullTests.java
new file mode 100644
index 000000000..009284b61
--- /dev/null
+++ b/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageFullTests.java
@@ -0,0 +1,62 @@
+package org.alfresco.rest.workflow.processDefinitions;
+
+import org.alfresco.rest.RestTest;
+import org.alfresco.rest.model.RestErrorModel;
+import org.alfresco.rest.model.RestProcessDefinitionModel;
+import org.alfresco.utility.model.TestGroup;
+import org.alfresco.utility.model.UserModel;
+import org.alfresco.utility.report.Bug;
+import org.alfresco.utility.testrail.ExecutionType;
+import org.alfresco.utility.testrail.annotation.TestRail;
+import org.springframework.http.HttpStatus;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+/**
+ * Created by Claudia Agache on 2/1/2017.
+ */
+public class GetProcessDefinitionImageFullTests extends RestTest
+{
+    private UserModel adminUser;
+    private RestProcessDefinitionModel randomProcessDefinition;
+
+    @BeforeClass(alwaysRun = true)
+    public void dataPreparation() throws Exception
+    {
+        adminUser = dataUser.getAdminUser();
+    }
+
+    @Bug(id = "REPO-1911")
+    @TestRail(section = { TestGroup.REST_API, TestGroup.PROCESS_DEFINITION },
+            executionType = ExecutionType.REGRESSION,
+            description = "Verify if get process definition image returns status code 404 when empty processDefinitionId is used")
+    @Test(groups = { TestGroup.REST_API, TestGroup.WORKFLOW, TestGroup.PROCESS_DEFINITION, TestGroup.CORE })
+    public void getProcessDefinitionImageUsingEmptyProcessDefinitionId() throws Exception
+    {
+        restClient.authenticateUser(adminUser);
+        randomProcessDefinition = restClient.withWorkflowAPI().getAllProcessDefinitions().getOneRandomEntry();
+        randomProcessDefinition.onModel().setId("");
+        restClient.withWorkflowAPI()
+                .usingProcessDefinitions(randomProcessDefinition).getProcessDefinitionImage();
+        restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST);
+    }
+
+    @TestRail(section = { TestGroup.REST_API, TestGroup.PROCESS_DEFINITION },
+            executionType = ExecutionType.REGRESSION,
+            description = "Verify Tenant User doesn't get process definition image for another network deployment using REST API")
+    @Test(groups = { TestGroup.REST_API, TestGroup.WORKFLOW, TestGroup.PROCESS_DEFINITION, TestGroup.FULL, TestGroup.NETWORKS })
+    public void networkUserIsNotAbleToGetProcessDefinitionImageForAnotherNetwork() throws Exception
+    {
+        UserModel adminTenantUser1 = UserModel.getAdminTenantUser();
+        UserModel adminTenantUser2 = UserModel.getAdminTenantUser();
+        restClient.authenticateUser(adminUser).usingTenant().createTenant(adminTenantUser1);
+        restClient.usingTenant().createTenant(adminTenantUser2);
+
+        RestProcessDefinitionModel randomProcessDefinition = restClient.authenticateUser(adminTenantUser1).withWorkflowAPI()
+                .getAllProcessDefinitions().getOneRandomEntry();
+        restClient.authenticateUser(adminTenantUser2).withWorkflowAPI()
+                .usingProcessDefinitions(randomProcessDefinition).getProcessDefinitionImage();
+        restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND)
+                .assertLastError().containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, randomProcessDefinition.onModel().getId()));
+    }
+}