diff --git a/src/tests/kits/storage/Test.StorageKit.cpp b/src/tests/kits/storage/StorageKitTester.cpp
similarity index 99%
rename from src/tests/kits/storage/Test.StorageKit.cpp
rename to src/tests/kits/storage/StorageKitTester.cpp
index 3591b01468..c09d811bdb 100644
--- a/src/tests/kits/storage/Test.StorageKit.cpp
+++ b/src/tests/kits/storage/StorageKitTester.cpp
@@ -1,4 +1,4 @@
-#include "Test.StorageKit.h"
+#include "StorageKitTester.h"
 #include <unistd.h>
 #include "TestUtils.h"
 
diff --git a/src/tests/kits/storage/Test.StorageKit.h b/src/tests/kits/storage/StorageKitTester.h
similarity index 88%
rename from src/tests/kits/storage/Test.StorageKit.h
rename to src/tests/kits/storage/StorageKitTester.h
index aaffaca6d4..291d6033ea 100644
--- a/src/tests/kits/storage/Test.StorageKit.h
+++ b/src/tests/kits/storage/StorageKitTester.h
@@ -1,6 +1,15 @@
 #ifndef __sk_testing_is_so_much_fun_h__
 #define __sk_testing_is_so_much_fun_h__
 
+// Some nicer test macros.
+#ifdef TEST_R5
+#define SK_TEST_R5			1
+#define SK_TEST_OBOS_POSIX	0
+#else
+#define SK_TEST_R5			0
+#define SK_TEST_OBOS_POSIX	1
+#endif
+
 #include <CppUnitShell.h>
 #include <cppunit/TestCase.h>
 #include <cppunit/TestSuite.h>