diff --git a/src/servers/app/ScreenManager.cpp b/src/servers/app/ScreenManager.cpp
index a36db9bc5e..ba80d2f30d 100644
--- a/src/servers/app/ScreenManager.cpp
+++ b/src/servers/app/ScreenManager.cpp
@@ -21,13 +21,7 @@
 using std::nothrow;
 
 
-#ifdef __HAIKU__
-#	define USE_ACCELERANT 1
-#else
-#	define USE_ACCELERANT 0
-#endif
-
-#if USE_ACCELERANT
+#ifndef HAIKU_TARGET_PLATFORM_LIBBE_TEST
 #	include "AccelerantHWInterface.h"
 #else
 #	include "ViewHWInterface.h"
@@ -142,11 +136,12 @@ ScreenManager::_ScanDrivers()
 	bool initDrivers = true;
 	while (initDrivers) {
 
-#if USE_ACCELERANT
+#ifndef HAIKU_TARGET_PLATFORM_LIBBE_TEST
 		  interface = new AccelerantHWInterface();
-#else
+#elif defined(USE_DIRECT_WINDOW_TEST_MODE)
 		  interface = new DWindowHWInterface();
-//		  interface = new ViewHWInterface();
+#else
+		  interface = new ViewHWInterface();
 #endif
 
 		_AddHWInterface(interface);
diff --git a/src/tests/servers/app/Jamfile b/src/tests/servers/app/Jamfile
index f78fb66ea0..b22caa6c93 100644
--- a/src/tests/servers/app/Jamfile
+++ b/src/tests/servers/app/Jamfile
@@ -18,6 +18,7 @@ UseFreeTypeHeaders ;
 
 # This overrides the definitions in private/servers/app/ServerConfig.h
 local defines = [ FDefines TEST_MODE=1 ] ;
+	# USE_DIRECT_WINDOW_TEST_MODE=1
 
 SubDirCcFlags $(defines) ;
 SubDirC++Flags $(defines) ;