diff --git a/unitTests/CMakeLists.txt b/unitTests/CMakeLists.txt
index 4c8a46ff..a8922de4 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_cr2header_int.cpp
 )
 
 #TODO Use GTest::GTest once we upgrade the minimum CMake version required
diff --git a/unitTests/test_cr2header_int.cpp b/unitTests/test_cr2header_int.cpp
new file mode 100644
index 00000000..e225cefb
--- /dev/null
+++ b/unitTests/test_cr2header_int.cpp
@@ -0,0 +1,60 @@
+#include "cr2header_int.hpp"
+
+#include "gtestwrapper.h"
+
+using namespace Exiv2;
+
+static const byte cr2LittleEndian[] = {0x49, 0x49, 0x2a, 0x00, 0x10, 0x00, 0x00, 0x00,
+                                       0x43, 0x52, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+TEST(ACr2Header, hasExpectedValuesAfterCreation)
+{
+    Internal::Cr2Header header;
+    ASSERT_EQ(42, header.tag());
+    ASSERT_EQ(16u, header.size());
+    ASSERT_EQ(littleEndian, header.byteOrder());
+}
+
+TEST(ACr2Header, sizeIs16Bytes)
+{
+    Internal::Cr2Header header;
+    DataBuf buffer = header.write();
+    ASSERT_EQ(header.size(), buffer.size_);
+    ASSERT_EQ(0, memcmp(cr2LittleEndian, buffer.pData_, 16));
+}
+
+
+TEST(ACr2Header, readDataFromBufferWithCorrectSize)
+{
+    Internal::Cr2Header header;
+    ASSERT_TRUE(header.read(cr2LittleEndian, 16));
+}
+
+TEST(ACr2Header, failToReadDataFromBufferWithCorrectSizeButNull)
+{
+    Internal::Cr2Header header;
+    ASSERT_FALSE(header.read(NULL, 16));
+}
+
+TEST(ACr2Header, failToReadDataFromBufferWithSizeDifferentThan16)
+{
+    Internal::Cr2Header header;
+    ASSERT_FALSE(header.read(NULL, 15));
+    ASSERT_FALSE(header.read(NULL, 17));
+}
+
+TEST(ACr2Header, failToReadDataFromBufferWithInvalidByteOrder)
+{
+    static const byte bufferInvalidByteOrder[] =  {0x88, 0x49, 0x2a, 0x00, 0x10, 0x00, 0x00, 0x00,
+                                                   0x43, 0x52, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00};
+    Internal::Cr2Header header;
+    ASSERT_FALSE(header.read(bufferInvalidByteOrder, 16));
+}
+
+TEST(ACr2Header, failToReadDataFromBufferWithInvalidTag)
+{
+    static const byte bufferInvalidTag[] = {0x49, 0x49, 0x29, 0x00, 0x10, 0x00, 0x00, 0x00,
+                                            0x43, 0x52, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00};
+    Internal::Cr2Header header;
+    ASSERT_FALSE(header.read(bufferInvalidTag, 16));
+}
\ No newline at end of file