diff --git a/unitTests/CMakeLists.txt b/unitTests/CMakeLists.txt
index 1778a5aa..28163fa7 100644
--- a/unitTests/CMakeLists.txt
+++ b/unitTests/CMakeLists.txt
@@ -7,6 +7,7 @@ add_executable(unit_tests mainTestRunner.cpp
     test_safe_op.cpp
     test_XmpKey.cpp
     test_DateValue.cpp
+    test_TimeValue.cpp
     test_cr2header_int.cpp
     test_helper_functions.cpp
 )
diff --git a/unitTests/test_TimeValue.cpp b/unitTests/test_TimeValue.cpp
new file mode 100644
index 00000000..73bf5d7f
--- /dev/null
+++ b/unitTests/test_TimeValue.cpp
@@ -0,0 +1,103 @@
+#include "value.hpp"
+
+#include "gtestwrapper.h"
+
+using namespace Exiv2;
+
+TEST(ATimeValue, isDefaultConstructed)
+{
+    const TimeValue value;
+    ASSERT_EQ(0, value.getTime().hour);
+    ASSERT_EQ(0, value.getTime().minute);
+    ASSERT_EQ(0, value.getTime().second);
+    ASSERT_EQ(0, value.getTime().tzHour);
+    ASSERT_EQ(0, value.getTime().tzMinute);
+}
+
+TEST(ATimeValue, isConstructedWithArgs)
+{
+    const TimeValue value (23, 55, 2);
+    ASSERT_EQ(23, value.getTime().hour);
+    ASSERT_EQ(55, value.getTime().minute);
+    ASSERT_EQ(2,  value.getTime().second);
+    ASSERT_EQ(0, value.getTime().tzHour);
+    ASSERT_EQ(0, value.getTime().tzMinute);
+}
+
+/// \todo add tests to check what happen with values out of valid ranges
+
+TEST(ATimeValue, canBeReadFromStringHMS)
+{
+    TimeValue value;
+    const std::string hms("23:55:02");
+    ASSERT_EQ(0, value.read(hms));
+    ASSERT_EQ(23, value.getTime().hour);
+    ASSERT_EQ(55, value.getTime().minute);
+    ASSERT_EQ(2,  value.getTime().second);
+    ASSERT_EQ(0, value.getTime().tzHour);
+    ASSERT_EQ(0, value.getTime().tzMinute);
+}
+
+TEST(ATimeValue, canBeReadFromWideString)
+{
+    TimeValue value;
+    const std::string hms("23:55:02+04:04");
+    ASSERT_EQ(0, value.read(hms));
+    ASSERT_EQ(23, value.getTime().hour);
+    ASSERT_EQ(55, value.getTime().minute);
+    ASSERT_EQ(2,  value.getTime().second);
+    ASSERT_EQ(4, value.getTime().tzHour);
+    ASSERT_EQ(4, value.getTime().tzMinute);
+}
+
+TEST(ATimeValue, canBeReadFromWideStringNegative)
+{
+    TimeValue value;
+    const std::string hms("23:55:02-04:04");
+    ASSERT_EQ(0, value.read(hms));
+    ASSERT_EQ(23, value.getTime().hour);
+    ASSERT_EQ(55, value.getTime().minute);
+    ASSERT_EQ(2,  value.getTime().second);
+    ASSERT_EQ(-4, value.getTime().tzHour);
+    ASSERT_EQ(-4, value.getTime().tzMinute);
+}
+
+/// \todo check what we should do here.
+TEST(ATimeValue, canBeReadFromWideStringOther)
+{
+    TimeValue value;
+    const std::string hms("23:55:02?04:04");
+    ASSERT_EQ(0, value.read(hms));
+    ASSERT_EQ(23, value.getTime().hour);
+    ASSERT_EQ(55, value.getTime().minute);
+    ASSERT_EQ(2,  value.getTime().second);
+    ASSERT_EQ(4, value.getTime().tzHour);
+    ASSERT_EQ(4, value.getTime().tzMinute);
+}
+
+TEST(ATimeValue, cannotReadFromStringWithBadFormat)
+{
+    TimeValue value;
+    ASSERT_EQ(1, value.read("aa:55:02")); // String with non-digit chars
+    ASSERT_EQ(1, value.read("25:55:02")); // Hours >= 24
+    ASSERT_EQ(1, value.read("23:65:02")); // Minutes >= 60
+    ASSERT_EQ(1, value.read("23:55:62")); // Seconds >= 60
+    ASSERT_EQ(1, value.read("23:55:02+25:04")); // tzHour >= 24
+    ASSERT_EQ(1, value.read("23:55:02+04:66")); // tzMinutes >= 60
+
+    /// \todo This one does not fail
+    //ASSERT_EQ(1, value.read("23:55:02+04:06:06")); // More components than expected
+}
+
+TEST(ATimeValue, isCopiedToBuffer)
+{
+    const TimeValue value (23, 55, 2);
+    byte buffer[11];
+    ASSERT_EQ(11, value.copy(buffer));
+
+    const byte expectedDate[11] = {'2', '3', '5', '5', '0', '2',
+                                   '+', '0', '0', '0', '0'};
+    for (int i = 0; i < 11; ++i) {
+        ASSERT_EQ(expectedDate[i], buffer[i]) << "i: " << i;
+    }
+}