diff --git a/tests/unittests/tests-checksum/Makefile b/tests/unittests/tests-checksum/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..48422e909a47d7cd428d10fa73825060ccc8d8c2
--- /dev/null
+++ b/tests/unittests/tests-checksum/Makefile
@@ -0,0 +1 @@
+include $(RIOTBASE)/Makefile.base
diff --git a/tests/unittests/tests-checksum/Makefile.include b/tests/unittests/tests-checksum/Makefile.include
new file mode 100644
index 0000000000000000000000000000000000000000..5cbd968a589f0771e6800c5035065669e6a27725
--- /dev/null
+++ b/tests/unittests/tests-checksum/Makefile.include
@@ -0,0 +1 @@
+USEMODULE += checksum
diff --git a/tests/unittests/tests-checksum/tests-checksum-crc16-ccitt.c b/tests/unittests/tests-checksum/tests-checksum-crc16-ccitt.c
new file mode 100644
index 0000000000000000000000000000000000000000..2159999eb41ff8394e6cdd3bbaa45dce097259c6
--- /dev/null
+++ b/tests/unittests/tests-checksum/tests-checksum-crc16-ccitt.c
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2016 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser
+ * General Public License v2.1. See the file LICENSE in the top level
+ * directory for more details.
+ */
+
+#include <stdint.h>
+
+#include "embUnit/embUnit.h"
+
+#include "checksum/crc16_ccitt.h"
+
+#include "tests-checksum.h"
+
+static int calc_and_compare_crc_with_update(const unsigned char *buf,
+        size_t len, size_t split, uint16_t expected)
+{
+    uint16_t result = crc16_ccitt_calc(buf, split);
+
+    result = crc16_ccitt_update(result, buf + split, len - split);
+
+    return result == expected;
+}
+
+static int calc_and_compare_crc(const unsigned char *buf, size_t len,
+        uint16_t expected)
+{
+    uint16_t result = crc16_ccitt_calc(buf, len);
+
+    return result == expected;
+}
+
+static void test_checksum_crc16_ccitt_sequence(void)
+{
+    /* Reference values according to
+     * http://srecord.sourceforge.net/crc16-ccitt.html */
+    {
+        unsigned char buf[] = "";
+        uint16_t expect = 0x1D0F;
+
+        TEST_ASSERT(calc_and_compare_crc(buf, sizeof(buf) - 1, expect));
+        TEST_ASSERT(calc_and_compare_crc_with_update(buf, sizeof(buf) - 1,
+                    (sizeof(buf) - 1) / 2, expect)); }
+
+    {
+        unsigned char buf[] = "A";
+        uint16_t expect = 0x9479;
+
+        TEST_ASSERT(calc_and_compare_crc(buf, sizeof(buf) - 1, expect));
+        TEST_ASSERT(calc_and_compare_crc_with_update(buf, sizeof(buf) - 1,
+                    (sizeof(buf) - 1) / 2, expect)); }
+
+    {
+        unsigned char buf[] = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+                              "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+                              "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+                              "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+                              "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+                              "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+                              "AAAA";
+        uint16_t expect = 0xE938;
+
+        TEST_ASSERT(calc_and_compare_crc(buf, sizeof(buf) - 1, expect));
+        TEST_ASSERT(calc_and_compare_crc_with_update(buf, sizeof(buf) - 1,
+                    (sizeof(buf) - 1) / 2, expect)); }
+
+    {
+        unsigned char buf[] = "123456789";
+        uint16_t expect = 0xE5CC;
+
+        TEST_ASSERT(calc_and_compare_crc(buf, sizeof(buf) - 1, expect));
+        TEST_ASSERT(calc_and_compare_crc_with_update(buf, sizeof(buf)
+                    - 1, (sizeof(buf) - 1) / 2, expect));
+    }
+
+    {
+        unsigned char buf[] = { 0x12, 0x34, 0x56, 0x78 };
+        uint16_t expect = 0xBA3C;
+
+        TEST_ASSERT(calc_and_compare_crc(buf, sizeof(buf), expect));
+        TEST_ASSERT(calc_and_compare_crc_with_update(buf, sizeof(buf),
+                    sizeof(buf) / 2, expect));
+    }
+}
+
+Test *tests_checksum_crc16_ccitt_tests(void)
+{
+    EMB_UNIT_TESTFIXTURES(fixtures) {
+        new_TestFixture(test_checksum_crc16_ccitt_sequence),
+    };
+
+    EMB_UNIT_TESTCALLER(checksum_crc16_ccitt_tests, NULL, NULL, fixtures);
+
+    return (Test *)&checksum_crc16_ccitt_tests;
+}
diff --git a/tests/unittests/tests-checksum/tests-checksum.c b/tests/unittests/tests-checksum/tests-checksum.c
new file mode 100644
index 0000000000000000000000000000000000000000..356c081ecf1b55f19a1ea2e1793ec8d791a1ca82
--- /dev/null
+++ b/tests/unittests/tests-checksum/tests-checksum.c
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2016 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser
+ * General Public License v2.1. See the file LICENSE in the top level
+ * directory for more details.
+ */
+
+#include "tests-checksum.h"
+
+void tests_checksum(void)
+{
+    TESTS_RUN(tests_checksum_crc16_ccitt_tests());
+}
diff --git a/tests/unittests/tests-checksum/tests-checksum.h b/tests/unittests/tests-checksum/tests-checksum.h
new file mode 100644
index 0000000000000000000000000000000000000000..10c90e13669eff8f8a25d5f02d8e522a95ece2a8
--- /dev/null
+++ b/tests/unittests/tests-checksum/tests-checksum.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2016 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser
+ * General Public License v2.1. See the file LICENSE in the top level
+ * directory for more details.
+ */
+
+/**
+ * @addtogroup  unittests
+ * @{
+ *
+ * @file
+ * @brief       Unittests for the ``checksum`` module
+ *
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
+ */
+#ifndef TESTS_CHECKSUM_H
+#define TESTS_CHECKSUM_H
+
+#include "embUnit.h"
+#include "kernel.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief   The entry point of this test suite.
+ */
+void tests_checksum(void);
+
+/**
+ * @brief   Generates tests for checksum/crc16_ccitt.h
+ *
+ * @return  embUnit tests if successful, NULL if not.
+ */
+Test *tests_checksum_crc16_ccitt_tests(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* TESTS_CHECKSUM_H */
+/** @} */