diff --git a/test/openpower-pels/Makefile.include b/test/openpower-pels/Makefile.include
index f2e3126..b6b49aa 100644
--- a/test/openpower-pels/Makefile.include
+++ b/test/openpower-pels/Makefile.include
@@ -17,6 +17,7 @@
 	section_header_test \
 	severity_test \
 	stream_test \
+	user_data_test \
 	user_header_test
 
 pel_objects = \
@@ -31,6 +32,7 @@
 	$(top_builddir)/extensions/openpower-pels/registry.o \
 	$(top_builddir)/extensions/openpower-pels/section_factory.o \
 	$(top_builddir)/extensions/openpower-pels/severity.o \
+	$(top_builddir)/extensions/openpower-pels/user_data.o \
 	$(top_builddir)/extensions/openpower-pels/user_header.o
 
 additional_data_test_SOURCES = %reldir%/additional_data_test.cpp
@@ -179,3 +181,12 @@
 	$(test_ldadd) \
 	$(top_builddir)/extensions/openpower-pels/generic.o
 generic_section_test_LDFLAGS = $(test_ldflags)
+
+user_data_test_SOURCES = \
+	%reldir%/user_data_test.cpp %reldir%/pel_utils.cpp
+user_data_test_CPPFLAGS = $(test_cppflags)
+user_data_test_CXXFLAGS = $(test_cxxflags)
+user_data_test_LDADD = \
+	$(test_ldadd) \
+	$(top_builddir)/extensions/openpower-pels/user_data.o
+user_data_test_LDFLAGS = $(test_ldflags)
diff --git a/test/openpower-pels/user_data_test.cpp b/test/openpower-pels/user_data_test.cpp
new file mode 100644
index 0000000..be3f5cb
--- /dev/null
+++ b/test/openpower-pels/user_data_test.cpp
@@ -0,0 +1,91 @@
+#include "extensions/openpower-pels/user_data.hpp"
+#include "pel_utils.hpp"
+
+#include <gtest/gtest.h>
+
+using namespace openpower::pels;
+
+std::vector<uint8_t> udSectionData{0x55, 0x44, // ID 'UD'
+                                   0x00, 0x10, // Size
+                                   0x01, 0x02, // version, subtype
+                                   0x03, 0x04, // comp ID
+
+                                   // Data
+                                   0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+                                   0x18};
+
+TEST(UserDataTest, UnflattenFlattenTest)
+{
+    Stream stream(udSectionData);
+    UserData ud(stream);
+
+    EXPECT_TRUE(ud.valid());
+    EXPECT_EQ(ud.header().id, 0x5544);
+    EXPECT_EQ(ud.header().size, udSectionData.size());
+    EXPECT_EQ(ud.header().version, 0x01);
+    EXPECT_EQ(ud.header().subType, 0x02);
+    EXPECT_EQ(ud.header().componentID, 0x0304);
+
+    const auto& data = ud.data();
+
+    // The data itself starts after the header
+    EXPECT_EQ(data.size(), udSectionData.size() - 8);
+
+    for (size_t i = 0; i < data.size(); i++)
+    {
+        EXPECT_EQ(data[i], udSectionData[i + 8]);
+    }
+
+    // Now flatten
+    std::vector<uint8_t> newData;
+    Stream newStream(newData);
+    ud.flatten(newStream);
+
+    EXPECT_EQ(udSectionData, newData);
+}
+
+TEST(UserDataTest, BadDataTest)
+{
+    auto data = udSectionData;
+    data.resize(4);
+
+    Stream stream(data);
+    UserData ud(stream);
+    EXPECT_FALSE(ud.valid());
+}
+
+TEST(UserDataTest, BadSizeFieldTest)
+{
+    auto data = udSectionData;
+
+    {
+        data[3] = 0xFF; // Set the size field too large
+        Stream stream(data);
+        UserData ud(stream);
+        EXPECT_FALSE(ud.valid());
+    }
+    {
+        data[3] = 0x7; // Set the size field too small
+        Stream stream(data);
+        UserData ud(stream);
+        EXPECT_FALSE(ud.valid());
+    }
+}
+
+TEST(UserDataTest, ConstructorTest)
+{
+    std::vector<uint8_t> data{0x11, 0x22, 0x33, 0x44, 0x55, 0x66};
+
+    UserData ud(0x1112, 0x42, 0x01, data);
+    EXPECT_TRUE(ud.valid());
+
+    EXPECT_EQ(ud.header().id, 0x5544);
+    EXPECT_EQ(ud.header().size, 14);
+    EXPECT_EQ(ud.header().version, 0x01);
+    EXPECT_EQ(ud.header().subType, 0x42);
+    EXPECT_EQ(ud.header().componentID, 0x1112);
+
+    const auto& d = ud.data();
+
+    EXPECT_EQ(d, data);
+}