diff --git a/test/openpower-pels/Makefile.include b/test/openpower-pels/Makefile.include
index 295069a..a68b229 100644
--- a/test/openpower-pels/Makefile.include
+++ b/test/openpower-pels/Makefile.include
@@ -2,6 +2,7 @@
 
 check_PROGRAMS += \
 	additional_data_test \
+	bcd_time_test \
 	stream_test
 
 additional_data_test_SOURCES = %reldir%/additional_data_test.cpp
@@ -14,4 +15,13 @@
 stream_test_CPPFLAGS = $(test_cppflags)
 stream_test_CXXFLAGS = $(test_cxxflags)
 stream_test_LDADD = $(test_ldadd)
-stream_test_LDFLAGS = $(test_ldflags)
\ No newline at end of file
+stream_test_LDFLAGS = $(test_ldflags)
+
+bcd_time_test_SOURCES = \
+	%reldir%/bcd_time_test.cpp
+bcd_time_test_CPPFLAGS = $(test_cppflags)
+bcd_time_test_CXXFLAGS = $(test_cxxflags)
+bcd_time_test_LDADD = \
+	$(test_ldadd) \
+	$(top_builddir)/extensions/openpower-pels/bcd_time.o
+bcd_time_test_LDFLAGS = $(test_ldflags)
\ No newline at end of file
diff --git a/test/openpower-pels/bcd_time_test.cpp b/test/openpower-pels/bcd_time_test.cpp
new file mode 100644
index 0000000..f1b7663
--- /dev/null
+++ b/test/openpower-pels/bcd_time_test.cpp
@@ -0,0 +1,80 @@
+#include "extensions/openpower-pels/bcd_time.hpp"
+
+#include <gtest/gtest.h>
+
+using namespace openpower::pels;
+
+TEST(BCDTimeTest, ToBCDTest)
+{
+    EXPECT_EQ(toBCD(0), 0x00);
+    EXPECT_EQ(toBCD(1), 0x01);
+    EXPECT_EQ(toBCD(10), 0x10);
+    EXPECT_EQ(toBCD(99), 0x99);
+    EXPECT_EQ(toBCD(37), 0x37);
+    EXPECT_EQ(toBCD(60), 0x60);
+    EXPECT_EQ(toBCD(12345678), 0x12345678);
+    EXPECT_EQ(toBCD(0xF), 0x15);
+}
+
+TEST(BCDTimeTest, FlattenUnflattenTest)
+{
+    std::vector<uint8_t> data{1, 2, 3, 4, 5, 6, 7, 8};
+    Stream stream{data};
+    BCDTime bcd;
+
+    // Unflatten
+    stream >> bcd;
+
+    EXPECT_EQ(bcd.yearMSB, 1);
+    EXPECT_EQ(bcd.yearLSB, 2);
+    EXPECT_EQ(bcd.month, 3);
+    EXPECT_EQ(bcd.day, 4);
+    EXPECT_EQ(bcd.hour, 5);
+    EXPECT_EQ(bcd.minutes, 6);
+    EXPECT_EQ(bcd.seconds, 7);
+    EXPECT_EQ(bcd.hundredths, 8);
+
+    // Flatten
+    uint8_t val = 0x20;
+    bcd.yearMSB = val++;
+    bcd.yearLSB = val++;
+    bcd.month = val++;
+    bcd.day = val++;
+    bcd.hour = val++;
+    bcd.minutes = val++;
+    bcd.seconds = val++;
+    bcd.hundredths = val++;
+
+    stream.offset(0);
+    stream << bcd;
+
+    for (size_t i = 0; i < 8; i++)
+    {
+        EXPECT_EQ(data[i], 0x20 + i);
+    }
+}
+
+TEST(BCDTimeTest, ConvertTest)
+{
+    // Convert a time_point into BCDTime
+    tm time_tm;
+    time_tm.tm_year = 125;
+    time_tm.tm_mon = 11;
+    time_tm.tm_mday = 31;
+    time_tm.tm_hour = 15;
+    time_tm.tm_min = 23;
+    time_tm.tm_sec = 42;
+    time_tm.tm_isdst = 0;
+
+    auto timepoint = std::chrono::system_clock::from_time_t(mktime(&time_tm));
+    auto timeInBCD = getBCDTime(timepoint);
+
+    EXPECT_EQ(timeInBCD.yearMSB, 0x20);
+    EXPECT_EQ(timeInBCD.yearLSB, 0x25);
+    EXPECT_EQ(timeInBCD.month, 0x12);
+    EXPECT_EQ(timeInBCD.day, 0x31);
+    EXPECT_EQ(timeInBCD.hour, 0x15);
+    EXPECT_EQ(timeInBCD.minutes, 0x23);
+    EXPECT_EQ(timeInBCD.seconds, 0x42);
+    EXPECT_EQ(timeInBCD.hundredths, 0x00);
+}