diff --git a/src/servers/app/AppServer.cpp b/src/servers/app/AppServer.cpp
index 78f8b026e0..2fcc3a846f 100644
--- a/src/servers/app/AppServer.cpp
+++ b/src/servers/app/AppServer.cpp
@@ -149,7 +149,7 @@ AppServer::AppServer(void)
 	fDecoratorLock= create_sem(1,"app_server_decor_sem");
 	
 	// Spawn our thread-monitoring thread
-	fPicassoThreadID= spawn_thread(PicassoThread,"Picasso", B_NORMAL_PRIORITY, this);
+	fPicassoThreadID= spawn_thread(PicassoThread,"picasso", B_NORMAL_PRIORITY, this);
 	if (fPicassoThreadID >= 0)
 		resume_thread(fPicassoThreadID);
 
@@ -229,6 +229,7 @@ int32 AppServer::PicassoThread(void *data)
 thread_id AppServer::Run(void)
 {
 	MainLoop();
+	kill_thread(fPicassoThreadID);
 	return 0;
 }
 
diff --git a/src/servers/app/AppServer.h b/src/servers/app/AppServer.h
index 978946566c..f3f563ec52 100644
--- a/src/servers/app/AppServer.h
+++ b/src/servers/app/AppServer.h
@@ -26,7 +26,7 @@ class BitmapManager;
 	application start and quit messages. It also starts the housekeeping threads
 	and initializes most of the server's globals.
 */
-#if DISPLAYDRIVER == HWDRIVER
+#ifndef TEST_MODE
 class AppServer
 #else
 class AppServer : public BApplication