diff --git a/tests/unit-tests/client-config.t.cpp b/tests/unit-tests/client-config.t.cpp
new file mode 100644
index 0000000..f9c7530
--- /dev/null
+++ b/tests/unit-tests/client-config.t.cpp
@@ -0,0 +1,72 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/**
+ * Copyright (c) 2017, Regents of the University of California.
+ *
+ * This file is part of ndncert, a certificate management system based on NDN.
+ *
+ * ndncert is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * ndncert is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received copies of the GNU General Public License along with
+ * ndncert, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * See AUTHORS.md for complete list of ndncert authors and contributors.
+ */
+
+#include "boost-test.hpp"
+#include "client-config.hpp"
+
+namespace ndn {
+namespace ndncert {
+namespace tests {
+
+BOOST_AUTO_TEST_SUITE(TestClientConfig)
+
+BOOST_AUTO_TEST_CASE(ReadConfigFile)
+{
+  ClientConfig config;
+  config.load("tests/unit-tests/client.conf.test");
+  BOOST_CHECK_EQUAL(config.m_caItems.size(), 2);
+
+  const auto& item = config.m_caItems.front();
+  BOOST_CHECK_EQUAL(item.m_caName.toUri(), "/ndn/edu/ucla/CA");
+  BOOST_CHECK_EQUAL(item.m_caInfo, "UCLA's ceritificate authority, located in BH4805.");
+  BOOST_CHECK_EQUAL(item.m_probe, "Please use your email address to apply a namespace first. UCLA email is preferred.");
+  BOOST_CHECK_EQUAL(item.m_supportedChallenges.size(), 2);
+  BOOST_CHECK_EQUAL(item.m_supportedChallenges.front(), "PIN");
+}
+
+BOOST_AUTO_TEST_CASE(AddAndRemoveCaItem)
+{
+  ClientConfig config;
+  config.load("tests/unit-tests/client.conf.test");
+
+  CaItem item;
+  item.m_caName = Name("/test");
+  item.m_caInfo = "test";
+  item.m_probe = "test";
+  std::list<std::string> list;
+  list.push_back("TEST");
+  item.m_supportedChallenges = list;
+
+  config.addNewCaItem(item);
+  BOOST_CHECK_EQUAL(config.m_caItems.size(), 3);
+  auto lastItem = config.m_caItems.back();
+  BOOST_CHECK_EQUAL(lastItem.m_caName.toUri(), "/test");
+
+  config.removeCaItem(Name("/test"));
+  BOOST_CHECK_EQUAL(config.m_caItems.size(), 2);
+  lastItem = config.m_caItems.back();
+  BOOST_CHECK_EQUAL(lastItem.m_caName.toUri(), "/ndn/edu/ucla/zhiyi/CA");
+}
+
+BOOST_AUTO_TEST_SUITE_END() // TestClientConfig
+
+} // namespace tests
+} // namespace ndncert
+} // namespace ndn
diff --git a/tests/unit-tests/client.conf.test b/tests/unit-tests/client.conf.test
new file mode 100644
index 0000000..745a43b
--- /dev/null
+++ b/tests/unit-tests/client.conf.test
@@ -0,0 +1,23 @@
+{
+  "ca-list":
+  [
+    {
+        "ca-prefix": "/ndn/edu/ucla/CA",
+        "ca-info": "UCLA's ceritificate authority, located in BH4805.",
+        "probe": "Please use your email address to apply a namespace first. UCLA email is preferred.",
+        "supported-challenges":
+        [
+            { "type": "PIN" },
+            { "type": "EMAIL" }
+        ]
+    },
+    {
+        "ca-prefix": "/ndn/edu/ucla/zhiyi/CA",
+        "ca-info": "Zhiyi's own ceritificate authority",
+        "supported-challenges":
+        [
+            { "type": "PIN" }
+        ]
+    }
+  ]
+}
\ No newline at end of file