diff --git a/unit_tests/test_broker.py b/unit_tests/test_broker.py
index 97c5486..9a47830 100644
--- a/unit_tests/test_broker.py
+++ b/unit_tests/test_broker.py
@@ -14,6 +14,7 @@
 
 import json
 import unittest
+import textwrap
 
 from unittest.mock import patch, ANY
 
@@ -863,3 +864,85 @@ class CephBrokerTestCase(unittest.TestCase):
             }
         )
         mock_create_erasure_profile.assert_not_called()
+
+    @patch.object(charms_ceph.broker, 'get_cephfs')
+    @patch.object(charms_ceph.broker, 'check_output')
+    @patch.object(charms_ceph.broker, 'log')
+    def test_create_cephfs_client(self, mock_log, check_output, get_cephfs):
+        def mock_check_output(*args, **kwargs):
+            cmd = args[0]
+            if cmd[:5] == ["ceph", "--id", "admin", "auth", "ls"]:
+                return textwrap.dedent("""
+                {
+                    "auth_dump": [
+                        {
+                            "entity": "mds.ceph-fs",
+                            "key": "mds-key",
+                            "caps": {
+                                "mds": "allow",
+                                "mon": "allow rwx",
+                                "osd": "allow *"
+                            }
+                        },
+                        {
+                            "entity": "mds.filesystem",
+                            "key": "fs-key",
+                            "caps": {
+                                "mds": "allow",
+                                "mon": "allow rwx",
+                                "osd": "allow *"
+                            }
+                        },
+                        {
+                            "entity": "client.other-client",
+                            "key": "other-client-key",
+                            "caps": {
+                                "mds": "allow rw fsname=filesystem",
+                                "mon": "allow r fsname=filesystem",
+                                "osd": "allow rw tag cephfs data=filesystem"
+                            }
+                        }
+                    ]
+                }
+                """)
+            elif cmd[:9] == ["ceph",
+                             "--id",
+                             "admin",
+                             "fs",
+                             "authorize",
+                             "filesystem",
+                             "client.fs-client",
+                             "/",
+                             "rw"
+                             ]:
+                return textwrap.dedent("""
+                [
+                    {
+                        "entity": "client.fs-client",
+                        "key": "fs-client-key",
+                        "caps": {
+                            "mds": "allow rw fsname=filesystem",
+                            "mon": "allow r fsname=filesystem",
+                            "osd": "allow rw tag cephfs data=filesystem"
+                        }
+                    }
+                ]
+                """)
+            return unittest.mock.DEFAULT
+
+        get_cephfs.return_value = ["filesystem"]
+        check_output.side_effect = mock_check_output
+        reqs = json.dumps({'api-version': 1,
+                           'request-id': '1ef5aede',
+                           'ops': [{
+                               'op': 'create-cephfs-client',
+                               'fs_name': 'filesystem',
+                               'client_id': 'fs-client',
+                               'path': '/',
+                               'perms': 'rw',
+                           }]})
+        rc = json.loads(charms_ceph.broker.process_requests(reqs))
+        get_cephfs.assert_called_once_with(service='admin')
+        self.assertEqual(rc['exit-code'], 0)
+        self.assertEqual(rc['request-id'], '1ef5aede')
+        self.assertEqual(rc['key'], 'fs-client-key')