diff --git a/src/tests/kits/interface/layout/widget_layout_test/CheckBox.cpp b/src/tests/kits/interface/layout/widget_layout_test/CheckBox.cpp
index d2374a3ac2..65985071f9 100644
--- a/src/tests/kits/interface/layout/widget_layout_test/CheckBox.cpp
+++ b/src/tests/kits/interface/layout/widget_layout_test/CheckBox.cpp
@@ -16,7 +16,7 @@
 CheckBox::CheckBox(BMessage* message, BMessenger target)
 	: AbstractButton(BUTTON_POLICY_TOGGLE_ON_RELEASE, message, target)
 {
-	SetViewUIColor(B_PANEL_BACKGROUND_COLOR);
+	SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 }
 
 
diff --git a/src/tests/kits/interface/layout/widget_layout_test/GroupView.cpp b/src/tests/kits/interface/layout/widget_layout_test/GroupView.cpp
index 2b6f24a7c1..67dcd709be 100644
--- a/src/tests/kits/interface/layout/widget_layout_test/GroupView.cpp
+++ b/src/tests/kits/interface/layout/widget_layout_test/GroupView.cpp
@@ -59,7 +59,7 @@ GroupView::GroupView(enum orientation orientation, int32 lineCount)
 	  fColumnInfos(NULL),
 	  fRowInfos(NULL)
 {
-	SetViewUIColor(B_PANEL_BACKGROUND_COLOR);
+	SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 
 	if (fLineCount < 1)
 		fLineCount = 1;
@@ -377,7 +377,7 @@ GroupView::_ChildAt(int32 column, int32 row) const
 Glue::Glue()
 	: View()
 {
-	SetViewUIColor(B_PANEL_BACKGROUND_COLOR);
+	SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 }
 
 
@@ -389,7 +389,7 @@ Strut::Strut(float pixelWidth, float pixelHeight)
 	  fSize(pixelWidth >= 0 ? pixelWidth - 1 : B_SIZE_UNSET,
 	  	pixelHeight >= 0 ? pixelHeight - 1 : B_SIZE_UNSET)
 {
-	SetViewUIColor(B_PANEL_BACKGROUND_COLOR);
+	SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 }
 
 
diff --git a/src/tests/kits/interface/layout/widget_layout_test/RadioButton.cpp b/src/tests/kits/interface/layout/widget_layout_test/RadioButton.cpp
index beb0a0837b..07c70dea20 100644
--- a/src/tests/kits/interface/layout/widget_layout_test/RadioButton.cpp
+++ b/src/tests/kits/interface/layout/widget_layout_test/RadioButton.cpp
@@ -16,7 +16,7 @@
 RadioButton::RadioButton(BMessage* message, BMessenger target)
 	: AbstractButton(BUTTON_POLICY_SELECT_ON_RELEASE, message, target)
 {
-	SetViewUIColor(B_PANEL_BACKGROUND_COLOR);
+	SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 }
 
 
diff --git a/src/tests/kits/interface/layout/widget_layout_test/StringView.cpp b/src/tests/kits/interface/layout/widget_layout_test/StringView.cpp
index 77218347af..2f3db7985e 100644
--- a/src/tests/kits/interface/layout/widget_layout_test/StringView.cpp
+++ b/src/tests/kits/interface/layout/widget_layout_test/StringView.cpp
@@ -19,7 +19,7 @@ StringView::StringView(const char* string)
 	  fStringWidth(0),
 	  fExplicitMinSize(B_SIZE_UNSET, B_SIZE_UNSET)
 {
-	SetViewUIColor(B_PANEL_BACKGROUND_COLOR);
+	SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 	fTextColor = (rgb_color){ 0, 0, 0, 255 };
 }
 
diff --git a/src/tests/kits/interface/layout/widget_layout_test/WidgetLayoutTest.cpp b/src/tests/kits/interface/layout/widget_layout_test/WidgetLayoutTest.cpp
index afa9931f45..8132511545 100644
--- a/src/tests/kits/interface/layout/widget_layout_test/WidgetLayoutTest.cpp
+++ b/src/tests/kits/interface/layout/widget_layout_test/WidgetLayoutTest.cpp
@@ -79,7 +79,7 @@ public:
 		  fTest(test)
 	{
 		fViewContainer = new ViewContainer(Bounds());
-		fViewContainer->View::SetViewUIColor(B_PANEL_BACKGROUND_COLOR);
+		fViewContainer->View::SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 		AddChild(fViewContainer);
 
 		// container view for the tested BView
@@ -90,7 +90,7 @@ public:
 
 		// container for the test's controls
 		fTestControlsView = new View(BRect(410, 10, 690, 400));
-		fTestControlsView->SetViewUIColor(B_PANEL_BACKGROUND_COLOR);
+		fTestControlsView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 		fViewContainer->View::AddChild(fTestControlsView);
 
 		// wrapper view
diff --git a/src/tests/kits/interface/picture/Jamfile b/src/tests/kits/interface/picture/Jamfile
index 8ded4303d6..280bd1ccf6 100644
--- a/src/tests/kits/interface/picture/Jamfile
+++ b/src/tests/kits/interface/picture/Jamfile
@@ -23,7 +23,9 @@ UseLibraryHeaders agg expat ;
 SimpleTest PictureTest :
 	PictureTest.cpp
 	SVGViewView.cpp
-	: be translation libexpat.a [ TargetLibsupc++ ]
+	: be translation 
+	[ BuildFeatureAttribute expat : library ]
+	[ TargetLibsupc++ ]
 	;
 
 if $(TARGET_PLATFORM) = libbe_test {
diff --git a/src/tests/servers/app/Jamfile b/src/tests/servers/app/Jamfile
index 732c19e323..deb43476b4 100644
--- a/src/tests/servers/app/Jamfile
+++ b/src/tests/servers/app/Jamfile
@@ -101,6 +101,7 @@ SharedLibrary libtestappserver.so :
 	CursorData.cpp
 	CursorManager.cpp
 	CursorSet.cpp
+	DelayedMessage.cpp
 	DesktopListener.cpp
 	DirectWindowInfo.cpp
 	DrawingEngine.cpp