diff --git a/test/openpower-pels/Makefile.include b/test/openpower-pels/Makefile.include
index 2bed701..a700a50 100644
--- a/test/openpower-pels/Makefile.include
+++ b/test/openpower-pels/Makefile.include
@@ -9,6 +9,7 @@
 	fru_identity_test \
 	generic_section_test \
 	host_notifier_test \
+	json_utils_test \
 	log_id_test \
 	mru_test \
 	mtms_test \
@@ -187,6 +188,7 @@
 failing_mtms_test_LDADD = \
 	$(test_ldadd) \
 	$(top_builddir)/extensions/openpower-pels/failing_mtms.o \
+	$(top_builddir)/extensions/openpower-pels/json_utils.o \
 	$(top_builddir)/extensions/openpower-pels/mtms.o
 failing_mtms_test_LDFLAGS = $(test_ldflags)
 
@@ -343,3 +345,11 @@
 	$(top_builddir)/extensions/openpower-pels/host_notifier.o \
 	$(top_builddir)/extensions/openpower-pels/repository.o
 host_notifier_test_LDFLAGS = $(test_ldflags) $(SDEVENTPLUS_LIBS)
+
+json_utils_test_SOURCES = %reldir%/json_utils_test.cpp
+json_utils_test_CPPFLAGS = $(test_cppflags)
+json_utils_test_CXXFLAGS = $(test_cxxflags)
+json_utils_test_LDADD = \
+	$(test_ldadd) \
+	$(top_builddir)/extensions/openpower-pels/json_utils.o
+json_utils_test_LDFLAGS = $(test_ldflags)
diff --git a/test/openpower-pels/json_utils_test.cpp b/test/openpower-pels/json_utils_test.cpp
new file mode 100644
index 0000000..60ca00d
--- /dev/null
+++ b/test/openpower-pels/json_utils_test.cpp
@@ -0,0 +1,50 @@
+/**
+ * Copyright © 2019 IBM Corporation
+ *
+ * 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.
+ */
+#include "extensions/openpower-pels/json_utils.hpp"
+
+#include <gtest/gtest.h>
+
+using namespace openpower::pels;
+
+TEST(JsonUtilsTest, TrimEndTest)
+{
+    std::string testStr("Test string 1");
+    EXPECT_EQ(trimEnd(testStr), "Test string 1");
+    testStr = "Test string 2 ";
+    EXPECT_EQ(trimEnd(testStr), "Test string 2");
+    testStr = " Test string 3  ";
+    EXPECT_EQ(trimEnd(testStr), " Test string 3");
+}
+
+TEST(JsonUtilsTest, NumberToStringTest)
+{
+    size_t number = 123;
+    EXPECT_EQ(getNumberString("%d", number), "123");
+    EXPECT_EQ(getNumberString("%03X", number), "07B");
+    EXPECT_EQ(getNumberString("0x%X", number), "0x7B");
+    ASSERT_EXIT((getNumberString("%123", number), exit(0)),
+                ::testing::KilledBySignal(SIGSEGV), ".*");
+}
+
+TEST(JsonUtilsTest, JsonInsertTest)
+{
+    std::string json;
+    jsonInsert(json, "Key", "Value1", 1);
+    EXPECT_EQ(json, "    \"Key\":                      \"Value1\",\n");
+    jsonInsert(json, "Keyxxxxxxxxxxxxxxxxxxxxxxxxxx", "Value2", 2);
+    EXPECT_EQ(json, "    \"Key\":                      \"Value1\",\n"
+                    "        \"Keyxxxxxxxxxxxxxxxxxxxxxxxxxx\": \"Value2\",\n");
+}