diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/rm/rest/api/impl/RMYamlUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/rm/rest/api/impl/RMYamlUnitTest.java
index 7d345ba871..2dfbb93c82 100644
--- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/rm/rest/api/impl/RMYamlUnitTest.java
+++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/rm/rest/api/impl/RMYamlUnitTest.java
@@ -43,7 +43,6 @@ public class RMYamlUnitTest extends BaseYamlUnitTest
     private static String RM_COMMUNITY_YAML_FILES_PATH = "../rm-community-rest-api-explorer/src/main/webapp/definitions";
 
     @Test
-    @Ignore
     public void validateYamlFile() throws Exception
     {
         validateYamlFiles(getYamlFilesList(RM_COMMUNITY_YAML_FILES_PATH));
diff --git a/scripts/setUpMavenPhase.sh b/scripts/setUpMavenPhase.sh
index 8171c60728..60be3bb87e 100644
--- a/scripts/setUpMavenPhase.sh
+++ b/scripts/setUpMavenPhase.sh
@@ -1,21 +1,11 @@
 #!/usr/bin/env bash
 echo "Branch name: ${TRAVIS_BRANCH}"
-echo "Branch name: ${TRAVIS_PULL_REQUEST}"
+echo "Pull request: ${TRAVIS_PULL_REQUEST}"
 
-if [ "${TRAVIS_BRANCH}" == "master" ];
-then
-    export MAVEN_PHASE="deploy"
-elif [[ ${TRAVIS_BRANCH} = release* ]];
+if [[ "${TRAVIS_BRANCH}" == "master" || "${TRAVIS_BRANCH}" = release* ]] && [ "${TRAVIS_PULL_REQUEST}" == "false" ];
 then
     export MAVEN_PHASE="deploy"
 else
     export MAVEN_PHASE="verify"
 fi
 
-# If this is pull request
-if [ "${TRAVIS_PULL_REQUEST}" != "false" ];
-then
-  export MAVEN_PHASE="verify"
-fi
-
-