diff --git a/tests/project.conf b/tests/project.conf
index 9ab0634..6c30ae9 100644
--- a/tests/project.conf
+++ b/tests/project.conf
@@ -1,5 +1,5 @@
 targets=Dummy.h,appclient,appmessage,appserver,includes,lookup,tests.log,transport
-cppflags_force=-I ../include
+cppflags_force=-I ../include -isystem .
 cflags_force=`pkg-config --cflags libSystem`
 cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector-all
 ldflags_force=`pkg-config --libs libSystem` -L$(OBJDIR)../src -Wl,-rpath,$(OBJDIR)../src -lApp
diff --git a/tools/appbroker.sh b/tools/appbroker.sh
index d0d1e9c..bca121b 100755
--- a/tools/appbroker.sh
+++ b/tools/appbroker.sh
@@ -27,7 +27,7 @@
 #variables
 PROGNAME="appbroker.sh"
 #executables
-APPBROKER="AppBroker"
+APPBROKER=
 DEBUG="_debug"
 
 
@@ -85,6 +85,15 @@ fi
 
 [ "$clean" -ne 0 ] && exit 0
 
+if [ -n "$PKG_CONFIG_SYSROOT_DIR" ]; then
+	#XXX cross-compiling (requires AppBroker(1) installed)
+	APPBROKER="AppBroker$EXEEXT"
+elif [ -z "$APPBROKER" ]; then
+	APPBROKER="$OBJDIR../tools/AppBroker$EXEEXT"
+	#XXX ugly workaround
+	export LD_LIBRARY_PATH="$OBJDIR../src"
+fi
+
 exec 3>&1
 while [ $# -gt 0 ]; do
 	target="$1"