diff --git a/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/packages/MetadataTest.java b/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/packages/MetadataTest.java
index 32bcca197861..ec75c19216d1 100644
--- a/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/packages/MetadataTest.java
+++ b/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/packages/MetadataTest.java
@@ -35,6 +35,7 @@
  */
 public class MetadataTest {
 
+    private static final String ORG_NAME = "orgName";
     private static final String PACKAGE_NAME = "packageName";
     private static final String PATH = "path";
     private static final String KIND = "kind";
@@ -76,11 +77,21 @@ private void compareResponse(String projectName, String response) {
             Assert.assertNull(responseJsonObject.getAsJsonPrimitive(PACKAGE_NAME),
                     "Package MetadataTest " + PACKAGE_NAME + " fails with " + projectName + " test case.");
         }
-        Assert.assertEquals(responseJsonObject.getAsJsonPrimitive(KIND),
-                expectedJsonObject.getAsJsonPrimitive(KIND),
+
+        JsonPrimitive projectKind = expectedJsonObject.getAsJsonPrimitive(KIND);
+        Assert.assertEquals(responseJsonObject.getAsJsonPrimitive(KIND), projectKind,
                 "Package MetadataTest " + KIND + " fails with " + projectName + " test case.");
         Assert.assertNotNull(responseJsonObject.getAsJsonPrimitive(PATH),
                 "Package MetadataTest " + PATH + " fails with " + projectName + " test case.");
+
+        Assert.assertNotNull(responseJsonObject.getAsJsonPrimitive(ORG_NAME),
+                "Package MetadataTest " + ORG_NAME + " fails with " + projectName + " test case.");
+
+        if (projectKind != null && !"SINGLE_FILE_PROJECT".equals(projectKind.getAsString())) {
+            Assert.assertEquals(responseJsonObject.getAsJsonPrimitive(ORG_NAME),
+                    expectedJsonObject.getAsJsonPrimitive(ORG_NAME),
+                    "Package MetadataTest " + ORG_NAME + " fails with " + projectName + " test case.");
+        }
     }
 
     @AfterClass
diff --git a/language-server/modules/langserver-core/src/test/resources/packages/metadata/project-functions_expected.json b/language-server/modules/langserver-core/src/test/resources/packages/metadata/project-functions_expected.json
index 5dbb406670cb..784b48a82725 100644
--- a/language-server/modules/langserver-core/src/test/resources/packages/metadata/project-functions_expected.json
+++ b/language-server/modules/langserver-core/src/test/resources/packages/metadata/project-functions_expected.json
@@ -1,4 +1,5 @@
 {
+  "orgName": "wso2",
   "packageName": "project_functions",
   "kind": "BUILD_PROJECT",
   "path": "file:///"
diff --git a/language-server/modules/langserver-core/src/test/resources/packages/metadata/project-services_expected.json b/language-server/modules/langserver-core/src/test/resources/packages/metadata/project-services_expected.json
index b4f44e944415..362957d983e5 100644
--- a/language-server/modules/langserver-core/src/test/resources/packages/metadata/project-services_expected.json
+++ b/language-server/modules/langserver-core/src/test/resources/packages/metadata/project-services_expected.json
@@ -1,4 +1,5 @@
 {
+  "orgName": "bob",
   "packageName": "project_services",
   "kind": "BUILD_PROJECT",
   "path": "file:///"