diff --git a/src/tests/apps/fake_app_server/AppServer.cpp b/src/tests/apps/fake_app_server/AppServer.cpp
index d950faabb4..e5607d873a 100644
--- a/src/tests/apps/fake_app_server/AppServer.cpp
+++ b/src/tests/apps/fake_app_server/AppServer.cpp
@@ -194,8 +194,8 @@ AppServer::MainLoop(void)
 				break;
 			default:
 			{
-				STRACE(("Server::MainLoop received unexpected code %ld (offset %ld)\n",
-						code, code - SERVER_TRUE));
+				STRACE(("Server::MainLoop received unexpected code %ld\n",
+					code));
 				break;
 			}
 		}
@@ -278,7 +278,7 @@ AppServer::DispatchMessage(int32 code, BPrivate::PortLink &msg)
 			release_sem(fAppListLock);
 
 			BPrivate::PortLink replylink(clientReplyPort);
-			replylink.StartMessage(SERVER_TRUE);
+			replylink.StartMessage(B_OK);
 			replylink.Attach<int32>(serverListen);
 			replylink.Flush();
 
diff --git a/src/tests/apps/fake_app_server/ServerApp.cpp b/src/tests/apps/fake_app_server/ServerApp.cpp
index c00497c19d..f151522855 100644
--- a/src/tests/apps/fake_app_server/ServerApp.cpp
+++ b/src/tests/apps/fake_app_server/ServerApp.cpp
@@ -276,7 +276,7 @@ ServerApp::DispatchMessage(int32 code, BPrivate::LinkReceiver &link)
 			STRACE(("ServerApp %s: get current workspace\n", fSignature.String()));
 
 			// TODO: Locking this way is not nice
-			fLink.StartMessage(SERVER_TRUE);
+			fLink.StartMessage(B_OK);
 			fLink.Attach<int32>(0);
 			fLink.Flush();
 			break;
@@ -299,7 +299,7 @@ ServerApp::DispatchMessage(int32 code, BPrivate::LinkReceiver &link)
 			STRACE(("ServerApp %s: Received IsCursorHidden request\n", fSignature.String()));
 			// Attached data
 			// 1) int32 port to reply to
-			fLink.StartMessage(fCursorHidden ? SERVER_TRUE : SERVER_FALSE);
+			fLink.StartMessage(fCursorHidden ? B_OK : B_ERROR);
 			fLink.Flush();
 			break;
 		}
@@ -310,7 +310,7 @@ ServerApp::DispatchMessage(int32 code, BPrivate::LinkReceiver &link)
 
 			if (link.NeedsReply()) {
 				// the client is now blocking and waiting for a reply!
-				fLink.StartMessage(SERVER_FALSE);
+				fLink.StartMessage(B_ERROR);
 				fLink.Flush();
 			} else
 				puts("message doesn't need a reply!");