7 files changed, 7 insertions, 35 deletions
diff --git a/tests/net/maildir/maildirStoreTest.cpp b/tests/net/maildir/maildirStoreTest.cpp
index d908d471..10de80df 100644
--- a/tests/net/maildir/maildirStoreTest.cpp
+++ b/tests/net/maildir/maildirStoreTest.cpp
@@ -29,10 +29,6 @@
 #include "vmime/net/maildir/maildirFormat.hpp"
 
 
-#define VMIME_TEST_SUITE         maildirStoreTest
-#define VMIME_TEST_SUITE_MODULE  "Net/Maildir"
-
-
 // Shortcuts and helpers
 typedef vmime::utility::file::path fspath;
 typedef vmime::utility::file::path::component fspathc;
@@ -142,7 +138,7 @@ static const vmime::string TEST_MAILDIRFILES_COURIER[] =  // files to create and
 
 
 
-VMIME_TEST_SUITE_BEGIN
+VMIME_TEST_SUITE_BEGIN(maildirStoreTest)
 
 	VMIME_TEST_LIST_BEGIN
 		VMIME_TEST(testDetectFormat_KMail)
diff --git a/tests/net/pop3/POP3ResponseTest.cpp b/tests/net/pop3/POP3ResponseTest.cpp
index 54c36274..1541ce8b 100644
--- a/tests/net/pop3/POP3ResponseTest.cpp
+++ b/tests/net/pop3/POP3ResponseTest.cpp
@@ -26,14 +26,10 @@
 #include "vmime/net/pop3/POP3Response.hpp"
 
 
-#define VMIME_TEST_SUITE         POP3ResponseTest
-#define VMIME_TEST_SUITE_MODULE  "Net/POP3"
-
-
 using namespace vmime::net::pop3;
 
 
-VMIME_TEST_SUITE_BEGIN
+VMIME_TEST_SUITE_BEGIN(POP3ResponseTest)
 
 	VMIME_TEST_LIST_BEGIN
 		VMIME_TEST(testSingleLineResponseOK)
diff --git a/tests/net/pop3/POP3UtilsTest.cpp b/tests/net/pop3/POP3UtilsTest.cpp
index f1e4f597..ac92056a 100644
--- a/tests/net/pop3/POP3UtilsTest.cpp
+++ b/tests/net/pop3/POP3UtilsTest.cpp
@@ -27,14 +27,10 @@
 #include "vmime/net/pop3/POP3Response.hpp"
 
 
-#define VMIME_TEST_SUITE         POP3UtilsTest
-#define VMIME_TEST_SUITE_MODULE  "Net/POP3"
-
-
 using namespace vmime::net::pop3;
 
 
-VMIME_TEST_SUITE_BEGIN
+VMIME_TEST_SUITE_BEGIN(POP3UtilsTest)
 
 	VMIME_TEST_LIST_BEGIN
 		VMIME_TEST(testParseMultiListOrUidlResponse)
diff --git a/tests/net/smtp/SMTPCommandSetTest.cpp b/tests/net/smtp/SMTPCommandSetTest.cpp
index a315d678..0cf4b03b 100644
--- a/tests/net/smtp/SMTPCommandSetTest.cpp
+++ b/tests/net/smtp/SMTPCommandSetTest.cpp
@@ -30,11 +30,7 @@
 using namespace vmime::net::smtp;
 
 
-#define VMIME_TEST_SUITE         SMTPCommandSetTest
-#define VMIME_TEST_SUITE_MODULE  "Net/SMTP"
-
-
-VMIME_TEST_SUITE_BEGIN
+VMIME_TEST_SUITE_BEGIN(SMTPCommandSetTest)
 
 	VMIME_TEST_LIST_BEGIN
 		VMIME_TEST(testCreate)
diff --git a/tests/net/smtp/SMTPCommandTest.cpp b/tests/net/smtp/SMTPCommandTest.cpp
index 0ff52741..10052f3f 100644
--- a/tests/net/smtp/SMTPCommandTest.cpp
+++ b/tests/net/smtp/SMTPCommandTest.cpp
@@ -29,11 +29,7 @@
 using namespace vmime::net::smtp;
 
 
-#define VMIME_TEST_SUITE         SMTPCommandTest
-#define VMIME_TEST_SUITE_MODULE  "Net/SMTP"
-
-
-VMIME_TEST_SUITE_BEGIN
+VMIME_TEST_SUITE_BEGIN(SMTPCommandTest)
 
 	VMIME_TEST_LIST_BEGIN
 		VMIME_TEST(testCreateCommand)
diff --git a/tests/net/smtp/SMTPResponseTest.cpp b/tests/net/smtp/SMTPResponseTest.cpp
index 17c7774c..7d8a13c9 100644
--- a/tests/net/smtp/SMTPResponseTest.cpp
+++ b/tests/net/smtp/SMTPResponseTest.cpp
@@ -26,11 +26,7 @@
 #include "vmime/net/smtp/SMTPResponse.hpp"
 
 
-#define VMIME_TEST_SUITE         SMTPResponseTest
-#define VMIME_TEST_SUITE_MODULE  "Net/SMTP"
-
-
-VMIME_TEST_SUITE_BEGIN
+VMIME_TEST_SUITE_BEGIN(SMTPResponseTest)
 
 	VMIME_TEST_LIST_BEGIN
 		VMIME_TEST(testSingleLineResponse)
diff --git a/tests/net/smtp/SMTPTransportTest.cpp b/tests/net/smtp/SMTPTransportTest.cpp
index 4f34f71f..4ffda792 100644
--- a/tests/net/smtp/SMTPTransportTest.cpp
+++ b/tests/net/smtp/SMTPTransportTest.cpp
@@ -24,15 +24,11 @@
 #include "tests/testUtils.hpp"
 
 
-#define VMIME_TEST_SUITE         SMTPTransportTest
-#define VMIME_TEST_SUITE_MODULE  "Net/SMTP"
-
-
 class greetingErrorSMTPTestSocket;
 class MAILandRCPTSMTPTestSocket;
 
 
-VMIME_TEST_SUITE_BEGIN
+VMIME_TEST_SUITE_BEGIN(SMTPTransportTest)
 
 	VMIME_TEST_LIST_BEGIN
 		VMIME_TEST(testGreetingError)