diff --git a/src/bitwriter.c b/src/bitwriter.c
index b51df3eec16d57afda81c6eb24ab2cca315d19c7..0b35b679c4324b91aef9abcd5042ce683d92ddce 100644
--- a/src/bitwriter.c
+++ b/src/bitwriter.c
@@ -103,4 +103,45 @@ void h_bit_writer_free(HBitWriter* w) {
   g_free(w);
 }
 
-// TESTS BELOW HERE
+#ifdef INCLUDE_TESTS
+
+static void test_bitwriter_ints(void) {
+
+}
+
+static void test_bitwriter_be(void) {
+
+}
+
+static void test_bitwriter_le(void) {
+
+}
+
+static void test_largebits_be(void) {
+
+}
+
+static void test_largebits_le(void) {
+
+}
+
+static void test_offset_largebits_be(void) {
+
+}
+
+static void test_offset_largebits_le(void) {
+
+}
+
+void register_bitwriter_tests(void) {
+  g_test_add_func("/core/bitwriter/be", test_bitwriter_be);
+  g_test_add_func("/core/bitwriter/le", test_bitwriter_le);
+  g_test_add_func("/core/bitwriter/largebits-be", test_largebits_be);
+  g_test_add_func("/core/bitwriter/largebits-le", test_largebits_le);
+  g_test_add_func("/core/bitwriter/offset-largebits-be", test_offset_largebits_be);
+  g_test_add_func("/core/bitwriter/offset-largebits-le", test_offset_largebits_le);
+  g_test_add_func("/core/bitwriter/ints", test_bitwriter_ints);
+}
+
+#endif // #ifdef INCLUDE_TESTS
+
diff --git a/src/test_suite.c b/src/test_suite.c
index 016274c0013424f2ecf36cfdc7c2ad7084d992bc..af22c7e980a2fcc7cbb512e0f5e659ff8d33f9e1 100644
--- a/src/test_suite.c
+++ b/src/test_suite.c
@@ -19,6 +19,7 @@
 #include "test_suite.h"
 
 extern void register_bitreader_tests();
+extern void register_bitwriter_tests();
 extern void register_parser_tests();
 
 int main(int argc, char** argv) {
@@ -26,6 +27,7 @@ int main(int argc, char** argv) {
 
   // register various test suites...
   register_bitreader_tests();
+  register_bitwriter_tests();
   register_parser_tests();
 
   g_test_run();