diff --git a/CMakeLists.txt b/CMakeLists.txt
index c69f15a..966a773 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,7 +98,7 @@ set(TEST_SOURCES_DEV
     tests/bb_tests/test_table_border_style.c
     tests/bb_tests/test_table_options.c
     tests/bb_tests/test_memory_errors.c
-    tests/test_common.c)
+    tests/test_utils.c)
 add_executable(${PROJECT_NAME}_test_dev
     ${FORT_SOURCES}
     ${TEST_SOURCES_DEV})
@@ -112,7 +112,7 @@ set(TEST_SOURCES
     tests/bb_tests/test_table_border_style.c
     tests/bb_tests/test_table_options.c
     tests/bb_tests/test_memory_errors.c
-    tests/test_common.c)
+    tests/test_utils.c)
 add_executable(${PROJECT_NAME}_test
     include/fort.c
     ${TEST_SOURCES})
diff --git a/tests/main_test.c b/tests/main_test.c
index 5f61450..45f7365 100644
--- a/tests/main_test.c
+++ b/tests/main_test.c
@@ -2,6 +2,60 @@
 #include <stdio.h>
 #include "fort.h"
 
+void run_test_suit(const char *test_suit_name, int n_tests, struct test_case test_suit[])
+{
+    fprintf(stderr, " ==  RUNNING %s ==\n", test_suit_name);
+    fprintf(stderr, "[==========] Running %d test(s).\n", n_tests);
+    int i;
+    for (i = 0; i < n_tests; ++i) {
+        fprintf(stderr, "[ RUN      ] %s\n", test_suit[i].name);
+        test_suit[i].test();
+        fprintf(stderr, "[       OK ] %s\n", test_suit[i].name);
+    }
+    fprintf(stderr, "[==========] %d test(s) run.\n", n_tests);
+    fprintf(stderr, "[  PASSED  ] %d test(s).\n", n_tests);
+}
+
+#ifdef FORT_WB_TESTING_ENABLED
+struct test_case wb_test_suit [] = {
+    {"test_vector_basic", test_vector_basic},
+    {"test_vector_stress", test_vector_stress},
+    {"test_string_buffer", test_string_buffer},
+    {"test_table_sizes", test_table_sizes},
+    {"test_table_geometry", test_table_geometry},
+};
+#endif
+
+
+struct test_case bb_test_suit [] = {
+    {"test_table_basic", test_table_basic},
+#ifdef FT_HAVE_WCHAR
+    {"test_wcs_table_boundaries", test_wcs_table_boundaries},
+#endif
+    {"test_table_write", test_table_write},
+    {"test_table_border_style", test_table_border_style},
+    {"test_table_cell_options", test_table_cell_options},
+    {"test_table_tbl_options", test_table_tbl_options},
+    {"test_memory_errors", test_memory_errors},
+};
+
+#ifdef FORT_WB_TESTING_ENABLED
+int run_wb_test_suit(void)
+{
+    int wb_n_tests = sizeof(wb_test_suit) / sizeof(wb_test_suit[0]);
+    run_test_suit("WHITE BOX TEST SUITE", wb_n_tests, wb_test_suit);
+    return 0;
+}
+#endif
+
+
+int run_bb_test_suit(void)
+{
+    int bb_n_tests = sizeof(bb_test_suit) / sizeof(bb_test_suit[0]);
+    run_test_suit("BLACK BOX TEST SUITE", bb_n_tests, bb_test_suit);
+    return 0;
+}
+
 int main(void)
 {
     int status = 0;
diff --git a/tests/test_common.c b/tests/test_utils.c
similarity index 73%
rename from tests/test_common.c
rename to tests/test_utils.c
index 6706096..99010e0 100644
--- a/tests/test_common.c
+++ b/tests/test_utils.c
@@ -136,58 +136,8 @@ struct ft_table *create_test_int_wtable(int set_test_opts)
 
 
 
-void run_test_suit(const char *test_suit_name, int n_tests, struct test_case test_suit[])
-{
-    fprintf(stderr, " ==  RUNNING %s ==\n", test_suit_name);
-    fprintf(stderr, "[==========] Running %d test(s).\n", n_tests);
-    int i;
-    for (i = 0; i < n_tests; ++i) {
-        fprintf(stderr, "[ RUN      ] %s\n", test_suit[i].name);
-        test_suit[i].test();
-        fprintf(stderr, "[       OK ] %s\n", test_suit[i].name);
-    }
-    fprintf(stderr, "[==========] %d test(s) run.\n", n_tests);
-    fprintf(stderr, "[  PASSED  ] %d test(s).\n", n_tests);
-}
 
 
 
-#ifdef FORT_WB_TESTING_ENABLED
-struct test_case wb_test_suit [] = {
-    {"test_vector_basic", test_vector_basic},
-    {"test_vector_stress", test_vector_stress},
-    {"test_string_buffer", test_string_buffer},
-    {"test_table_sizes", test_table_sizes},
-    {"test_table_geometry", test_table_geometry},
-};
-#endif
 
 
-struct test_case bb_test_suit [] = {
-    {"test_table_basic", test_table_basic},
-#ifdef FT_HAVE_WCHAR
-    {"test_wcs_table_boundaries", test_wcs_table_boundaries},
-#endif
-    {"test_table_write", test_table_write},
-    {"test_table_border_style", test_table_border_style},
-    {"test_table_cell_options", test_table_cell_options},
-    {"test_table_tbl_options", test_table_tbl_options},
-    {"test_memory_errors", test_memory_errors},
-};
-
-#ifdef FORT_WB_TESTING_ENABLED
-int run_wb_test_suit(void)
-{
-    int wb_n_tests = sizeof(wb_test_suit) / sizeof(wb_test_suit[0]);
-    run_test_suit("WHITE BOX TEST SUITE", wb_n_tests, wb_test_suit);
-    return 0;
-}
-#endif
-
-
-int run_bb_test_suit(void)
-{
-    int bb_n_tests = sizeof(bb_test_suit) / sizeof(bb_test_suit[0]);
-    run_test_suit("BLACK BOX TEST SUITE", bb_n_tests, bb_test_suit);
-    return 0;
-}
diff --git a/tests/tests.h b/tests/tests.h
index 6d4e477..2519ad3 100644
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -73,12 +73,5 @@ struct ft_table *create_test_int_table(int set_test_opts);
 struct ft_table *create_test_int_wtable(int set_test_opts);
 
 
-void run_test_suit(const char *test_suit_name, int n_tests, struct test_case test_suit []);
-
-#ifdef FORT_WB_TESTING_ENABLED
-int run_wb_test_suit(void);
-#endif
-int run_bb_test_suit(void);
-
 
 #endif // TESTS_H