diff --git a/src/tests/storage-rbox/it_test_copy_rbox.cpp b/src/tests/storage-rbox/it_test_copy_rbox.cpp
index 8984c6b8..ee664854 100644
--- a/src/tests/storage-rbox/it_test_copy_rbox.cpp
+++ b/src/tests/storage-rbox/it_test_copy_rbox.cpp
@@ -50,17 +50,6 @@ extern "C" {
 using ::testing::AtLeast;
 using ::testing::Return;
 
-#pragma GCC diagnostic pop
-#if DOVECOT_PREREQ(2, 3)
-#define mailbox_get_last_internal_error(box, error_r) mailbox_get_last_internal_error(box, error_r)
-#else
-#define mailbox_get_last_internal_error(box, error_r) mailbox_get_last_error(box, error_r)
-#endif
-
-#ifndef i_zero
-#define i_zero(p) memset(p, 0, sizeof(*(p)))
-#endif
-
 TEST_F(StorageTest, init) {}
 
 TEST_F(StorageTest, mailbox_open_inbox) {
diff --git a/src/tests/storage-rbox/it_test_move_rbox.cpp b/src/tests/storage-rbox/it_test_move_rbox.cpp
index c299c211..e2caf317 100644
--- a/src/tests/storage-rbox/it_test_move_rbox.cpp
+++ b/src/tests/storage-rbox/it_test_move_rbox.cpp
@@ -50,17 +50,6 @@ extern "C" {
 using ::testing::AtLeast;
 using ::testing::Return;
 
-#pragma GCC diagnostic pop
-#if DOVECOT_PREREQ(2, 3)
-#define mailbox_get_last_internal_error(box, error_r) mailbox_get_last_internal_error(box, error_r)
-#else
-#define mailbox_get_last_internal_error(box, error_r) mailbox_get_last_error(box, error_r)
-#endif
-
-#ifndef i_zero
-#define i_zero(p) memset(p, 0, sizeof(*(p)))
-#endif
-
 TEST_F(StorageTest, init) {}
 
 TEST_F(StorageTest, mailbox_open_inbox) {
diff --git a/src/tests/storage-rbox/it_test_read_mail_rbox.cpp b/src/tests/storage-rbox/it_test_read_mail_rbox.cpp
index 11ef7344..a55763bf 100644
--- a/src/tests/storage-rbox/it_test_read_mail_rbox.cpp
+++ b/src/tests/storage-rbox/it_test_read_mail_rbox.cpp
@@ -50,17 +50,6 @@ extern "C" {
 using ::testing::AtLeast;
 using ::testing::Return;
 
-#pragma GCC diagnostic pop
-#if DOVECOT_PREREQ(2, 3)
-#define mailbox_get_last_internal_error(box, error_r) mailbox_get_last_internal_error(box, error_r)
-#else
-#define mailbox_get_last_internal_error(box, error_r) mailbox_get_last_error(box, error_r)
-#endif
-
-#ifndef i_zero
-#define i_zero(p) memset(p, 0, sizeof(*(p)))
-#endif
-
 TEST_F(StorageTest, init) {}
 
 TEST_F(StorageTest, mailbox_open_inbox) {
diff --git a/src/tests/sync-rbox/it_test_sync_rbox.cpp b/src/tests/sync-rbox/it_test_sync_rbox.cpp
index 42d9b935..5696e2ad 100644
--- a/src/tests/sync-rbox/it_test_sync_rbox.cpp
+++ b/src/tests/sync-rbox/it_test_sync_rbox.cpp
@@ -41,17 +41,6 @@ extern "C" {
 using ::testing::AtLeast;
 using ::testing::Return;
 
-#pragma GCC diagnostic pop
-#if DOVECOT_PREREQ(2, 3)
-#define mailbox_get_last_internal_error(box, error_r) mailbox_get_last_internal_error(box, error_r)
-#else
-#define mailbox_get_last_internal_error(box, error_r) mailbox_get_last_error(box, error_r)
-#endif
-
-#ifndef i_zero
-#define i_zero(p) memset(p, 0, sizeof(*(p)))
-#endif
-
 TEST_F(SyncTest, init) {}
 
 
diff --git a/src/tests/sync-rbox/it_test_sync_rbox_2.cpp b/src/tests/sync-rbox/it_test_sync_rbox_2.cpp
index ee9fcdf8..2f7d08eb 100644
--- a/src/tests/sync-rbox/it_test_sync_rbox_2.cpp
+++ b/src/tests/sync-rbox/it_test_sync_rbox_2.cpp
@@ -41,17 +41,6 @@ extern "C" {
 using ::testing::AtLeast;
 using ::testing::Return;
 
-#pragma GCC diagnostic pop
-#if DOVECOT_PREREQ(2, 3)
-#define mailbox_get_last_internal_error(box, error_r) mailbox_get_last_internal_error(box, error_r)
-#else
-#define mailbox_get_last_internal_error(box, error_r) mailbox_get_last_error(box, error_r)
-#endif
-
-#ifndef i_zero
-#define i_zero(p) memset(p, 0, sizeof(*(p)))
-#endif
-
 TEST_F(SyncTest, init) {}
 
 
diff --git a/src/tests/test-utils/it_utils.cpp b/src/tests/test-utils/it_utils.cpp
index f083e857..9d3ca7bc 100644
--- a/src/tests/test-utils/it_utils.cpp
+++ b/src/tests/test-utils/it_utils.cpp
@@ -27,11 +27,9 @@
 namespace testutils {
 
 ItUtils::ItUtils() {
-  // TODO Auto-generated constructor stub
 }
 
 ItUtils::~ItUtils() {
-  // TODO Auto-generated destructor stub
 }
 
 void ItUtils::add_mail(const char *message, const char *mailbox, struct mail_namespace *_ns) {
diff --git a/src/tests/test-utils/it_utils.h b/src/tests/test-utils/it_utils.h
index 19f386ec..49583238 100644
--- a/src/tests/test-utils/it_utils.h
+++ b/src/tests/test-utils/it_utils.h
@@ -32,6 +32,17 @@ extern "C" {
 #include "mail-search.h"
 }
 
+#pragma GCC diagnostic pop
+#if DOVECOT_PREREQ(2, 3)
+#define mailbox_get_last_internal_error(box, error_r) mailbox_get_last_internal_error(box, error_r)
+#else
+#define mailbox_get_last_internal_error(box, error_r) mailbox_get_last_error(box, error_r)
+#endif
+
+#ifndef i_zero
+#define i_zero(p) memset(p, 0, sizeof(*(p)))
+#endif
+
 namespace testutils {
 
 class ItUtils {