diff --git a/test/openpower-pels/Makefile.include b/test/openpower-pels/Makefile.include
index fefbbc6..5705f73 100644
--- a/test/openpower-pels/Makefile.include
+++ b/test/openpower-pels/Makefile.include
@@ -7,6 +7,7 @@
 	log_id_test \
 	mtms_test \
 	pel_test \
+	pel_values_test \
 	pel_manager_test \
 	private_header_test \
 	repository_test \
@@ -123,3 +124,11 @@
 	$(top_builddir)/extensions/openpower-pels/failing_mtms.o \
 	$(top_builddir)/extensions/openpower-pels/mtms.o
 failing_mtms_test_LDFLAGS = $(test_ldflags)
+
+pel_values_test_SOURCES = %reldir%/pel_values_test.cpp
+pel_values_test_CPPFLAGS = $(test_cppflags)
+pel_values_test_CXXFLAGS = $(test_cxxflags)
+pel_values_test_LDADD = \
+	$(test_ldflags) \
+	$(top_builddir)/extensions/openpower-pels/pel_values.o
+pel_values_test_LDFLAGS = $(test_ldflags)
diff --git a/test/openpower-pels/pel_values_test.cpp b/test/openpower-pels/pel_values_test.cpp
new file mode 100644
index 0000000..d44153c
--- /dev/null
+++ b/test/openpower-pels/pel_values_test.cpp
@@ -0,0 +1,24 @@
+#include "extensions/openpower-pels/pel_values.hpp"
+
+#include <gtest/gtest.h>
+
+using namespace openpower::pels::pel_values;
+
+TEST(PELFieldsTest, TestFindFields)
+{
+    auto s = findByValue(0x5D, subsystemValues);
+    ASSERT_NE(s, subsystemValues.end());
+    ASSERT_EQ(0x5D, std::get<fieldValuePos>(*s));
+    ASSERT_EQ("cec_service_network", std::get<registryNamePos>(*s));
+
+    s = findByName("cec_clocks", subsystemValues);
+    ASSERT_NE(s, subsystemValues.end());
+    ASSERT_EQ(0x58, std::get<fieldValuePos>(*s));
+    ASSERT_EQ("cec_clocks", std::get<registryNamePos>(*s));
+
+    s = findByValue(0xFF, subsystemValues);
+    ASSERT_EQ(s, subsystemValues.end());
+
+    s = findByName("foo", subsystemValues);
+    ASSERT_EQ(s, subsystemValues.end());
+}