diff --git a/headers/private/servers/app/ServerConfig.h b/headers/private/servers/app/ServerConfig.h
index e99bf639dc..df61f3415a 100644
--- a/headers/private/servers/app/ServerConfig.h
+++ b/headers/private/servers/app/ServerConfig.h
@@ -4,7 +4,9 @@
 // This is defined to place the server in test mode, which modifies certain things like
 // system keyboard shortcuts. Note that it is possible, though senseless, to place it in
 // regular mode and still use a display driver which depends on the R5 app_server
-#define TEST_MODE
+#ifndef TEST_MODE
+	#define TEST_MODE 1
+#endif
 
 // The ViewDriver is a BView/BWindow combination. Plenty of functionality,
 // but dog-slow.
diff --git a/src/servers/app/AppServer.cpp b/src/servers/app/AppServer.cpp
index e73a2e737b..7dd42339c1 100644
--- a/src/servers/app/AppServer.cpp
+++ b/src/servers/app/AppServer.cpp
@@ -85,7 +85,7 @@ ColorSet gui_colorset;
 	This loads the default fonts, allocates all the major global variables, spawns the main housekeeping
 	threads, loads user preferences for the UI and decorator, and allocates various locks.
 */
-#ifdef TEST_MODE
+#if TEST_MODE
 AppServer::AppServer(void) : BApplication (SERVER_SIGNATURE)
 #else
 AppServer::AppServer(void)
diff --git a/src/servers/app/AppServer.h b/src/servers/app/AppServer.h
index f3f563ec52..f9f6e2be43 100644
--- a/src/servers/app/AppServer.h
+++ b/src/servers/app/AppServer.h
@@ -26,10 +26,10 @@ class BitmapManager;
 	application start and quit messages. It also starts the housekeeping threads
 	and initializes most of the server's globals.
 */
-#ifndef TEST_MODE
-class AppServer
-#else
+#if TEST_MODE
 class AppServer : public BApplication
+#else
+class AppServer
 #endif
 {
 public: