diff --git a/client/src/cbltest/greenboarduploader.py b/client/src/cbltest/greenboarduploader.py
index d54f2545..af398a7b 100644
--- a/client/src/cbltest/greenboarduploader.py
+++ b/client/src/cbltest/greenboarduploader.py
@@ -41,7 +41,7 @@ def pytest_runtest_makereport(self, item: pytest.Item, call: pytest.CallInfo[Non
         elif report.failed:
             self.__fail_count += 1
 
-    def upload(self, platform: str, version: str, sgw_version: str):
+    def upload(self, platform: str, os_name: str, version: str, sgw_version: str):
         """
         Uploads the results using the specified platform and version.  The reason that they
         are specified here is because they are probably unknown at the time that this object
@@ -76,5 +76,6 @@ def upload(self, platform: str, version: str, sgw_version: str):
             "failCount": self.__fail_count,
             "passCount": self.__pass_count,
             "platform": platform,
+            "os": os_name, 
             "uploaded": unix_timestamp
         })
\ No newline at end of file
diff --git a/tests/conftest.py b/tests/conftest.py
index d8235599..f2d93651 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -86,7 +86,8 @@ async def greenboard(cblpytest: CBLPyTest, pytestconfig: pytest.Config):
     
     test_server_info = await cblpytest.test_servers[0].get_info()
     sgw_version = await cblpytest.sync_gateways[0].get_version()
-    uploader.upload(test_server_info.cbl, test_server_info.library_version, f"{sgw_version.version}-{sgw_version.build_number}")
+    os_name = test_server_info.device["systemName"] if "systemName" in test_server_info.device else ""
+    uploader.upload(test_server_info.cbl, os_name, test_server_info.library_version, f"{sgw_version.version}-{sgw_version.build_number}")
     pytestconfig.pluginmanager.unregister(uploader)
 
 # This is used to inject the full path to the dataset folder