diff --git a/freezer_api/tests/unit/common.py b/freezer_api/tests/unit/common.py
index 9ca94595..5f7acb3f 100644
--- a/freezer_api/tests/unit/common.py
+++ b/freezer_api/tests/unit/common.py
@@ -304,6 +304,14 @@ fake_client_entry_1 = {
     "user_id": "user_id-is-provided-keystone"
 }
 
+
+def get_fake_client_0():
+    return copy.deepcopy(fake_client_entry_0)
+
+
+def get_fake_client_1():
+    return copy.deepcopy(fake_client_entry_1)
+
 fake_action_0 = {
     "freezer_action":
         {
diff --git a/freezer_api/tests/unit/sqlalchemy/test_client.py b/freezer_api/tests/unit/sqlalchemy/test_client.py
new file mode 100644
index 00000000..3f018d6b
--- /dev/null
+++ b/freezer_api/tests/unit/sqlalchemy/test_client.py
@@ -0,0 +1,58 @@
+# (c) Copyright 2018 ZTE Corporation.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""Tests for manipulating  Client via the DB API"""
+
+
+import copy
+
+from freezer_api.tests.unit import common
+from freezer_api.tests.unit.sqlalchemy import base
+
+
+class DbClientTestCase(base.DbTestCase):
+
+    def setUp(self):
+        super(DbClientTestCase, self).setUp()
+        self.fake_client_0 = common.get_fake_client_0()
+        self.fake_client_doc = self.fake_client_0.get('client')
+
+    def test_add_and_get_client(self):
+        client_doc = copy.deepcopy(self.fake_client_doc)
+        client_id = self.dbapi.add_client(user_id=self.fake_client_0.
+                                          get('user_id'),
+                                          doc=client_doc,
+                                          project_id="myproject")
+        self.assertIsNotNone(client_id)
+
+        result = self.dbapi.get_client(project_id="myproject",
+                                       user_id=self.fake_client_0.
+                                       get('user_id'),
+                                       client_id=client_id)
+
+        self.assertIsNotNone(result)
+
+        self.assertEqual(len(result), 1)
+
+        self.assertEqual(result[0].get('user_id'),
+                         self.fake_client_0.get('user_id'))
+
+        client = result[0].get('client')
+
+        self.assertEqual(client.get('client_id'),
+                         self.fake_client_doc.get('client_id'))
+
+        self.assertEqual(client.get('description'),
+                         self.fake_client_doc.get('description'))