Index: tests/OFArrayTests.m
==================================================================
--- tests/OFArrayTests.m
+++ tests/OFArrayTests.m
@@ -15,11 +15,11 @@
 
 #include "config.h"
 
 #import "TestsAppDelegate.h"
 
-static OFString *module = nil;
+static OFString *module;
 static OFString *const cArray[] = {
 	@"Foo",
 	@"Bar",
 	@"Baz"
 };

Index: tests/OFCharacterSetTests.m
==================================================================
--- tests/OFCharacterSetTests.m
+++ tests/OFCharacterSetTests.m
@@ -19,11 +19,11 @@
 
 #import "OFCharacterSet.h"
 #import "OFBitSetCharacterSet.h"
 #import "OFRangeCharacterSet.h"
 
-static OFString *module = nil;
+static OFString *module;
 
 @interface SimpleCharacterSet: OFCharacterSet
 @end
 
 @implementation SimpleCharacterSet

Index: tests/OFDictionaryTests.m
==================================================================
--- tests/OFDictionaryTests.m
+++ tests/OFDictionaryTests.m
@@ -15,11 +15,11 @@
 
 #include "config.h"
 
 #import "TestsAppDelegate.h"
 
-static OFString *module = nil;
+static OFString *module;
 static OFString *keys[] = {
 	@"key1",
 	@"key2"
 };
 static OFString *values[] = {

Index: tests/OFINIFileTests.m
==================================================================
--- tests/OFINIFileTests.m
+++ tests/OFINIFileTests.m
@@ -15,11 +15,11 @@
 
 #include "config.h"
 
 #import "TestsAppDelegate.h"
 
-static OFString *module = @"OFINIFile";
+static OFString *module;
 
 @implementation TestsAppDelegate (OFINIFileTests)
 - (void)INIFileTests
 {
 	void *pool = objc_autoreleasePoolPush();
@@ -47,10 +47,12 @@
 	OFINICategory *tests, *foobar, *types;
 	OFArray *array;
 #ifndef OF_NINTENDO_DS
 	OFString *writePath;
 #endif
+
+	module = @"OFINIFile";
 
 	TEST(@"+[fileWithPath:encoding:]",
 	    (file = [OFINIFile fileWithPath: @"testfile.ini"
 				   encoding: OFStringEncodingCodepage437]))
 

Index: tests/OFListTests.m
==================================================================
--- tests/OFListTests.m
+++ tests/OFListTests.m
@@ -15,11 +15,11 @@
 
 #include "config.h"
 
 #import "TestsAppDelegate.h"
 
-static OFString *module = @"OFList";
+static OFString *const module = @"OFList";
 static OFString *strings[] = {
 	@"Foo",
 	@"Bar",
 	@"Baz"
 };

Index: tests/OFMD5HashTests.m
==================================================================
--- tests/OFMD5HashTests.m
+++ tests/OFMD5HashTests.m
@@ -17,11 +17,11 @@
 
 #include <string.h>
 
 #import "TestsAppDelegate.h"
 
-static OFString *module = @"OFMD5Hash";
+static OFString *const module = @"OFMD5Hash";
 
 const uint8_t testFileMD5[16] =
     "\x00\x8B\x9D\x1B\x58\xDF\xF8\xFE\xEE\xF3\xAE\x8D\xBB\x68\x2D\x38";
 
 @implementation TestsAppDelegate (OFMD5HashTests)

Index: tests/OFSetTests.m
==================================================================
--- tests/OFSetTests.m
+++ tests/OFSetTests.m
@@ -19,11 +19,11 @@
 
 #import "OFSet.h"
 #import "OFMapTableSet.h"
 #import "OFMutableMapTableSet.h"
 
-static OFString *module = nil;
+static OFString *module;
 
 @interface SimpleSet: OFSet
 {
 	OFMutableSet *_set;
 }

Index: tests/OFStringTests.m
==================================================================
--- tests/OFStringTests.m
+++ tests/OFStringTests.m
@@ -27,11 +27,11 @@
 
 #ifndef INFINITY
 # define INFINITY __builtin_inf()
 #endif
 
-static OFString *module = nil;
+static OFString *module;
 static OFString *const whitespace[] = {
 	@" \r \t\n\t \tasd  \t \t\t\r\n",
 	@" \t\t  \t\t  \t \t"
 };
 static const OFUnichar unicharString[] = {

Index: tests/OFTCPSocketTests.m
==================================================================
--- tests/OFTCPSocketTests.m
+++ tests/OFTCPSocketTests.m
@@ -17,11 +17,11 @@
 
 #include <string.h>
 
 #import "TestsAppDelegate.h"
 
-static OFString *module = @"OFTCPSocket";
+static OFString *const module = @"OFTCPSocket";
 
 @implementation TestsAppDelegate (OFTCPSocketTests)
 - (void)TCPSocketTests
 {
 	void *pool = objc_autoreleasePoolPush();