diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index c0e986f2a3..33e61d49ea 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -5658,8 +5658,8 @@
       }
     },
     "xcode": {
-      "version": "https://github.com/NativeScript/node-xcode/archive/NativeScript-1.5.0.tar.gz",
-      "integrity": "sha512-2q3ALXJ/kyJht3TyQxfYpMLbWkoB0ndcp3gl9Jj03CQxrFeFRc6xiFPnye29QSnlAkzx83JRfOUgyZNcXjsr7g==",
+      "version": "https://github.com/NativeScript/node-xcode/archive/NativeScript-1.5.1.tar.gz",
+      "integrity": "sha512-YIj7RSd4onuBYp2CAxFaO5zm+q59AyqRbng+fKb0Schwj+23xKM2AmtuVzg/XrC5eFUEBnIznVDT+pRMzUy5RQ==",
       "requires": {
         "node-uuid": "1.3.3",
         "pegjs": "0.6.2"
diff --git a/package.json b/package.json
index 8376304cbc..2c768d4b98 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "uuid": "3.0.1",
     "winreg": "0.0.17",
     "ws": "5.1.0",
-    "xcode": "https://github.com/NativeScript/node-xcode/archive/NativeScript-1.5.0.tar.gz",
+    "xcode": "https://github.com/NativeScript/node-xcode/archive/NativeScript-1.5.1.tar.gz",
     "xml2js": "0.4.19",
     "xmldom": "0.1.21",
     "xmlhttprequest": "https://github.com/telerik/node-XMLHttpRequest/tarball/master",
diff --git a/test/ios-project-service.ts b/test/ios-project-service.ts
index 12eef30b8a..16aca624d1 100644
--- a/test/ios-project-service.ts
+++ b/test/ios-project-service.ts
@@ -548,7 +548,9 @@ describe("Source code in plugin support", () => {
 					assert.notEqual(pbxFileReferenceValues.indexOf(basename), -1, `${basename} not added to PBXFileRefereces`);
 
 					if (shouldBeAdded && !path.extname(basename).startsWith(".h")) {
-						assert.isDefined(buildPhaseFiles.find((fileObject: any) => fileObject.comment.startsWith(basename)), `${basename} not added to PBXSourcesBuildPhase`);
+						const buildPhaseFile = buildPhaseFiles.find((fileObject: any) => fileObject.comment.startsWith(basename));
+						assert.isDefined(buildPhaseFile, `${basename} not added to PBXSourcesBuildPhase`);
+						assert.include(buildPhaseFile.comment, "in Sources", `${basename} must be added to Sources group`);
 					}
 				} else {
 					assert.equal(pbxFileReferenceValues.indexOf(basename), -1, `${basename} was added to PBXFileRefereces, but it shouldn't have been`);
@@ -566,11 +568,19 @@ describe("Source code in plugin support", () => {
 
 			const pbxFileReference = pbxProj.hash.project.objects.PBXFileReference;
 			const pbxFileReferenceValues = Object.keys(pbxFileReference).map(key => pbxFileReference[key]);
+			const buildPhaseFiles = pbxProj.hash.project.objects.PBXResourcesBuildPhase["858B842C18CA22B800AB12DE"].files;
 
 			resFileNames.forEach(filename => {
 				const dirName = path.dirname(filename);
 				const fileToCheck = dirName.endsWith(".bundle") ? dirName : filename;
-				assert.isTrue(pbxFileReferenceValues.indexOf(path.basename(fileToCheck)) !== -1, `Resource ${filename} not added to PBXFileRefereces`);
+				const basename = path.basename(fileToCheck);
+
+				assert.isTrue(pbxFileReferenceValues.indexOf(basename) !== -1, `Resource ${filename} not added to PBXFileRefereces`);
+
+				const buildPhaseFile = buildPhaseFiles.find((fileObject: any) => fileObject.comment.startsWith(basename));
+				assert.isDefined(buildPhaseFile, `${fileToCheck} not added to PBXResourcesBuildPhase`);
+				assert.include(buildPhaseFile.comment, "in Resources", `${fileToCheck} must be added to Resources group`);
+
 			});
 		});
 	}