diff --git a/test/openpower-pels/Makefile.include b/test/openpower-pels/Makefile.include
new file mode 100644
index 0000000..98a0acd
--- /dev/null
+++ b/test/openpower-pels/Makefile.include
@@ -0,0 +1,10 @@
+TESTS += $(check_PROGRAMS)
+
+check_PROGRAMS += \
+	additional_data_test
+
+additional_data_test_SOURCES = %reldir%/additional_data_test.cpp
+additional_data_test_CPPFLAGS = $(test_cppflags)
+additional_data_test_CXXFLAGS = $(test_cxxflags)
+additional_data_test_LDADD = $(test_ldadd)
+additional_data_test_LDFLAGS = $(test_ldflags)
diff --git a/test/openpower-pels/additional_data_test.cpp b/test/openpower-pels/additional_data_test.cpp
new file mode 100644
index 0000000..2be06c4
--- /dev/null
+++ b/test/openpower-pels/additional_data_test.cpp
@@ -0,0 +1,27 @@
+#include "extensions/openpower-pels/additional_data.hpp"
+
+#include <gtest/gtest.h>
+
+using namespace openpower::pels;
+
+TEST(AdditionalDataTest, GetKeywords)
+{
+    std::vector<std::string> data{"KEY1=VALUE1", "KEY2=VALUE2",
+                                  "KEY3=", "HELLOWORLD", "=VALUE5"};
+    AdditionalData ad{data};
+
+    EXPECT_TRUE(ad.getValue("KEY1"));
+    EXPECT_EQ(*(ad.getValue("KEY1")), "VALUE1");
+
+    EXPECT_TRUE(ad.getValue("KEY2"));
+    EXPECT_EQ(*(ad.getValue("KEY2")), "VALUE2");
+
+    EXPECT_FALSE(ad.getValue("x"));
+
+    auto value3 = ad.getValue("KEY3");
+    EXPECT_TRUE(value3);
+    EXPECT_TRUE((*value3).empty());
+
+    EXPECT_FALSE(ad.getValue("HELLOWORLD"));
+    EXPECT_FALSE(ad.getValue("VALUE5"));
+}